diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-07-17 00:41:04 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-26 13:16:40 +0100 |
commit | 26810bc160bd78924a7f1fddac31afb4981f5b6b (patch) | |
tree | d47c36cb8ff424c8e88b14cb92198e80de9c5e32 /meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |
parent | 9245162e8bfc346c97d8e6c2ee5b77fc2c4bde92 (diff) | |
download | poky-26810bc160bd78924a7f1fddac31afb4981f5b6b.tar.gz |
binutils: Upgrade to 2.31 release branch
(From OE-Core rev: 7eeec2ad91eca6ba44ea7b761d47082f4ebb04cc)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.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.patch | 10 |
1 files changed, 5 insertions, 5 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 index 2f49969371..1f589718ed 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 518abb195d0eb47d8eef581d7fd0a5fd9fa73f7d Mon Sep 17 00:00:00 2001 | 1 | From 79e53510b1f9e16a21db312698fb1c1c442481e7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 | 3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 |
4 | Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not | 4 | Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not |
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
16 | 16 | ||
17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em | 17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em |
18 | index c0925fc9b9..7d7670a89f 100644 | 18 | index 1ad9d6b6fa..6a025a45b4 100644 |
19 | --- a/ld/emultempl/elf32.em | 19 | --- a/ld/emultempl/elf32.em |
20 | +++ b/ld/emultempl/elf32.em | 20 | +++ b/ld/emultempl/elf32.em |
21 | @@ -1470,6 +1470,8 @@ fragment <<EOF | 21 | @@ -1471,6 +1471,8 @@ fragment <<EOF |
22 | && command_line.rpath == NULL) | 22 | && command_line.rpath == NULL) |
23 | { | 23 | { |
24 | path = (const char *) getenv ("LD_RUN_PATH"); | 24 | path = (const char *) getenv ("LD_RUN_PATH"); |
@@ -27,7 +27,7 @@ index c0925fc9b9..7d7670a89f 100644 | |||
27 | if (path | 27 | if (path |
28 | && gld${EMULATION_NAME}_search_needed (path, &n, force)) | 28 | && gld${EMULATION_NAME}_search_needed (path, &n, force)) |
29 | break; | 29 | break; |
30 | @@ -1750,6 +1752,8 @@ gld${EMULATION_NAME}_before_allocation (void) | 30 | @@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void) |
31 | rpath = command_line.rpath; | 31 | rpath = command_line.rpath; |
32 | if (rpath == NULL) | 32 | if (rpath == NULL) |
33 | rpath = (const char *) getenv ("LD_RUN_PATH"); | 33 | rpath = (const char *) getenv ("LD_RUN_PATH"); |
@@ -37,5 +37,5 @@ index c0925fc9b9..7d7670a89f 100644 | |||
37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) | 37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) |
38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | 38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |
39 | -- | 39 | -- |
40 | 2.16.1 | 40 | 2.18.0 |
41 | 41 | ||