Browse Source

target/s390x: Build system units in common source set

Except the ioinst.c file which uses the TARGET_PAGE_SIZE
definition in the ioinst_handle_chsc() method, all other
files in meson's s390x_system_ss[] source set don't use
any target-specific code. Moving them in the other
s390x_common_system_ss[] set to build as common objects
ensures these files won't use any target-specific API
such target_ulong / TARGET_PAGE_SIZE, thus forcing to use
the appropriate types instead (such vaddr, hwaddr, uint64_t,
...).

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20260206181953.18683-8-philmd@linaro.org>
pull/319/head
Philippe Mathieu-Daudé 3 months ago
parent
commit
dacb7a6510
  1. 8
      target/s390x/meson.build
  2. 2
      target/s390x/tcg/meson.build

8
target/s390x/meson.build

@ -20,10 +20,15 @@ s390x_ss.add(gen_features_h)
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',
'diag.c',
'ioinst.c',
'machine.c',
'mmu_helper.c',
'sigp.c',
@ -41,4 +46,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}

2
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',
))

Loading…
Cancel
Save