Message ID | 20210314212724.1917075-2-richard.henderson@linaro.org |
---|---|
State | New |
Headers | show |
Series | tcg: Workaround macOS 11.2 mprotect bug | expand |
On Sun, Mar 14, 2021 at 03:26:56PM -0600, Richard Henderson wrote: > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com> Thanks, Roman > meson.build | 9 ++------- > tcg/meson.build | 13 +++++++++++++ > 2 files changed, 15 insertions(+), 7 deletions(-) > create mode 100644 tcg/meson.build > > diff --git a/meson.build b/meson.build > index a7d2dd429d..742f45c8d8 100644 > --- a/meson.build > +++ b/meson.build > @@ -1936,14 +1936,8 @@ specific_ss.add(files('cpu.c', 'disas.c', 'gdbstub.c'), capstone) > specific_ss.add(files('exec-vary.c')) > specific_ss.add(when: 'CONFIG_TCG', if_true: files( > 'fpu/softfloat.c', > - 'tcg/optimize.c', > - 'tcg/tcg-common.c', > - 'tcg/tcg-op-gvec.c', > - 'tcg/tcg-op-vec.c', > - 'tcg/tcg-op.c', > - 'tcg/tcg.c', > )) > -specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.c', 'tcg/tci.c')) > +specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.c')) > > subdir('backends') > subdir('disas') > @@ -1953,6 +1947,7 @@ subdir('net') > subdir('replay') > subdir('semihosting') > subdir('hw') > +subdir('tcg') > subdir('accel') > subdir('plugins') > subdir('bsd-user') > diff --git a/tcg/meson.build b/tcg/meson.build > new file mode 100644 > index 0000000000..84064a341e > --- /dev/null > +++ b/tcg/meson.build > @@ -0,0 +1,13 @@ > +tcg_ss = ss.source_set() > + > +tcg_ss.add(files( > + 'optimize.c', > + 'tcg.c', > + 'tcg-common.c', > + 'tcg-op.c', > + 'tcg-op-gvec.c', > + 'tcg-op-vec.c', > +)) > +tcg_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('tci.c')) > + > +specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) > -- > 2.25.1 >
diff --git a/meson.build b/meson.build index a7d2dd429d..742f45c8d8 100644 --- a/meson.build +++ b/meson.build @@ -1936,14 +1936,8 @@ specific_ss.add(files('cpu.c', 'disas.c', 'gdbstub.c'), capstone) specific_ss.add(files('exec-vary.c')) specific_ss.add(when: 'CONFIG_TCG', if_true: files( 'fpu/softfloat.c', - 'tcg/optimize.c', - 'tcg/tcg-common.c', - 'tcg/tcg-op-gvec.c', - 'tcg/tcg-op-vec.c', - 'tcg/tcg-op.c', - 'tcg/tcg.c', )) -specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.c', 'tcg/tci.c')) +specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.c')) subdir('backends') subdir('disas') @@ -1953,6 +1947,7 @@ subdir('net') subdir('replay') subdir('semihosting') subdir('hw') +subdir('tcg') subdir('accel') subdir('plugins') subdir('bsd-user') diff --git a/tcg/meson.build b/tcg/meson.build new file mode 100644 index 0000000000..84064a341e --- /dev/null +++ b/tcg/meson.build @@ -0,0 +1,13 @@ +tcg_ss = ss.source_set() + +tcg_ss.add(files( + 'optimize.c', + 'tcg.c', + 'tcg-common.c', + 'tcg-op.c', + 'tcg-op-gvec.c', + 'tcg-op-vec.c', +)) +tcg_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('tci.c')) + +specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)