aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-05-30 12:08:11 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-05-30 12:50:08 +0100
commit02d01eee68e824b113994e2cd2518b59a8bcfad2 (patch)
treef2168510f12b871291bd116ece9616c2dc539692
parent9fe8fe1a88e87afacf67d95a5687a79448937d0a (diff)
target-arm: arm_any_initfn() should never set ARM_FEATURE_AARCH64
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.maydell@linaro.org>
-rw-r--r--target-arm/cpu.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index fb9c12d81e..94123b2213 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