summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-03-07 00:20:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-07 20:05:31 +0000
commit4485ea5807dd99b7f140b06b35654a6a70c286e4 (patch)
tree40e240190a18121f3ace7a528e9d836fc3762eb3 /meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
parentee18a2b23391a5308abd9bd817d2e2471ce00270 (diff)
downloadpoky-4485ea5807dd99b7f140b06b35654a6a70c286e4.tar.gz
binutils: Upgrade to 2.28 release
(From OE-Core rev: e9f839d5fe70a222cc7b8942f401ac86a10e6604) 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/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-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/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
new file mode 100644
index 0000000000..726f7020dd
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -0,0 +1,41 @@
1From 42292f5533bca904f230a8e03ceee1f84ef0c4ec 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 05/15] 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 84adaef6df..ab8c74257e 100644
19--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em
21@@ -1411,6 +1411,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@@ -1692,6 +1694,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.12.0
41