| Message ID | 20230509163326.121090-2-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Make the core disassembler functions target-independent | expand |
On 9/5/23 18:33, Richard Henderson wrote: > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Message-Id: <20230503072331.1747057-80-richard.henderson@linaro.org> > --- > meson.build | 3 --- > disas.c => disas/disas.c | 0 > disas/meson.build | 4 +++- > 3 files changed, 3 insertions(+), 4 deletions(-) > rename disas.c => disas/disas.c (100%) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/meson.build b/meson.build index 229eb585f7..d56358b65f 100644 --- a/meson.build +++ b/meson.build @@ -3152,9 +3152,6 @@ specific_ss.add(files('cpu.c')) subdir('softmmu') -common_ss.add(capstone) -specific_ss.add(files('disas.c'), capstone) - # Work around a gcc bug/misfeature wherein constant propagation looks # through an alias: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99696 diff --git a/disas.c b/disas/disas.c similarity index 100% rename from disas.c rename to disas/disas.c diff --git a/disas/meson.build b/disas/meson.build index c865bdd882..cbf6315f25 100644 --- a/disas/meson.build +++ b/disas/meson.build @@ -10,4 +10,6 @@ common_ss.add(when: 'CONFIG_RISCV_DIS', if_true: files('riscv.c')) common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c')) common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c')) common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c')) -common_ss.add(when: capstone, if_true: files('capstone.c')) +common_ss.add(when: capstone, if_true: [files('capstone.c'), capstone]) + +specific_ss.add(files('disas.c'), capstone)