[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 79/84] disas: Move disas.c to disas/
From: |
Richard Henderson |
Subject: |
[PATCH 79/84] disas: Move disas.c to disas/ |
Date: |
Wed, 3 May 2023 08:23:26 +0100 |
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
disas.c => disas/disas.c | 0
disas/meson.build | 4 +++-
meson.build | 3 ---
3 files changed, 3 insertions(+), 4 deletions(-)
rename disas.c => disas/disas.c (100%)
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)
diff --git a/meson.build b/meson.build
index 4bbdbcef37..e68b7c71b3 100644
--- a/meson.build
+++ b/meson.build
@@ -3161,9 +3161,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
--
2.34.1
- [PATCH 76/84] tcg: Remove target-specific headers from tcg.[ch], (continued)
- [PATCH 76/84] tcg: Remove target-specific headers from tcg.[ch], Richard Henderson, 2023/05/03
- [PATCH 70/84] *: Add missing includes of exec/translation-block.h, Richard Henderson, 2023/05/03
- [PATCH 66/84] accel/tcg: Introduce translator_io_start, Richard Henderson, 2023/05/03
- [PATCH 58/84] tcg: Remove NO_CPU_IO_DEFS, Richard Henderson, 2023/05/03
- [PATCH 60/84] exec-all: Widen TranslationBlock pc and cs_base to 64-bits, Richard Henderson, 2023/05/03
- [PATCH 71/84] *: Add missing includes of exec/exec-all.h, Richard Henderson, 2023/05/03
- [PATCH 74/84] tcg: Fix PAGE/PROT confusion, Richard Henderson, 2023/05/03
- [PATCH 75/84] tcg: Move env defines out of NEED_CPU_H in helper-head.h, Richard Henderson, 2023/05/03
- [PATCH 77/84] plugins: Move plugin_insn_append to translator.c, Richard Henderson, 2023/05/03
- [PATCH 78/84] plugins: Drop unused headers from exec/plugin-gen.h, Richard Henderson, 2023/05/03
- [PATCH 79/84] disas: Move disas.c to disas/,
Richard Henderson <=
- [PATCH 83/84] exec/poison: Do not poison CONFIG_SOFTMMU, Richard Henderson, 2023/05/03
- Re: [PATCH 83/84] exec/poison: Do not poison CONFIG_SOFTMMU, Thomas Huth, 2023/05/08
[PATCH 84/84] tcg: Build once for system and once for user-only, Richard Henderson, 2023/05/03
[PATCH 82/84] disas: Remove target-specific headers, Richard Henderson, 2023/05/03