From: Pierrick Bouvier <[email protected]> We use the mechanic introduced in previous commit to define a arm stubs library. With this, we are able to eliminate symbol conflicts when linking arm and aarch64 targets, and get one step closer to having a single-binary.
Signed-off-by: Pierrick Bouvier <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/arm/meson.build | 8 +++----- target/arm/tcg/meson.build | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 192ac7c31ee..4723f9f170a 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -2,6 +2,7 @@ arm_ss = ss.source_set() arm_common_ss = ss.source_set() arm_common_system_ss = ss.source_set() arm_system_ss = ss.source_set() +arm_stubs_ss = ss.source_set() arm_user_ss = ss.source_set() arm_common_system_ss.add(files('gdbstub.c')) @@ -23,9 +24,7 @@ arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c')) arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) arm_user_ss.add(files('cpu.c')) -arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files( - 'cpu32-stubs.c', -)) +arm_stubs_ss.add(files('cpu32-stubs.c')) arm_user_ss.add(files( 'cpregs-gcs.c', 'cpregs-pmu.c', @@ -39,8 +38,6 @@ arm_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('common-semi-target.c')) arm_common_system_ss.add(files('cpu.c')) -arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( - 'cpu32-stubs.c')) arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) arm_common_system_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('common-semi-target.c')) @@ -73,3 +70,4 @@ 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} +target_stubs_arch += {'arm': arm_stubs_ss} diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 02774409e56..d2364aa39c4 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -28,7 +28,7 @@ translate32_d = [ ] arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64) -arm_ss.add(when: 'TARGET_AARCH64', if_false: files('stubs32.c')) +arm_stubs_ss.add(files('stubs32.c')) arm_ss.add(files( 'cpu32.c', -- 2.53.0
