Re: [PATCH 12/13] target/arm/cpu: compile file twice (user, system) only

[Philippe Mathieu-Daudé]

On 29/4/25 07:00, Pierrick Bouvier wrote:

Signed-off-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>
---
  target/arm/meson.build | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/target/arm/meson.build b/target/arm/meson.build
index c39ddc4427b..89e305eb56a 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -1,6 +1,6 @@
  arm_ss = ss.source_set()
+arm_common_ss = ss.source_set()

Unused AFAICT.

  arm_ss.add(files(
-  'cpu.c',
    'debug_helper.c',
    'gdbstub.c',
    'helper.c',
@@ -20,6 +20,7 @@ arm_ss.add(when: 'TARGET_AARCH64',
  )

arm_system_ss = ss.source_set()

+arm_common_system_ss = ss.source_set()
  arm_system_ss.add(files(
    'arch_dump.c',
    'arm-powerctl.c',
@@ -30,6 +31,9 @@ arm_system_ss.add(files(
  ))

arm_user_ss = ss.source_set()

+arm_user_ss.add(files('cpu.c'))
+
+arm_common_system_ss.add(files('cpu.c'), capstone)

subdir('hvf') @@ -42,3 +46,5 @@ endif

  target_arch += {'arm': arm_ss}
  target_system_arch += {'arm': arm_system_ss}
  target_user_arch += {'arm': arm_user_ss}
+target_common_arch += {'arm': arm_common_ss}
+target_common_system_arch += {'arm': arm_common_system_ss}