Skip to content

Commit

Permalink
target-arm: arm_any_initfn() should never set ARM_FEATURE_AARCH64
Browse files Browse the repository at this point in the history
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>
Message-id: 1401458125-27977-2-git-send-email-peter.maydell@linaro.org
  • Loading branch information
pm215 committed Jun 9, 2014
1 parent 411bdc7 commit 46d9dfd
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions target-arm/cpu.c
Expand Up @@ -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
Expand Down

0 comments on commit 46d9dfd

Please sign in to comment.