diff options
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 | 8 |
1 files changed, 4 insertions, 4 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 1f589718ed..1bad53175e 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 79e53510b1f9e16a21db312698fb1c1c442481e7 Mon Sep 17 00:00:00 2001 | 1 | From 66861bff389434e3454c7650ee29fade7a1cc5ed 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,7 +15,7 @@ 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 1ad9d6b6fa..6a025a45b4 100644 | 18 | index f4f7ad6b4e..cfd787ff28 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 | @@ -1471,6 +1471,8 @@ fragment <<EOF | 21 | @@ -1471,6 +1471,8 @@ fragment <<EOF |
@@ -27,7 +27,7 @@ index 1ad9d6b6fa..6a025a45b4 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 | @@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void) | 30 | @@ -1746,6 +1748,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 1ad9d6b6fa..6a025a45b4 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.18.0 | 40 | 2.20.1 |
41 | 41 | ||