Unbreak on Bitrig/amd64, ARM support not implemented yet.

Patches filed upstream as binutils/18920

Reviewed by wiz@

6 files changed, 106 insertions, 1 deletions

diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index b7a6aefc1a6..a6bfda2b6f5 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,15 +1,20 @@
-$NetBSD: distinfo,v 1.23 2015/06/13 10:54:39 dsainty Exp $
+$NetBSD: distinfo,v 1.24 2015/09/03 20:55:55 sevan Exp $
 
 SHA1 (binutils-2.25.tar.bz2) = b46cc90ebaba7ffcf6c6d996d60738881b14e50d
 RMD160 (binutils-2.25.tar.bz2) = af6f54aa304d4840e1b1a3bd8a4cd165b30f9c1e
 Size (binutils-2.25.tar.bz2) = 24049133 bytes
 SHA1 (patch-aa) = 1a127f82c807cbd1ac6fee073c618f3fb48667f6
 SHA1 (patch-bfd_cache.c) = db48182cee9f0bf16fbefca260b542171f0ef596
+SHA1 (patch-bfd_config.bfd) = 4383d7dc10996e0f14f4ad0e80ac9c56f01df5ea
+SHA1 (patch-bfd_configure) = 3beac7243447be24c28ec5f6451e43c05d460787
+SHA1 (patch-bfd_configure.ac) = cfff26cead0f2727503eac7d3338150837e88a0b
 SHA1 (patch-configure.ac) = 7bd7b90e57d850705286f2cc6464ecc45e0657c0
 SHA1 (patch-gas_configure) = 2365091529f5444c8c3a0615304cd4a2b043625c
+SHA1 (patch-gas_configure.tgt) = 15089d02437af6d3130d33367d93414b0d96a7ff
 SHA1 (patch-gold_Makefile.in) = ca87f7589025752713127110cbf9738f1080b62a
 SHA1 (patch-gold_options.h) = 3a1f9f59a1ce105f8f8d5a09fe60e0fe673b61a9
 SHA1 (patch-gold_resolve.cc) = 7e6c45cafddc73a4195c4bdacc43102a0fde3c13
 SHA1 (patch-gold_system.h) = 68655247b884cd520daf6a98cbc3f365396049bd
 SHA1 (patch-include_safe-ctype.h) = 480c46b1528f623435e9b52b7ba8247745e4e254
+SHA1 (patch-ld_configure.tgt) = 7b6c20bf268edee913ed4e421e62ac33409ec403
 SHA1 (patch-libiberty_Makefile.in) = fd07f4fafe6c25e9ab65c65ec3807c89bfd9f0b5
