summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2009-10-06 15:27:31 -0700
committerKhem Raj <raj.khem@gmail.com>2009-10-06 15:31:34 -0700
commit44943f01becfb8e61bcaeb40f47e2fd64552b276 (patch)
tree5e7978a24dec181fd96cbb5994f91e5d98837779
parentfdcefeccac306b700d05c23ee8646b83aa91d891 (diff)
binutils-cvs: Refresh binutils-uclibc-300-012_check_ldrunpath_length.patch with latest CVS.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch19
1 files changed, 10 insertions, 9 deletions
diff --git a/recipes/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch b/recipes/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch
index 498651a90c..b6f5a25ceb 100644
--- a/recipes/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ b/recipes/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch
@@ -24,10 +24,11 @@ esac
exit 0
@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
---- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
-@@ -692,6 +692,8 @@
+Index: src/ld/emultempl/elf32.em
+===================================================================
+--- src.orig/ld/emultempl/elf32.em 2009-09-23 06:54:28.000000000 -0700
++++ src/ld/emultempl/elf32.em 2009-10-06 10:58:16.883414592 -0700
+@@ -1237,6 +1237,8 @@ fragment <<EOF
&& command_line.rpath == NULL)
{
lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -36,12 +37,12 @@ diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/
if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
force))
break;
-@@ -871,6 +873,8 @@
+@@ -1463,6 +1465,8 @@ gld${EMULATION_NAME}_before_allocation (
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
- (output_bfd, command_line.soname, rpath,
- command_line.filter_shlib,
++ rpath = NULL;
+
+ for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+ {