blob: 32537d4b58b1cbe0b19e94bcb46981ffcbb5ed16 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 11927913560fc5a5d51af3bc5eb8ad62a86c9840 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
4Subject: [PATCH 02/15] binutils-cross: Do not generate linker script
5 directories
6
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
Brad Bishop19323692019-04-05 15:28:33 -040026index d789e77943..144e2e8736 100755
Brad Bishop6e60e8b2018-02-01 10:27:11 -050027--- a/ld/genscripts.sh
28+++ b/ld/genscripts.sh
Brad Bishop19323692019-04-05 15:28:33 -040029@@ -220,31 +220,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
61--
Brad Bishop19323692019-04-05 15:28:33 -0400622.20.1
Brad Bishop6e60e8b2018-02-01 10:27:11 -050063