target/arm: move kvm-stub to arm_stubs_ss
This eliminates symbol conflicts for kvm symbols on linux-aarch64 host. Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20260528051642.115721-2-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Pierrick Bouvier committed
May 28, 2026 at 05:16 UTC
567787f936e18fcc3147b5c8d8f8142aec5fb09e
1 file changed
+4
-2
target/arm/meson.build
+4
-2
@@ -35,7 +35,10 @@ arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'))
35
arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c'))
36
37
arm_user_ss.add(files('cpu.c'))
38
-arm_stubs_ss.add(files('cpu32-stubs.c'))
38
+arm_stubs_ss.add(files(
39
+ 'cpu32-stubs.c',
40
+ 'kvm-stub.c'
41
+))
42
arm_user_ss.add(files(
43
'el2-stubs.c',
44
'cpregs-omap-stub.c',
@@ -44,7 +47,6 @@ arm_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING',
47
if_true: files('common-semi-target.c'))
48
49
arm_common_system_ss.add(files('cpu.c'))
47
-arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
50
arm_common_system_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING',
51
if_true: files('common-semi-target.c'))
52
arm_common_system_ss.add(files(