diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 15:43:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 16:06:11 +0100 |
| commit | 46d9dfdad65fa783691871622271a861466905c4 (patch) | |
| tree | e943a30675d041e470c19c4f9f243d539b583518 /target-arm | |
| parent | 411bdc7837681f58828ca490647fa1784a6700b9 (diff) | |
| download | qemu-46d9dfdad65fa783691871622271a861466905c4.zip qemu-46d9dfdad65fa783691871622271a861466905c4.tar.gz qemu-46d9dfdad65fa783691871622271a861466905c4.tar.bz2 | |
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>
Message-id: 1401458125-27977-2-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/cpu.c | 3 |
1 files changed, 0 insertions, 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 |