Port lib32 arangement from Debian.

	* emulparams/elf_i386.sh: Include lib32 directories in library search
	path.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2b0a3e4..fa4b9d0 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-15  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+       Port lib32 arangement from Debian.
+       * emulparams/elf_i386.sh: Include lib32 directories in library search
+       path.
+
 2012-11-15  Simon Baldwin  <simonb@google.com>
 
        * ldmain.c (main): Add start_sbrk set to sbrk(0) on entry.

diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh
index 665a1ad..add700f 100644 (file)
--- a/ld/emulparams/elf_i386.sh
+++ b/ld/emulparams/elf_i386.sh
@@ -13,3 +13,13 @@ GENERATE_PIE_SCRIPT=yes
 NO_SMALL_DATA=yes
 SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 12 ? 12 : 0"
 IREL_IN_PLT=
+
+# Linux modify the default library search path to first include
+# a 32-bit specific directory.
+case "$target" in
+  x86_64*-linux* | i[3-7]86*-linux*)
+    case "$EMULATION_NAME" in
+      *i386*) LIBPATH_SUFFIX=32 ;;
+    esac
+    ;;
+esac