summaryrefslogtreecommitdiff
path: root/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch
diff options
context:
space:
mode:
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.patch15
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,