Solves these link errors on aarch64 hosts when linking
arm and aarch64 targets:

/usr/bin/ld: libsystem.a.p/hw_xen_xen_stubs.c.o: in function 
`xen_hvm_modified_memory':
/qemu/build/../hw/xen/xen_stubs.c:17: multiple definition of 
`xen_hvm_modified_memory'; 
libsystem_arm.a.p/hw_arm_xen-stubs.c.o:/qemu/build/../hw/arm/xen-stubs.c:25: 
first defined here
/usr/bin/ld: libsystem.a.p/hw_xen_xen_stubs.c.o: in function `xen_ram_alloc':
/qemu/build/../hw/xen/xen_stubs.c:23: multiple definition of `xen_ram_alloc'; 
libsystem.a.p/hw_xen_xen-hvm-common.c.o:/qemu/build/../hw/xen/xen-hvm-common.c:39:
 first defined here
/usr/bin/ld: libsystem.a.p/hw_xen_xen_stubs.c.o: in function `xen_mr_is_memory':
/qemu/build/../hw/xen/xen_stubs.c:28: multiple definition of 
`xen_mr_is_memory'; 
libsystem.a.p/hw_xen_xen-hvm-common.c.o:/qemu/build/../hw/xen/xen-hvm-common.c:27:
 first defined here
/usr/bin/ld: libsystem.a.p/hw_xen_xen_stubs.c.o: in function 
`xen_map_cache_enabled':
/qemu/build/../hw/xen/xen_stubs.c:34: multiple definition of 
`xen_map_cache_enabled'; 
libsystem.a.p/hw_xen_xen-mapcache.c.o:/qemu/build/../hw/xen/xen-mapcache.c:86: 
first defined here
/usr/bin/ld: libsystem.a.p/hw_xen_xen_stubs.c.o: in function 
`xen_invalidate_map_cache_entry':
/qemu/build/../hw/xen/xen_stubs.c:38: multiple definition of 
`xen_invalidate_map_cache_entry'; 
libsystem.a.p/hw_xen_xen-mapcache.c.o:/qemu/build/../hw/xen/xen-mapcache.c:664: 
first defined here
/usr/bin/ld: libsystem.a.p/hw_xen_xen_stubs.c.o: in function 
`xen_ram_addr_from_mapcache':
/qemu/build/../hw/xen/xen_stubs.c:43: multiple definition of 
`xen_ram_addr_from_mapcache'; 
libsystem.a.p/hw_xen_xen-mapcache.c.o:/qemu/build/../hw/xen/xen-mapcache.c:538: 
first defined here
/usr/bin/ld: libsystem.a.p/hw_xen_xen_stubs.c.o: in function `xen_map_cache':
/qemu/build/../hw/xen/xen_stubs.c:54: multiple definition of `xen_map_cache'; 
libsystem.a.p/hw_xen_xen-mapcache.c.o:/qemu/build/../hw/xen/xen-mapcache.c:468: 
first defined here

Signed-off-by: Pierrick Bouvier <[email protected]>
---
 hw/xen/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xen/meson.build b/hw/xen/meson.build
index dcd2b7e1df3..62767a5ea21 100644
--- a/hw/xen/meson.build
+++ b/hw/xen/meson.build
@@ -29,4 +29,4 @@ else
 endif
 
 system_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_common_ss)
-system_ss.add(when: ['CONFIG_XEN', xen], if_false: files('xen_stubs.c'))
+stub_ss.add(files('xen_stubs.c'))
-- 
2.43.0


Reply via email to