diff options
author | Benoît Thébaudeau" <benoit.thebaudeau@advansee.com> | 2011-12-14 18:57:47 (GMT) |
---|---|---|
committer | Benoît Thébaudeau" <benoit.thebaudeau@advansee.com> | 2011-12-14 18:57:47 (GMT) |
commit | 25447b10c4bc59c4f875a90990d91914718ea3eb (patch) | |
tree | 9802fec0d29fa2b7f1280f1bbd7d6e13b355e13c /patches/binutils/2.22/300-012_check_ldrunpath_length.patch | |
parent | bcc636057f0b40e55ea61b395241e0bdc892845d (diff) |
binutils/binutils: add the patches used by BuildRoot for 2.22
Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'patches/binutils/2.22/300-012_check_ldrunpath_length.patch')
-rw-r--r-- | patches/binutils/2.22/300-012_check_ldrunpath_length.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/binutils/2.22/300-012_check_ldrunpath_length.patch b/patches/binutils/2.22/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000..b49cc04 --- /dev/null +++ b/patches/binutils/2.22/300-012_check_ldrunpath_length.patch @@ -0,0 +1,21 @@ +diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/elf32.em +--- binutils-2.22.orig/ld/emultempl/elf32.em 2011-11-21 10:29:39.000000000 +0100 ++++ binutils-2.22/ld/emultempl/elf32.em 2011-12-14 19:52:12.880783238 +0100 +@@ -1273,6 +1273,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1500,6 +1502,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |