@samitouri / QOSamiQemu / commits / 3580aa0354

target/arm/tcg/psci.c: make compilation unit common

Now that helper.h does not contain TARGET_AARCH64 identifier, we can move forward with this file. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Message-id: 20260219040150.2098396-10-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Pierrick Bouvier committed Feb 18, 2026 at 20:01 UTC 3580aa03547f92b658cabffbd13534e9f546c0bc
2 files changed +2 -5
target/arm/tcg/meson.build
+1 -4
@@ -49,10 +49,6 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
49 'sve_helper.c',
50 ))
51
52 -arm_system_ss.add(files(
53 - 'psci.c',
54 -))
55 -
52 arm_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('cpu-v7m.c'))
53 arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c'))
54
@@ -68,6 +64,7 @@ arm_common_system_ss.add(files(
64 'debug.c',
65 'hflags.c',
66 'neon_helper.c',
67 + 'psci.c',
68 'tlb_helper.c',
69 'tlb-insns.c',
70 'vfp_helper.c',
target/arm/tcg/psci.c
+1 -1
@@ -68,7 +68,7 @@ void arm_handle_psci_call(ARMCPU *cpu)
68 CPUARMState *env = &cpu->env;
69 uint64_t param[4];
70 uint64_t context_id, mpidr;
71 - target_ulong entry;
71 + uint64_t entry;
72 int32_t ret = 0;
73 int i;
74