The arm_any_initfn() is used only for the 32-bit linux-user "cpu any", so it only gets called in builds where TARGET_AARCH64 is not defined. Remove the unreachable line which sets ARM_FEATURE_AARCH64.
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> --- target-arm/cpu.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index fb9c12d..94123b2 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -963,9 +963,6 @@ static void arm_any_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_ARM_DIV); set_feature(&cpu->env, ARM_FEATURE_V7MP); set_feature(&cpu->env, ARM_FEATURE_CRC); -#ifdef TARGET_AARCH64 - set_feature(&cpu->env, ARM_FEATURE_AARCH64); -#endif cpu->midr = 0xffffffff; } #endif -- 1.9.2