From 00b2bfc1241710d4afc34d7b123a6c0ea8b609e5 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 28 Jan 2008 16:57:22 +0000
Subject: [PATCH] * config.bfd (x86_64-*-solaris2): Add support for this
 target. * configure.tgt (x86_64-*-solaris2): Add support for this target.

---
 bfd/ChangeLog    | 4 ++++
 bfd/config.bfd   | 7 +++++++
 ld/ChangeLog     | 4 ++++
 ld/configure.tgt | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e95e50fca7..9c76971bba 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-28  Fabian Groffen  <grobian@gentoo.org>
+
+	* config.bfd (x86_64-*-solaris2): Add support for this target.
+
 2008-01-28  Alan Modra  <amodra@bigpond.net.au>
 
 	Rewrite SPU overlay handling code.  Put overlay calls stubs in the
diff --git a/bfd/config.bfd b/bfd/config.bfd
index fdce6a5edd..69a70f6cc3 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -489,6 +489,13 @@ case "${targ}" in
     targ64_selvecs=bfd_elf64_x86_64_vec
     want64=true
     ;;
+#ifdef BFD64
+  x86_64-*-solaris2*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="bfd_elf64_x86_64_vec i386coff_vec"
+    want64=true
+    ;;
+#endif
   i[3-7]86-*-kaos*)
     targ_defvec=bfd_elf32_i386_vec
     targ_selvecs=bfd_elf32_i386_vec
diff --git a/ld/ChangeLog b/ld/ChangeLog
index b6ac62f93c..53a9b88027 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-28  Fabian Groffen  <grobian@gentoo.org>
+
+	* configure.tgt (x86_64-*-solaris2): Add support for this target.
+
 2008-01-28  Vincent Riviere  <vincent.riviere@freesbee.fr>
 
 	PR ld/5652
diff --git a/ld/configure.tgt b/ld/configure.tgt
index e897d1eae2..0f3a454ea6 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -206,6 +206,11 @@ i[3-7]86-*-solaris2*)	targ_emul=elf_i386_ldso
                         targ_extra_emuls="elf_i386 elf_x86_64"
 			targ_extra_libpath=$targ_extra_emuls
                         ;;
+x86_64-*-solaris2*)
+			targ_emul=elf_x86_64
+			targ_extra_emuls="elf_i386 elf_i386_ldso"
+			targ_extra_libpath=elf_i386
+			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
 i[3-7]86-*-unixware)	targ_emul=elf_i386 ;;
 i[3-7]86-*-solaris*)	targ_emul=elf_i386_ldso
                         targ_extra_emuls="elf_i386"