From 0b83acf2f056cc7f5a9b05b1af9c97c91e2a7b1e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 23 Apr 2026 12:38:33 +0200 Subject: [PATCH] target/s390x: Introduce common system/user meson source set MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Introduce a source set common to system / user. Start it with the files built in both sets: 'cpu_models_user.c' and 'gdbstub.c' No logical change intended. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-4-philmd@linaro.org> --- target/s390x/meson.build | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 6f98ce34d73..44f58ac2919 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -1,4 +1,9 @@ s390x_ss = ss.source_set() +s390x_common_ss = ss.source_set() +s390x_common_system_ss = ss.source_set() +s390x_system_ss = ss.source_set() +s390x_user_ss = ss.source_set() + s390x_ss.add(files( 'cpu.c', 'cpu_features.c', @@ -15,15 +20,16 @@ gen_features_h = custom_target('gen-features.h', capture: true, command: gen_features) -s390x_ss.add(gen_features_h) +s390x_common_ss.add(gen_features_h) +s390x_common_ss.add(files( + 'cpu_models_user.c', + 'gdbstub.c', +)) -s390x_system_ss = ss.source_set() s390x_system_ss.add(files( 'ioinst.c', )) -s390x_common_system_ss = ss.source_set() -s390x_common_system_ss.add(gen_features_h) s390x_common_system_ss.add(files( 'helper.c', 'arch_dump.c', @@ -32,19 +38,14 @@ s390x_common_system_ss.add(files( 'mmu_helper.c', 'sigp.c', 'cpu-system.c', - 'cpu_models_system.c', - 'gdbstub.c', -)) - -s390x_user_ss = ss.source_set() -s390x_user_ss.add(files( - 'cpu_models_user.c', - 'gdbstub.c', )) subdir('tcg') subdir('kvm') +s390x_common_system_ss.add_all(s390x_common_ss) +s390x_user_ss.add_all(s390x_common_ss) + target_arch += {'s390x': s390x_ss} target_system_arch += {'s390x': s390x_system_ss} target_common_system_arch += {'s390x': s390x_common_system_ss} -- 2.47.3