aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-05-02 22:27:19 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-05-02 22:27:19 -0400
commitfbd46dc5333e0bc45719a7ed38d3411aef7dcd61 (patch)
tree4d9a9370e132f05fd3447ce4f945ddfc378d2ef4 /arch/arm
parentadc00439952f2e2e2b11d120bfe62bcb5ec93d4a (diff)
ARM: zImage: direct comparison with pc is not allowed in Thumb2 mode
... and recent binutils actually enforces it. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/compressed/head.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index a5a5df65983..445b20d693b 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -229,7 +229,8 @@ restart: adr r0, LC0
cmp r4, r10
bhs wont_overwrite
add r10, r4, r9
- cmp r10, pc
+ mov lr, pc
+ cmp r10, lr
bls wont_overwrite
/*