diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-03-07 11:20:27 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-03-07 11:20:27 (GMT) |
| commit | eba28c52f0e2ccc0f985c120611817d6a9155892 (patch) | |
| tree | d9a0576362cdc345dfd1526df92b30c3cefc3ea3 /patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch | |
| parent | 3d7298fc4f7a1eb5eaca618d4ccd42f1a217495d (diff) | |
Re-diff the binutils-2.18.50.0.4 patches.
Breakage spotted by "Sander Visser" <Sander.Visser@evidente.se>
/trunk/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch | 19 12 7 0 ++++++---
/trunk/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch | 7 6 1 0 +++
/trunk/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch | 21 13 8 0 ++++++----
/trunk/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch | 15 10 5 0 +++++--
4 files changed, 41 insertions(+), 21 deletions(-)
Diffstat (limited to 'patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch')
| -rw-r--r-- | patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch index 7b3e7e1..edde04a 100644 --- a/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch +++ b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch @@ -1,11 +1,16 @@ +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch + +-= BEGIN original header =- Check LD_RUN_PATH length, copied from buildroot. binutils-2.18.50.0.6/ld/emultempl/elf32.em | 4 4 0 0 ++++ 1 file changed, 4 insertions(+) -diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em ---- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em 2008-04-03 18:54:25.000000000 +0200 -+++ binutils-2.18.50.0.6/ld/emultempl/elf32.em 2008-05-02 23:30:08.000000000 +0200 +-= END original header =- + +diff -durN binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em binutils-2.18.50.0.4/ld/emultempl/elf32.em +--- binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em 2008-02-08 17:44:55.000000000 +0100 ++++ binutils-2.18.50.0.4/ld/emultempl/elf32.em 2009-03-07 12:17:31.000000000 +0100 @@ -1220,6 +1220,8 @@ && command_line.rpath == NULL) { @@ -15,12 +20,12 @@ diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ if (gld${EMULATION_NAME}_search_needed (lib_path, &n, force)) break; -@@ -1405,6 +1407,8 @@ +@@ -1404,6 +1406,8 @@ rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); + if ((rpath) && (strlen (rpath) == 0)) + rpath = NULL; if (! (bfd_elf_size_dynamic_sections - (link_info.output_bfd, command_line.soname, rpath, + (output_bfd, command_line.soname, rpath, command_line.filter_shlib, |