Configuration changes to support FreeBSD. The linker only works for

ELF, not a.out.  But all the other tools support both.  I'm not so
sure about the assembler -- it might need more work.

4 files changed, 17 insertions, 2 deletions

diff --git a/contrib/binutils/gas/config/tc-i386.h b/contrib/binutils/gas/config/tc-i386.h
index 8205f53..139ccc7 100644
--- a/contrib/binutils/gas/config/tc-i386.h
+++ b/contrib/binutils/gas/config/tc-i386.h
@@ -69,6 +69,9 @@ extern int tc_i386_fix_adjustable PARAMS ((struct fix *));
 #define TARGET_ARCH		bfd_arch_i386
 
 #ifdef OBJ_AOUT
+#ifdef TE_FreeBSD
+#define TARGET_FORMAT		"a.out-i386-freebsd"
+#endif
 #ifdef TE_NetBSD
 #define TARGET_FORMAT		"a.out-i386-netbsd"
 #endif
diff --git a/contrib/binutils/gas/config/te-freebsd.h b/contrib/binutils/gas/config/te-freebsd.h
new file mode 100644
index 0000000..1314235
--- /dev/null
+++ b/contrib/binutils/gas/config/te-freebsd.h
@@ -0,0 +1,8 @@
+/*
+ * Target environment for FreeBSD.  It is the same as the generic
+ * target, except it arranges to suppress the use of "/" as a comment
+ * character.  Some code in the FreeBSD kernel uses "/" to mean
+ * division.  (What a concept.)
+ */
+#define TE_FreeBSD 1
+#include "te-generic.h"
diff --git a/contrib/binutils/gas/configure b/contrib/binutils/gas/configure
index b188f4f..661cea9 100755
--- a/contrib/binutils/gas/configure
+++ b/contrib/binutils/gas/configure
@@ -817,8 +817,10 @@ for this_target in $target $canon_targets ; do
       i386-*-linux*)        fmt=elf em=linux ;;
       i386-*-lynxos*)       fmt=coff targ=i386coff
 			     em=lynx ;;
-      i386-*-sysv4* | i386-*-solaris* | i386-*-elf | i386-*-freebsdelf*)
+      i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
 			    fmt=elf ;;
+      i386-*-freebsdelf*)   fmt=elf em=freebsd ;;
+      i386-*-freebsd*)      fmt=aout em=freebsd bfd_gas=yes ;;
       i386-*-sco*elf*)      fmt=elf targ=sco5 ;;
       i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
 			    fmt=coff targ=i386coff ;;
diff --git a/contrib/binutils/gas/configure.in b/contrib/binutils/gas/configure.in
index 81e1209..9431028 100644
--- a/contrib/binutils/gas/configure.in
+++ b/contrib/binutils/gas/configure.in
@@ -160,8 +160,10 @@ changequote([,])dnl
       i386-*-linux*)        fmt=elf em=linux ;;
       i386-*-lynxos*)       fmt=coff targ=i386coff
 			     em=lynx ;;
-      i386-*-sysv4* | i386-*-solaris* | i386-*-elf | i386-*-freebsdelf*)
+      i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
 			    fmt=elf ;;
+      i386-*-freebsdelf*)   fmt=elf em=freebsd ;;
+      i386-*-freebsd*)      fmt=aout em=freebsd bfd_gas=yes ;;
       i386-*-sco*elf*)      fmt=elf targ=sco5 ;;
       i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
 			    fmt=coff targ=i386coff ;;