cpu32.c only contains CPU types used in 32-bit system emulation: rename it as cpu32-system.c; always compile the file but only register the QOM types for the 32-bit binary.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Manos Pitsidianakis <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> --- target/arm/tcg/{cpu32.c => cpu32-system.c} | 10 +--------- target/arm/tcg/meson.build | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) rename target/arm/tcg/{cpu32.c => cpu32-system.c} (99%) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32-system.c similarity index 99% rename from target/arm/tcg/cpu32.c rename to target/arm/tcg/cpu32-system.c index 8220d785f5b..6e983900899 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32-system.c @@ -1,5 +1,5 @@ /* - * QEMU ARM TCG-only CPUs. + * QEMU ARM TCG-only CPUs (not needed for the AArch64 linux-user build) * * Copyright (c) 2012 SUSE LINUX Products GmbH * @@ -13,15 +13,9 @@ #include "cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" -#if !defined(CONFIG_USER_ONLY) #include "hw/core/boards.h" -#endif #include "cpregs.h" - -/* CPU models. These are not needed for the AArch64 linux-user build. */ -#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) - static void arm926_initfn(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); @@ -746,5 +740,3 @@ static void arm_tcg_cpu_register_types(void) } type_init(arm_tcg_cpu_register_types) - -#endif /* !CONFIG_USER_ONLY || !TARGET_AARCH64 */ diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index d5a95bf54f2..9b859892ed8 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -30,10 +30,6 @@ translate32_d = [ arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64) arm_stubs_ss.add(files('stubs32.c')) -arm_ss.add(files( - 'cpu32.c', -)) - arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'gengvec64.c', 'translate-a64.c', @@ -85,6 +81,7 @@ arm_common_user_system_ss.add(when: 'TARGET_AARCH64', if_true: files( arm_common_system_ss.add(files( 'cpregs-at.c', + 'cpu32-system.c', 'gicv5-cpuif.c', 'psci.c', 'tlb_helper.c', -- 2.53.0
