mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 18:32:15 +02:00
6ccc45aed5
Additionally cherry-pick 5ffeba4a09 Revert "PowerPC PLT speculative execution barriers" b01452b1d4 [PR22764][LD][AARCH64]Allow R_AARCH64_ABS16 and R_AARCH64_ABS32 against absolution symbol or undefine symbol in shared object. a985e9b9de Import patch from mainline to remove PROVODE qualifiers around definitions of __CTOR_LIST__ and __DTOR_LIST__ in PE linker scripts. eec4607fc5 Add support for DWARF-4 line number tables. (From OE-Core rev: c708506eb9dbb4b817f563fbaacb80eee0b5b301) 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>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 518abb195d0eb47d8eef581d7fd0a5fd9fa73f7d Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 2 Mar 2015 01:27:17 +0000
|
|
Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not
|
|
empty
|
|
|
|
for cases where -rpath isn't specified. debian (#151024)
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Chris Chimelis <chris@debian.org>
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
ld/emultempl/elf32.em | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
|
|
index c0925fc9b9..7d7670a89f 100644
|
|
--- a/ld/emultempl/elf32.em
|
|
+++ b/ld/emultempl/elf32.em
|
|
@@ -1470,6 +1470,8 @@ fragment <<EOF
|
|
&& command_line.rpath == NULL)
|
|
{
|
|
path = (const char *) getenv ("LD_RUN_PATH");
|
|
+ if ((path) && (strlen (path) == 0))
|
|
+ path = NULL;
|
|
if (path
|
|
&& gld${EMULATION_NAME}_search_needed (path, &n, force))
|
|
break;
|
|
@@ -1750,6 +1752,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)
|
|
--
|
|
2.16.1
|
|
|