62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
|
From 8f929c616208351d0971d7dfd7574d48d3144603 Mon Sep 17 00:00:00 2001
|
||
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
Date: Mon, 6 Mar 2017 23:37:05 -0800
|
||
|
Subject: [PATCH 02/15] binutils-cross: Do not generate linker script
|
||
|
directories
|
||
|
|
||
|
We don't place target libraries within ${exec_prefix}, we'd always place these
|
||
|
within the target sysroot within the standard library directories. Worse, the
|
||
|
append_to_lib_path code prefixes these paths with the sysroot which makes even
|
||
|
less sense.
|
||
|
|
||
|
These directories therefore don't make sense in our case and mean we have to
|
||
|
relocate all the linker scripts if they're present. Dropping them
|
||
|
gives a reasonable performance improvement/simplification.
|
||
|
|
||
|
Upstream-Status: Inappropriate
|
||
|
|
||
|
RP 2017/01/30
|
||
|
|
||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
---
|
||
|
ld/genscripts.sh | 23 -----------------------
|
||
|
1 file changed, 23 deletions(-)
|
||
|
|
||
|
diff --git a/ld/genscripts.sh b/ld/genscripts.sh
|
||
|
index a42c4d7a4b..d727b4d07e 100755
|
||
|
--- a/ld/genscripts.sh
|
||
|
+++ b/ld/genscripts.sh
|
||
|
@@ -189,29 +189,6 @@ append_to_lib_path()
|
||
|
fi
|
||
|
}
|
||
|
|
||
|
-# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native
|
||
|
-# except when LIBPATH=":".
|
||
|
-if [ "${LIB_PATH}" != ":" ] ; then
|
||
|
- libs=
|
||
|
- if [ "x${TOOL_LIB}" = "x" ] ; then
|
||
|
- if [ "x${NATIVE}" = "xyes" ] ; then
|
||
|
- libs="${exec_prefix}/${target_alias}/lib"
|
||
|
- fi
|
||
|
- else
|
||
|
- # For multilib'ed targets, ensure both ${target_alias}/lib${LIBPATH_SUFFIX}
|
||
|
- # and ${TOOL_LIB}/lib${LIBPATH_SUFFIX} are in the default search path,
|
||
|
- # because 64bit libraries may be in both places, depending on
|
||
|
- # cross-development setup method (e.g.: /usr/s390x-linux/lib64
|
||
|
- # vs. /usr/s390-linux/lib64)
|
||
|
- case "${NATIVE}:${LIBPATH_SUFFIX}:${TOOL_LIB}" in
|
||
|
- :* | *::* | *:*:*${LIBPATH_SUFFIX}) ;;
|
||
|
- *) libs="${exec_prefix}/${target_alias}/lib${LIBPATH_SUFFIX}" ;;
|
||
|
- esac
|
||
|
- libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}"
|
||
|
- fi
|
||
|
- append_to_lib_path ${libs}
|
||
|
-fi
|
||
|
-
|
||
|
if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
|
||
|
libs=${NATIVE_LIB_DIRS}
|
||
|
if [ "x${NATIVE}" = "xyes" ] ; then
|
||
|
--
|
||
|
2.14.0
|
||
|
|