From: Peter Maydell Date: Mon, 9 Jun 2014 14:43:24 +0000 (+0100) Subject: target-arm: arm_any_initfn() should never set ARM_FEATURE_AARCH64 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46d9dfdad65fa783691871622271a861466905c4;p=qemu.git 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 Message-id: 1401458125-27977-2-git-send-email-peter.maydell@linaro.org --- 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