diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-08-17 17:48:49 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-08-17 17:48:49 (GMT) |
| commit | 3e2f9f3f860aeec80e9b71ff8f2a7f841ea3810a (patch) | |
| tree | 3fb3ea09fb2914d30e862ac4180e8ac0d4c7bb77 /patches/binutils/2.20.1/290-ld-stub-crash.patch | |
| parent | d53f1d71f6c0ef75be48e1082d8d1e8cfc493d9e (diff) | |
binutils/binutils: forward-port the patchset from 2.20 to 2.20.1
Among other things, this should fix the issue reported by Thomas at:
http://sourceware.org/ml/crossgcc/2010-08/msg00115.html
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'patches/binutils/2.20.1/290-ld-stub-crash.patch')
| -rw-r--r-- | patches/binutils/2.20.1/290-ld-stub-crash.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/binutils/2.20.1/290-ld-stub-crash.patch b/patches/binutils/2.20.1/290-ld-stub-crash.patch new file mode 100644 index 0000000..640231c --- /dev/null +++ b/patches/binutils/2.20.1/290-ld-stub-crash.patch @@ -0,0 +1,24 @@ +diff -p -c -u -r1.196 elf32-arm.c + +diff -durN binutils-2.20.1.orig/bfd/elf32-arm.c binutils-2.20.1/bfd/elf32-arm.c +--- binutils-2.20.1.orig/bfd/elf32-arm.c 2010-02-22 09:06:48.000000000 +0100 ++++ binutils-2.20.1/bfd/elf32-arm.c 2010-08-17 19:32:25.000000000 +0200 +@@ -3194,11 +3194,15 @@ + + /* 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. */ |