summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-03-02 02:06:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:11 +0100
commitb559d7f81f0793e70bdfcf6c1258530ba07c0217 (patch)
tree18910f69e4552c7f68e7b2992deb6960dabb7832 /meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
parent1cb175fd7b9b1b954ccbc71f45fd968069c76b2a (diff)
downloadpoky-b559d7f81f0793e70bdfcf6c1258530ba07c0217.tar.gz
binutils: Switch to using binutils stable/2.25 branch
We have a lot of patches on top of 2.25 release that we need its easier/cleaner to use the git src instead of tarball and use the latest on the 2.25 branch Additionally, drop binutils-uclibc-300-006_better_file_error.patch since it has been redone with https://sourceware.org/ml/binutils/2006-10/msg00337.html upstream git'ify the patches against upstream repos for better maintainance Change-Id: I572c9bb49f60853e7ade4e8f63ab77b7e41476c5 (From OE-Core rev: 3c7fe424f850af70989ad682dd9c5be70cd02ca5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
new file mode 100644
index 0000000000..e3cd2a4d64
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -0,0 +1,41 @@
1From 3126608b8c95a792ade56cf62a531d935d391c50 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000
4Subject: [PATCH 04/13] Only generate an RPATH entry if LD_RUN_PATH is not
5 empty
6
7for cases where -rpath isn't specified. debian (#151024)
8
9Upstream-Status: Pending
10
11Signed-off-by: Chris Chimelis <chris@debian.org>
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 ld/emultempl/elf32.em | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
18index 36dee8e..07bea52 100644
19--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em
21@@ -1198,6 +1198,8 @@ fragment <<EOF
22 && command_line.rpath == NULL)
23 {
24 lib_path = (const char *) getenv ("LD_RUN_PATH");
25+ if ((lib_path) && (strlen (lib_path) == 0))
26+ lib_path = NULL;
27 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
28 force))
29 break;
30@@ -1461,6 +1463,8 @@ gld${EMULATION_NAME}_before_allocation (void)
31 rpath = command_line.rpath;
32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH");
34+ if ((rpath) && (strlen (rpath) == 0))
35+ rpath = NULL;
36
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39--
402.1.4
41