blob: 41dff05b25b720f00563a96a6176ec7b920b9793 [file] [log] [blame]
Andrew Geissler635e0e42020-08-21 15:58:33 -05001From 0d14f8f333a9b519202246ce779f3e380491826c Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800
Andrew Geissler635e0e42020-08-21 15:58:33 -05004Subject: [PATCH 02/17] binutils-cross: Do not generate linker script
5 directories
Brad Bishop6e60e8b2018-02-01 10:27:11 -05006
7We don't place target libraries within ${exec_prefix}, we'd always place these
8within the target sysroot within the standard library directories. Worse, the
9append_to_lib_path code prefixes these paths with the sysroot which makes even
10less sense.
11
12These directories therefore don't make sense in our case and mean we have to
13relocate all the linker scripts if they're present. Dropping them
14gives a reasonable performance improvement/simplification.
15
16Upstream-Status: Inappropriate
17
18RP 2017/01/30
19
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022 ld/genscripts.sh | 25 -------------------------
23 1 file changed, 25 deletions(-)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050024
25diff --git a/ld/genscripts.sh b/ld/genscripts.sh
Andrew Geissler635e0e42020-08-21 15:58:33 -050026index 435689ea144..cff8a1467f9 100755
Brad Bishop6e60e8b2018-02-01 10:27:11 -050027--- a/ld/genscripts.sh
28+++ b/ld/genscripts.sh
Andrew Geissler82c905d2020-04-13 13:39:40 -050029@@ -235,31 +235,6 @@ append_to_lib_path()
Brad Bishop6e60e8b2018-02-01 10:27:11 -050030 fi
31 }
32
33-# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native
34-# except when LIBPATH=":".
35-if [ "${LIB_PATH}" != ":" ] ; then
36- libs=
37- if [ "x${TOOL_LIB}" = "x" ] ; then
38- if [ "x${NATIVE}" = "xyes" ] ; then
39- libs="${exec_prefix}/${target_alias}/lib"
40- fi
41- else
42- # For multilib'ed targets, ensure both ${target_alias}/lib${LIBPATH_SUFFIX}
43- # and ${TOOL_LIB}/lib${LIBPATH_SUFFIX} are in the default search path,
44- # because 64bit libraries may be in both places, depending on
45- # cross-development setup method (e.g.: /usr/s390x-linux/lib64
46- # vs. /usr/s390-linux/lib64)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080047- for libpath_suffix in ${LIBPATH_SUFFIX}; do
48- case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in
49- :* | *::* | *:*:*${libpath_suffix}) ;;
50- *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;;
51- esac
52- done
Brad Bishop6e60e8b2018-02-01 10:27:11 -050053- libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}"
54- fi
55- append_to_lib_path ${libs}
56-fi
57-
58 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
59 libs=${NATIVE_LIB_DIRS}
60 if [ "x${NATIVE}" = "xyes" ] ; then
Andrew Geissler635e0e42020-08-21 15:58:33 -050061--
622.28.0
63