diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-10-17 18:37:08 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-05 16:50:47 +0100 |
commit | 51b7a5de6b5d88899e2defe090ba3924a1d78ea2 (patch) | |
tree | 45f21827030bed0abcdb69918c54bb688f82bffa | |
parent | d814a94a89c1f78a5313f5a72696a43002d17dda (diff) | |
download | OSELAS.Toolchain-51b7a5de6b5d88899e2defe090ba3924a1d78ea2.tar.gz OSELAS.Toolchain-51b7a5de6b5d88899e2defe090ba3924a1d78ea2.tar.xz |
binutils-2.22 patches
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/binutils-2.22/0001-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 36 | ||||
-rw-r--r-- | patches/binutils-2.22/series | 4 |
2 files changed, 40 insertions, 0 deletions
diff --git a/patches/binutils-2.22/0001-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/patches/binutils-2.22/0001-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch new file mode 100644 index 0000000..c0c778c --- /dev/null +++ b/patches/binutils-2.22/0001-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -0,0 +1,36 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 1 Nov 2011 16:45:55 +0100 +Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty, + for cases where -rpath isn't specified. + +This is http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=151024 + +This patch is still used in debian binutils 2.21.90.20111025-1 + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + ld/emultempl/elf32.em | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 78a708b..53e8919 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1273,6 +1273,8 @@ fragment <<EOF + && 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 @@ gld${EMULATION_NAME}_before_allocation (void) + 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) diff --git a/patches/binutils-2.22/series b/patches/binutils-2.22/series new file mode 100644 index 0000000..59e5333 --- /dev/null +++ b/patches/binutils-2.22/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +# 2bc8f5caabd1d41386e8713e7cb558dc - git-ptx-patches magic |