blob: a3f7d62898b25fdba96194dd29fef7a1b2b8f009 [file] [log] [blame]
Andrew Geissler7e0e3c02022-02-25 20:34:39 +00001From f820ab7ea7e94d4df548be3388163ff2efb2ea96 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 Geisslerd1e89492021-02-12 15:35:20 -06004Subject: [PATCH] binutils-cross: Do not generate linker script directories
Brad Bishop6e60e8b2018-02-01 10:27:11 -05005
6We don't place target libraries within ${exec_prefix}, we'd always place these
7within the target sysroot within the standard library directories. Worse, the
8append_to_lib_path code prefixes these paths with the sysroot which makes even
9less sense.
10
11These directories therefore don't make sense in our case and mean we have to
12relocate all the linker scripts if they're present. Dropping them
13gives a reasonable performance improvement/simplification.
14
15Upstream-Status: Inappropriate
16
17RP 2017/01/30
18
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080021 ld/genscripts.sh | 25 -------------------------
22 1 file changed, 25 deletions(-)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050023
24diff --git a/ld/genscripts.sh b/ld/genscripts.sh
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000025index 0c52ebee4d0..1acbe66bd2e 100755
Brad Bishop6e60e8b2018-02-01 10:27:11 -050026--- a/ld/genscripts.sh
27+++ b/ld/genscripts.sh
Andrew Geissler82c905d2020-04-13 13:39:40 -050028@@ -235,31 +235,6 @@ append_to_lib_path()
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029 fi
30 }
31
32-# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native
33-# except when LIBPATH=":".
34-if [ "${LIB_PATH}" != ":" ] ; then
35- libs=
36- if [ "x${TOOL_LIB}" = "x" ] ; then
37- if [ "x${NATIVE}" = "xyes" ] ; then
38- libs="${exec_prefix}/${target_alias}/lib"
39- fi
40- else
41- # For multilib'ed targets, ensure both ${target_alias}/lib${LIBPATH_SUFFIX}
42- # and ${TOOL_LIB}/lib${LIBPATH_SUFFIX} are in the default search path,
43- # because 64bit libraries may be in both places, depending on
44- # cross-development setup method (e.g.: /usr/s390x-linux/lib64
45- # vs. /usr/s390-linux/lib64)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080046- for libpath_suffix in ${LIBPATH_SUFFIX}; do
47- case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in
48- :* | *::* | *:*:*${libpath_suffix}) ;;
49- *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;;
50- esac
51- done
Brad Bishop6e60e8b2018-02-01 10:27:11 -050052- libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}"
53- fi
54- append_to_lib_path ${libs}
55-fi
56-
57 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
58 libs=${NATIVE_LIB_DIRS}
59 if [ "x${NATIVE}" = "xyes" ] ; then