diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-05-03 08:23:26 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-05-11 09:49:25 +0100 |
| commit | f779026478773da05e3f5b4621dddc5c6d6542dc (patch) | |
| tree | eb62e7b408f34bb1ad65b9fc5df2633e9cb89b9c | |
| parent | 692aba8d769585a6cd9e37c101af73dbd1482f7f (diff) | |
disas: Move disas.c to disas/
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>
| -rw-r--r-- | disas/disas.c (renamed from disas.c) | 0 | ||||
| -rw-r--r-- | disas/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/disas.c b/disas/disas.c index d46f638a72..d46f638a72 100644 --- a/disas.c +++ b/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) diff --git a/meson.build b/meson.build index 5c7af6f3bc..d3cf48960b 100644 --- a/meson.build +++ b/meson.build @@ -3153,9 +3153,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 |