From: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date: Mon, 27 Jul 2026 09:28:46 +0000 (+0100)
Subject: target/arm: Build TCG stubs as stub library
X-Git-Tag: v11.1.0-rc2~3^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5ab18130a151ecd2295772e976a3dcf0ba2a8a1;p=thirdparty%2Fqemu.git

target/arm: Build TCG stubs as stub library

Use the stub library introduced in commit 0da978cdbc6 ("target/arm:
define stub library") to prevent symbol conflicts.

Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20260721122135.6288-5-philmd@oss.qualcomm.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/meson.build b/target/arm/meson.build
index f6ae8934d1..0369f96b4c 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)