For the qemu-system-s390x binary, this doesn't reduce the number of built objects, but this ensure the files in the meson source set won't get access to target_ulong and TARGET_PAGE_SIZE definitions, thus forcing to use the correct types instead (such vaddr, hwaddr, uint64_t, ...).
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/s390x/meson.build | 5 ++++- target/s390x/tcg/meson.build | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 3b34ae034cb..626a8e18f82 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -19,7 +19,9 @@ gen_features_h = custom_target('gen-features.h', s390x_ss.add(gen_features_h) s390x_system_ss = ss.source_set() -s390x_system_ss.add(files( + +s390x_common_system_ss = ss.source_set() +s390x_common_system_ss.add(files( 'helper.c', 'arch_dump.c', 'diag.c', @@ -41,4 +43,5 @@ subdir('kvm') target_arch += {'s390x': s390x_ss} target_system_arch += {'s390x': s390x_system_ss} +target_common_system_arch += {'s390x': s390x_common_system_ss} target_user_arch += {'s390x': s390x_user_ss} diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index 515cb8b473d..17c9374d09e 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -12,6 +12,6 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'vec_int_helper.c', 'vec_string_helper.c', )) -s390x_system_ss.add(when: 'CONFIG_TCG', if_true: files( +s390x_common_system_ss.add(when: 'CONFIG_TCG', if_true: files( 'debug.c', )) -- 2.52.0
