* cpu-i386.c (bfd_x86_64_arch): Rename to "i386:x86-64"

	* configure.tgt (x86_64-*-linux-gnu*): Configure i386 as native.

	* elf_x86_64.sh (ARCH): Set to i386:x86-64
	set libraries to default to lib64 paths.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1e6d014624f2d66393ed38745eaa247d4b422a04..e5bb9cef2a1ae5bd972341895df680a29aad2b42 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 18 18:06:54 CET 2002  Jan Hubicka  <jh@suse.cz>
+
+       * cpu-i386.c (bfd_x86_64_arch): Rename to "i386:x86-64"
+
 2002-03-07  Daniel Jacobowitz  <drow@mvista.com>
 
        * configure.in: Set is_release=y for 2.12 release.

diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 8619fbf569460076af2b386a9d74c82c2f0848ec..be8de4479df557cd73d1d3b38b3dfa81fd48be7b 100644 (file)
--- a/bfd/cpu-i386.c
+++ b/bfd/cpu-i386.c
@@ -44,8 +44,8 @@ const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
   8,  /* 8 bits in a byte */
   bfd_arch_i386,
   bfd_mach_x86_64_intel_syntax,
-  "x86-64:intel",
-  "x86-64:intel",
+  "i386:intel",
+  "i386:x86-64:intel",
   3,
   true,
   bfd_default_compatible,
@@ -75,8 +75,8 @@ const bfd_arch_info_type bfd_x86_64_arch =
   8,  /* 8 bits in a byte */
   bfd_arch_i386,
   bfd_mach_x86_64,
-  "x86-64",
-  "x86-64",
+  "i386",
+  "i386:x86-64",
   3,
   true,
   bfd_default_compatible,

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b5fd8b2c42010b7b2f76b4a1cc443121b522c0bf..18334ef23ed34819f051a41ec9cbe80e3f28aba8 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+Mon Mar 18 18:07:20 CET 2002  Jan Hubicka  <jh@suse.cz>
+                             Andreas Jaeger  <aj@suse.de>
+                             Andreas Schwab  <schwab@suse.de>
+
+       * cpu-i386.c (bfd_x86_64_arch): Rename to "i386:x86-64"
+
+       * configure.tgt (x86_64-*-linux-gnu*): Configure i386 as native.
+       
+       * elf_x86_64.sh (ARCH): Set to i386:x86-64
+       set libraries to default to lib64 paths.
+
 2002-03-07  Daniel Jacobowitz  <drow@mvista.com>
 
        * ld.texinfo: Wrap @menu in @ifnottex, not @ifinfo.

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 7828832e1d7d4d36ecd5ac79bf2eaba2a1c18d2e..08f5cbee3b87260da7cb4f42c82334578f0aba7d 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -145,7 +145,9 @@ i[3456]86-*-linux-gnu*)     targ_emul=elf_i386
                        ;;
 x86_64-*-linux-gnu*)   targ_emul=elf_x86_64
                        targ_extra_emuls="elf_i386 i386linux"
-                       tdir_i386linux=${targ_alias}aout
+                       targ_extra_libpath=elf_i386
+                       tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
+                       tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'`
                        ;;
 i[3456]86-*-sysv[45]*) targ_emul=elf_i386 ;;
 i[3456]86-*-solaris2*)  targ_emul=elf_i386_ldso

diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh
index 27931c76b2b7f0dfb940ca33549437e0a5f8698d..4f7433e541c0ab2175f91c3ceed999dd52fb55d1 100644 (file)
--- a/ld/emulparams/elf_x86_64.sh
+++ b/ld/emulparams/elf_x86_64.sh
@@ -4,9 +4,40 @@ OUTPUT_FORMAT="elf64-x86-64"
 TEXT_START_ADDR=0x400000
 MAXPAGESIZE=0x100000
 NONPAGED_TEXT_START_ADDR=0x400000
-ARCH=i386
+ARCH="i386:x86-64"
 MACHINE=
 NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 NO_SMALL_DATA=yes
+
+if [ "x${host}" = "x${target}" ]; then
+  case " $EMULATION_LIBPATH " in
+    *" ${EMULATION_NAME} "*)
+      # Native, and default or emulation requesting LIB_PATH.
+
+      # Linux modify the default library search path to first include
+      # a 64-bit specific directory.
+      case "$target" in
+        x86_64*-linux*)
+          suffix=64 ;;
+      esac
+
+      if [ -n "${suffix}" ]; then
+
+       LIB_PATH=/lib${suffix}:/lib
+       LIB_PATH=${LIB_PATH}:/usr/lib${suffix}:/usr/lib
+       if [ -n "${NATIVE_LIB_DIRS}" ]; then
+         LIB_PATH=${LIB_PATH}:`echo ${NATIVE_LIB_DIRS} | sed s_:_${suffix}:_g`${suffix}:${NATIVE_LIB_DIRS}
+       fi
+       if [ "${libdir}" != /usr/lib ]; then
+         LIB_PATH=${LIB_PATH}:${libdir}${suffix}:${libdir}
+       fi
+       if [ "${libdir}" != /usr/local/lib ]; then
+         LIB_PATH=${LIB_PATH}:/usr/local/lib${suffix}:/usr/local/lib
+       fi
+
+      fi
+    ;;
+  esac
+fi