From 905024346b1f99e98b2cd83d43d4e962f8e43373 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] 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 --- ld/genscripts.sh | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh index ce95ac9f410..fb9f3ffa047 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -245,31 +245,6 @@ append_to_lib_path() fi } -# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native -# except when LIB_PATH=":". -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) - for libpath_suffix in ${LIBPATH_SUFFIX}; do - case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in - :* | *::* | *:*:*${libpath_suffix}) ;; - *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;; - esac - done - 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