mirror of
https://git.yoctoproject.org/poky
synced 2026-02-11 19:23:03 +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>
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From a0e893ea094c48fa803046ffa89e31907aee0597 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 2 Mar 2015 01:09:58 +0000
|
|
Subject: [PATCH 04/15] Point scripts location to libdir
|
|
|
|
Upstream-Status: Inappropriate [debian patch]
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
ld/Makefile.am | 2 +-
|
|
ld/Makefile.in | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ld/Makefile.am b/ld/Makefile.am
|
|
index 6243c12528..3c5d6c8202 100644
|
|
--- a/ld/Makefile.am
|
|
+++ b/ld/Makefile.am
|
|
@@ -57,7 +57,7 @@ endif
|
|
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
|
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
|
# directives need to be different for native and cross linkers.
|
|
-scriptdir = $(tooldir)/lib
|
|
+scriptdir = $(libdir)
|
|
|
|
EMUL = @EMUL@
|
|
EMULATION_OFILES = @EMULATION_OFILES@
|
|
diff --git a/ld/Makefile.in b/ld/Makefile.in
|
|
index 760c037f9d..6dea692869 100644
|
|
--- a/ld/Makefile.in
|
|
+++ b/ld/Makefile.in
|
|
@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
|
|
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
|
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
|
# directives need to be different for native and cross linkers.
|
|
-scriptdir = $(tooldir)/lib
|
|
+scriptdir = $(libdir)
|
|
BASEDIR = $(srcdir)/..
|
|
BFDDIR = $(BASEDIR)/bfd
|
|
INCDIR = $(BASEDIR)/include
|
|
--
|
|
2.16.1
|
|
|