mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 17:26:36 +01: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>
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From e205ae05c41a8cc8d47708f0a3b6f740e2bf2526 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 2 Mar 2015 01:42:38 +0000
|
|
Subject: [PATCH 10/15] Fix rpath in libtool when sysroot is enabled
|
|
|
|
Enabling sysroot support in libtool exposed a bug where the final
|
|
library had an RPATH encoded into it which still pointed to the
|
|
sysroot. This works around the issue until it gets sorted out
|
|
upstream.
|
|
|
|
Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
ltmain.sh | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ltmain.sh b/ltmain.sh
|
|
index 70e856e065..11ee684ccc 100644
|
|
--- a/ltmain.sh
|
|
+++ b/ltmain.sh
|
|
@@ -8035,9 +8035,11 @@ EOF
|
|
test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
|
|
for libdir in $rpath; do
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
+ func_replace_sysroot "$libdir"
|
|
+ libdir=$func_replace_sysroot_result
|
|
+ func_stripname '=' '' "$libdir"
|
|
+ libdir=$func_stripname_result
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
- func_replace_sysroot "$libdir"
|
|
- libdir=$func_replace_sysroot_result
|
|
if test -z "$hardcode_libdirs"; then
|
|
hardcode_libdirs="$libdir"
|
|
else
|
|
@@ -8770,6 +8772,10 @@ EOF
|
|
hardcode_libdirs=
|
|
for libdir in $compile_rpath $finalize_rpath; do
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
+ func_replace_sysroot "$libdir"
|
|
+ libdir=$func_replace_sysroot_result
|
|
+ func_stripname '=' '' "$libdir"
|
|
+ libdir=$func_stripname_result
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
if test -z "$hardcode_libdirs"; then
|
|
hardcode_libdirs="$libdir"
|
|
--
|
|
2.16.1
|
|
|