summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2006-10-03 22:55:01 +0000
committerJoseph Myers <joseph@codesourcery.com>2006-10-03 22:55:01 +0000
commit51935c1d642d9bb81c1c3119dcb28a1694ca365d (patch)
treea936536fb23e8df3ab2ae04349bbb0ffd91b579c
parentc8afed084f783c05859fe2180d11061d6c1fef67 (diff)
downloadbinutils-gdb-51935c1d642d9bb81c1c3119dcb28a1694ca365d.tar.gz
ld/
* configure.tgt (i[3-7]86-*-linux-*): Also define targ_extra_libpath in want64 case. * emulparams/elf_x86_64.sh: Handle i[3-7]86-*-linux-* the same as x86_64*-linux*.
-rw-r--r--ChangeLog.csl8
-rw-r--r--ld/configure.tgt1
-rw-r--r--ld/emulparams/elf_x86_64.sh2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 7c1b55f3de9..00483a85503 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,11 @@
+2006-10-03 Joseph Myers <joseph@codesourcery.com>
+
+ ld/
+ * configure.tgt (i[3-7]86-*-linux-*): Also define
+ targ_extra_libpath in want64 case.
+ * emulparams/elf_x86_64.sh: Handle i[3-7]86-*-linux-* the same as
+ x86_64*-linux*.
+
2006-09-29 Nathan Sidwell <nathan@codesourcery.com>
binutils/
diff --git a/ld/configure.tgt b/ld/configure.tgt
index a7f695ef5e6..fe41d97a476 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -153,6 +153,7 @@ i[3-7]86-*-linux-*) targ_emul=elf_i386
targ_extra_emuls=i386linux
if test x${want64} = xtrue; then
targ_extra_emuls="$targ_extra_emuls elf_x86_64"
+ targ_extra_libpath=elf_x86_64
fi
tdir_i386linux=${targ_alias}aout ;;
x86_64-*-linux-*) targ_emul=elf_x86_64
diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh
index 35240df04cf..7f4af70140c 100644
--- a/ld/emulparams/elf_x86_64.sh
+++ b/ld/emulparams/elf_x86_64.sh
@@ -25,7 +25,7 @@ fi
# Linux modify the default library search path to first include
# a 64-bit specific directory.
case "$target" in
- x86_64*-linux*)
+ x86_64*-linux*|i[3-7]86-*-linux-*)
case "$EMULATION_NAME" in
*64*) LIBPATH_SUFFIX=64 ;;
esac