Use the stub library introduced in commit 0da978cdbc6 ("target/arm:
define stub library") to prevent symbol conflicts.Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/arm/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index f6ae8934d1b..0369f96b4cc 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -38,7 +38,8 @@ arm_user_ss.add(files('cpu.c')) arm_stubs_ss.add(files( 'cpu32-stubs.c', 'gicv5-stubs.c', - 'kvm-stub.c' + 'kvm-stub.c', + 'tcg-stubs.c', )) arm_user_ss.add(files( 'el2-stubs.c', @@ -65,8 +66,6 @@ subdir('whpx') if 'CONFIG_TCG' in config_all_accel subdir('tcg') -else - arm_common_system_ss.add(files('tcg-stubs.c')) endif arm_user_ss.add_all(arm_common_user_system_ss) -- 2.53.0
