This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] Skip directories with LIBPATH_SUFFIX_SKIP suffix
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sourceware dot org
- Cc: nickc at redhat dot com
- Date: Wed, 15 Jan 2014 12:57:38 -0800
- Subject: [PATCH] Skip directories with LIBPATH_SUFFIX_SKIP suffix
- Authentication-results: sourceware.org; auth=none
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
On Linux/x86-64, when binutils is configured with --libdir=/usr/lib64,
genscripts.sh treats /usr/lib64 as the default search directory. It
puts /usr/lib64 in linker scripts for all emulations, like
---
/* Script for -z combreloc: combine and sort reloc sections */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
OUTPUT_ARCH(i386)
ENTRY(_start)
SEARCH_DIR("/usr/x86_64-redhat-linux/lib32");
SEARCH_DIR("/usr/i386-redhat-linux/lib32"); SEARCH_DIR("/usr/lib6432");
SEARCH_DIR("/usr/local/lib32"); SEARCH_DIR("/lib32");
SEARCH_DIR("/usr/lib32"); SEARCH_DIR("/usr/i386-redhat-linux/lib");
SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/local/lib");
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
---
/usr/lib6432 is odd and /usr/lib64 is wrong. This patch changes
genscripts.sh to check LIBPATH_SUFFIX_SKIP if it is defined. It
skips directories with LIBPATH_SUFFIX_SKIP suffix. OK to install?
Thanks.
H.J.
PR ld/16456
* genscripts.sh: Don't search directory with LIBPATH_SUFFIX_SKIP
suffix.
* emulparams/elf32_x86_64.sh (LIBPATH_SUFFIX_SKIP): Set to 64
for elf32_x86_64 emulation.
* emulparams/elf_i386.sh (LIBPATH_SUFFIX_SKIP): Set to 64
for elf_i386 emulation.
---
ld/ChangeLog | 10 ++++++++++
ld/emulparams/elf32_x86_64.sh | 9 +++++++--
ld/emulparams/elf_i386.sh | 5 ++++-
ld/genscripts.sh | 30 ++++++++++++++++++++----------
4 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 91055de..2a239c8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-16 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/16456
+ * genscripts.sh: Don't search directory with LIBPATH_SUFFIX_SKIP
+ suffix.
+ * emulparams/elf32_x86_64.sh (LIBPATH_SUFFIX_SKIP): Set to 64
+ for elf32_x86_64 emulation.
+ * emulparams/elf_i386.sh (LIBPATH_SUFFIX_SKIP): Set to 64
+ for elf_i386 emulation.
+
2014-01-15 H.J. Lu <hongjiu.lu@intel.com>
* emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
diff --git a/ld/emulparams/elf32_x86_64.sh b/ld/emulparams/elf32_x86_64.sh
index d34297b..11d17ad 100644
--- a/ld/emulparams/elf32_x86_64.sh
+++ b/ld/emulparams/elf32_x86_64.sh
@@ -29,8 +29,13 @@ fi
case "$target" in
x86_64*-linux*|i[3-7]86-*-linux-*)
case "$EMULATION_NAME" in
- *32*) LIBPATH_SUFFIX=x32 ;;
- *64*) LIBPATH_SUFFIX=64 ;;
+ *32*)
+ LIBPATH_SUFFIX=x32
+ LIBPATH_SUFFIX_SKIP=64
+ ;;
+ *64*)
+ LIBPATH_SUFFIX=64
+ ;;
esac
;;
esac
diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh
index add700f..93f1992 100644
--- a/ld/emulparams/elf_i386.sh
+++ b/ld/emulparams/elf_i386.sh
@@ -19,7 +19,10 @@ IREL_IN_PLT=
case "$target" in
x86_64*-linux* | i[3-7]86*-linux*)
case "$EMULATION_NAME" in
- *i386*) LIBPATH_SUFFIX=32 ;;
+ *i386*)
+ LIBPATH_SUFFIX=32
+ LIBPATH_SUFFIX_SKIP=64
+ ;;
esac
;;
esac
diff --git a/ld/genscripts.sh b/ld/genscripts.sh
index a4da92d..eeb6d73 100755
--- a/ld/genscripts.sh
+++ b/ld/genscripts.sh
@@ -160,6 +160,7 @@ append_to_lib_path()
if [ "x${use_sysroot}" = "xyes" ] ; then
lib="=${lib}"
fi
+ skip_lib=no
if test -n "${LIBPATH_SUFFIX}"; then
case "${lib}" in
*${LIBPATH_SUFFIX})
@@ -169,18 +170,27 @@ append_to_lib_path()
*) lib_path1=${lib_path1}:${lib} ;;
esac ;;
*)
- case :${lib_path1}: in
- *:${lib}${LIBPATH_SUFFIX}:*) ;;
- ::) lib_path1=${lib}${LIBPATH_SUFFIX} ;;
- *) lib_path1=${lib_path1}:${lib}${LIBPATH_SUFFIX} ;;
- esac ;;
+ if test -n "${LIBPATH_SUFFIX_SKIP}"; then
+ case "${lib}" in
+ *${LIBPATH_SUFFIX_SKIP}) skip_lib=yes ;;
+ esac
+ fi
+ if test "${skip_lib}" = "no"; then
+ case :${lib_path1}: in
+ *:${lib}${LIBPATH_SUFFIX}:*) ;;
+ ::) lib_path1=${lib}${LIBPATH_SUFFIX} ;;
+ *) lib_path1=${lib_path1}:${lib}${LIBPATH_SUFFIX} ;;
+ esac
+ fi ;;
+ esac
+ fi
+ if test "${skip_lib}" = "no"; then
+ case :${lib_path1}:${lib_path2}: in
+ *:${lib}:*) ;;
+ *::) lib_path2=${lib} ;;
+ *) lib_path2=${lib_path2}:${lib} ;;
esac
fi
- case :${lib_path1}:${lib_path2}: in
- *:${lib}:*) ;;
- *::) lib_path2=${lib} ;;
- *) lib_path2=${lib_path2}:${lib} ;;
- esac
done
fi
}
--
1.8.3.1