diff --git a/devel/binutils/patches/patch-bfd_config.bfd b/devel/binutils/patches/patch-bfd_config.bfd
new file mode 100644
index 00000000000..9b24276e0c9
--- /dev/null
+++ b/devel/binutils/patches/patch-bfd_config.bfd
@@ -0,0 +1,25 @@
+$NetBSD: patch-bfd_config.bfd,v 1.1 2015/09/03 20:55:55 sevan Exp $
+
+Add Bitrig/amd64 support
+https://sourceware.org/bugzilla/show_bug.cgi?id=18920
+
+--- bfd/config.bfd.orig	Thu Sep  3 16:46:04 2015
++++ bfd/config.bfd
+@@ -615,7 +620,7 @@ case "${targ}" in
+     targ_selvecs="i386_elf32_vec i386_aout_bsd_vec"
+     targ_underscore=yes
+     ;;
+-  i[3-7]86-*-openbsd*)
++  i[3-7]86-*-openbsd* | i[3-7]86-*-bitrig*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=i386_aout_nbsd_vec
+     ;;
+@@ -666,7 +671,7 @@ case "${targ}" in
+     targ_selvecs="i386_elf32_fbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
+     want64=true
+     ;;
+-  x86_64-*-netbsd* | x86_64-*-openbsd*)
++  x86_64-*-netbsd* | x86_64-*-openbsd* | x86_64-*-bitrig*)
+     targ_defvec=x86_64_elf64_vec
+     targ_selvecs="i386_elf32_vec i386_aout_nbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+     want64=true
diff --git a/devel/binutils/patches/patch-bfd_configure b/devel/binutils/patches/patch-bfd_configure
new file mode 100644
index 00000000000..8940ac0cc28
--- /dev/null
+++ b/devel/binutils/patches/patch-bfd_configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-bfd_configure,v 1.1 2015/09/03 20:55:55 sevan Exp $
+
+Add Bitrig/amd64 support
+https://sourceware.org/bugzilla/show_bug.cgi?id=18920
+
+--- bfd/configure.orig	Thu Sep  3 16:43:37 2015
++++ bfd/configure
+@@ -14175,7 +14175,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+   x86_64-*-linux*)
+ 	CORE_HEADER='"hosts/x86-64linux.h"'
+ 	;;
+-  x86_64-*-netbsd* | x86_64-*-openbsd*)
++  x86_64-*-netbsd* | x86_64-*-openbsd* | x86_64-*-bitrig*)
+ 	COREFILE=netbsd-core.lo
+ 	;;
+   esac
diff --git a/devel/binutils/patches/patch-bfd_configure.ac b/devel/binutils/patches/patch-bfd_configure.ac
new file mode 100644
index 00000000000..7f7bf38900c
--- /dev/null
+++ b/devel/binutils/patches/patch-bfd_configure.ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-bfd_configure.ac,v 1.1 2015/09/03 20:55:55 sevan Exp $
+
+Add Bitrig/amd64 support
+https://sourceware.org/bugzilla/show_bug.cgi?id=18920
+
+--- bfd/configure.ac.orig	Thu Sep  3 16:39:03 2015
++++ bfd/configure.ac
+@@ -311,7 +311,7 @@ changequote([,])dnl
+ 	TRAD_HEADER='"hosts/i386bsd.h"'
+ 	;;
+ changequote(,)dnl
+-  i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd*)
++  i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd* | i[3-7]86-*-bitrig*)
+ changequote([,])dnl
+ 	COREFILE=netbsd-core.lo
+ 	;;
+@@ -485,7 +485,7 @@ changequote([,])dnl
+   x86_64-*-linux*)
+ 	CORE_HEADER='"hosts/x86-64linux.h"'
+ 	;;
+-  x86_64-*-netbsd* | x86_64-*-openbsd*)
++  x86_64-*-netbsd* | x86_64-*-openbsd* | x86_64-*-bitrig*)
+ 	COREFILE=netbsd-core.lo
+ 	;;
+   esac
diff --git a/devel/binutils/patches/patch-gas_configure.tgt b/devel/binutils/patches/patch-gas_configure.tgt
new file mode 100644
index 00000000000..985ad3c121a
--- /dev/null
+++ b/devel/binutils/patches/patch-gas_configure.tgt
@@ -0,0 +1,15 @@
+$NetBSD: patch-gas_configure.tgt,v 1.1 2015/09/03 20:55:55 sevan Exp $
+
+Add Bitrig/amd64 support
+https://sourceware.org/bugzilla/show_bug.cgi?id=18920
+
+--- gas/configure.tgt.orig	Thu Sep  3 16:57:30 2015
++++ gas/configure.tgt
+@@ -231,6 +232,7 @@ case ${generic_target} in
+   i386-*-openbsd[0-2].* | \
+   i386-*-openbsd3.[0-2])		fmt=aout em=nbsd ;;
+   i386-*-openbsd*)			fmt=elf em=nbsd ;;
++  i386-*-bitrig*)			fmt=elf em=nbsd ;;
+   i386-*-linux*aout*)			fmt=aout em=linux ;;
+   i386-*-linux*oldld)			fmt=aout em=linux ;;
+   i386-*-linux*coff*)			fmt=coff em=linux ;;
diff --git a/devel/binutils/patches/patch-ld_configure.tgt b/devel/binutils/patches/patch-ld_configure.tgt
new file mode 100644
index 00000000000..2823624e04b
--- /dev/null
+++ b/devel/binutils/patches/patch-ld_configure.tgt
@@ -0,0 +1,19 @@
+$NetBSD: patch-ld_configure.tgt,v 1.3 2015/09/03 20:55:55 sevan Exp $
+
+Add Bitrig/amd64 support
+https://sourceware.org/bugzilla/show_bug.cgi?id=18920
+
+--- ld/configure.tgt.orig	Thu Sep  3 17:11:33 2015
++++ ld/configure.tgt
+@@ -282,6 +283,11 @@ x86_64-*-netbsd*)	targ_emul=elf_x86_64
+ 			*)		tdir_elf_i386=`echo ${tdir_elf_i386} | \
+ 				        sed -e 's/netbsd/netbsdelf/'`;;
+ 			esac ;;
++i[3-7]86-*-bitrig*)	targ_emul=i386nbsd
++			targ_extra_emuls=elf_i386 ;;
++x86_64-*-bitrig*)	targ_emul=elf_x86_64
++			targ_extra_emuls="elf_i386 i386nbsd elf_l1om elf_k1om"
++			;;
+ i[3-7]86-*-netware)	targ_emul=i386nw ;;
+ i[3-7]86-*-elf*)	targ_emul=elf_i386 ;;
+ x86_64-*-elf*)		targ_emul=elf_x86_64