summaryrefslogtreecommitdiff
path: root/patches/binutils/2.20/290-ld-stub-crash.patch
diff options
context:
space:
mode:
authorJoachim Nilsson <jocke@vmlinux.org>2010-01-07 00:08:08 (GMT)
committerJoachim Nilsson <jocke@vmlinux.org>2010-01-07 00:08:08 (GMT)
commitcfbcdd378646594887c9d488aee529c07838ee8e (patch)
tree51a79051c2c5d82c913c6ab8a2f111d5dde684dc /patches/binutils/2.20/290-ld-stub-crash.patch
parent6dc69b4938fee7c3e33164e5666805d6607943a3 (diff)
binutils/binultils: import binutils-2.20 patches from OE
This is a set of patches for binutils-2.20 that have been "ported", or rather shamelessly stolen, from the OpenEmbedded project: http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/binutils/binutils-2.20 Tried and tested on Arm (big-endian Xscale, and little-endian i.MX27) with GCC 4.4.2 Signed-off-by: Joachim Nilsson <jocke@vmlinux.org>
Diffstat (limited to 'patches/binutils/2.20/290-ld-stub-crash.patch')
-rw-r--r--patches/binutils/2.20/290-ld-stub-crash.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/binutils/2.20/290-ld-stub-crash.patch b/patches/binutils/2.20/290-ld-stub-crash.patch
new file mode 100644
index 0000000..e4723e5
--- /dev/null
+++ b/patches/binutils/2.20/290-ld-stub-crash.patch
@@ -0,0 +1,22 @@
+diff -p -c -u -r1.196 elf32-arm.c
+--- a/bfd/elf32-arm.c 22 May 2009 11:58:44 -0000 1.196
++++ b/bfd/elf32-arm.c 12 Jun 2009 13:18:20 -0000
+@@ -3175,11 +3175,15 @@ arm_type_of_stub (struct bfd_link_info *
+
+ /* We have an extra 2-bytes reach because of
+ the mode change (bit 24 (H) of BLX encoding). */
++ /* A stub is needed only if this call is not throught a PLT
++ entry, because PLT stubs handle mode switching
++ already. */
+ if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2)
+ || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET)
+- || ((r_type == R_ARM_CALL) && !globals->use_blx)
+- || (r_type == R_ARM_JUMP24)
+- || (r_type == R_ARM_PLT32))
++ || ( (((r_type == R_ARM_CALL) && !globals->use_blx)
++ || (r_type == R_ARM_JUMP24)
++ || (r_type == R_ARM_PLT32))
++ && !use_plt))
+ {
+ stub_type = (info->shared | globals->pic_veneer)
+ /* PIC stubs. */