target/arm: Build cpu32.c once in system mode
"Move" the ifdef to meson.build rules. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20260827041557.775080-3-richard.henderson@linaro.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Richard Henderson committed
Aug 26, 2026 at 21:15 UTC
74c76742676aac4d7873e95eddfa42c226c25a4b
2 files changed
+5
-10
target/arm/tcg/cpu32.c
-5
@@ -19,9 +19,6 @@
19
#include "cpregs.h"
20
21
22
-/* CPU models. These are not needed for the AArch64 linux-user build. */
23
-#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)
24
-
22
static void arm926_initfn(Object *obj)
23
{
24
ARMCPU *cpu = ARM_CPU(obj);
@@ -756,5 +753,3 @@ static void arm_tcg_cpu_register_types(void)
753
}
754
755
type_init(arm_tcg_cpu_register_types)
759
-
760
-#endif /* !CONFIG_USER_ONLY || !TARGET_AARCH64 */
target/arm/tcg/meson.build
+5
-5
@@ -30,10 +30,6 @@ translate32_d = [
30
arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64)
31
arm_stubs_ss.add(files('stubs32.c'))
32
33
-arm_ss.add(files(
34
- 'cpu32.c',
35
-))
36
-
33
arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
34
'gengvec64.c',
35
'translate-a64.c',
@@ -49,7 +45,10 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
45
))
46
47
arm_common_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('cpu-v7m.c'))
52
-arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c'))
48
+arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files(
49
+ 'cpu-v7m.c',
50
+ 'cpu32.c',
51
+))
52
53
arm_common_ss.add(zlib)
54
arm_common_ss.add(files(
@@ -86,6 +85,7 @@ arm_common_user_system_ss.add(when: 'TARGET_AARCH64', if_true: files(
85
))
86
87
arm_common_system_ss.add(files(
88
+ 'cpu32.c',
89
'cpregs-at.c',
90
'gicv5-cpuif.c',
91
'psci.c',