7 files changed, 99 insertions, 59 deletions

diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index 7e62e2a59465..a256c5588fa3 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -12,12 +12,21 @@ SRCS+=	app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
 	flonum-mult.c frags.c hash.c input-file.c \
 	input-scrub.c listing.c literal.c macro.c messages.c \
 	output-file.c read.c sb.c stabs.c \
-	subsegs.c symbols.c write.c depend.c ehopt.c
+	subsegs.c symbols.c write.c depend.c ehopt.c dw2gencfi.c
 # DEO: why not used?
 #SRCS+=	itbl-ops.c
+
+.if ${TARGET_ARCH} == "sparc64"
+CFLAGS+= -DDEFAULT_ARCH=\"v9-64\"
+.else
+CFLAGS+= -DDEFAULT_ARCH=\"${BINUTILS_ARCH}\"
+.endif
+CFLAGS+= -DTARGET_CPU=\"${BINUTILS_ARCH}\"
+CFLAGS+= -DTARGET_CANONICAL=\"${TARGET_TUPLE}\"
+CFLAGS+= -DTARGET_ALIAS=\"${TARGET_TUPLE}\"
+CFLAGS+= -DVERSION=\"${VERSION}\"
+CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/..
-CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" 
-CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 NOSHARED?=	yes
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/config.h b/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
index 87b4d7162d35..d12238d3baf7 100644
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
@@ -2,7 +2,7 @@
 
 #define HAVE_DECL_GETOPT 1
 
-/* config.h.  Generated automatically by configure.  */
+/* config.h.  Generated by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
@@ -30,9 +30,6 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 /* #undef off_t */
 
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 /* #undef size_t */
 
@@ -142,16 +139,16 @@
 #define HAVE_UNISTD_H 1
 
 /* Define if you have the <values.h> header file.  */
-/* #undef HAVE_VALUES_H */
+#define HAVE_VALUES_H 1
 
 /* Define if you have the <varargs.h> header file.  */
-#define HAVE_VARARGS_H 1
+/* #undef HAVE_VARARGS_H */
 
 /* Name of package */
 #define PACKAGE "gas"
 
 /* Version number of package */
-/* #define VERSION "2.13.2" */
+/* #define VERSION "2.15" */
 
 /* Define if defaulting to ELF on SCO 5. */
 /* #undef SCO_ELF */
@@ -165,6 +162,18 @@
 /* Define as 1 if big endian. */
 /* #undef TARGET_BYTES_BIG_ENDIAN */
 
+/* Default CPU for MIPS targets.  */
+/* #undef MIPS_CPU_STRING_DEFAULT */
+
+/* Allow use of E_MIPS_ABI_O32 on MIPS targets.  */
+/* #undef USE_E_MIPS_ABI_O32 */
+
+/* Generate 64-bit code by default on MIPS targets.  */
+/* #undef MIPS_DEFAULT_64BIT */
+
+/* Choose a default ABI for MIPS targets.  */
+/* #undef MIPS_DEFAULT_ABI */
+
 /* Default architecture. */
 /* #undef DEFAULT_ARCH */
 
@@ -214,10 +223,10 @@
 /* #undef USE_EMULATIONS */
 
 /* Supported emulations. */
-#define EMULATIONS 
+/* #define EMULATIONS */
 
 /* Default emulation. */
-#define DEFAULT_EMULATION ""
+/* #define DEFAULT_EMULATION "" */
 
 /* old COFF support? */
 /* #undef MANY_SEGMENTS */
@@ -226,19 +235,19 @@
 #define BFD_ASSEMBLER 1
 
 /* Target alias. */
-#define TARGET_ALIAS "alpha-obrien-freebsd5"
+/* #define TARGET_ALIAS "alpha-obrien-freebsd5.2" */
 
 /* Canonical target. */
-#define TARGET_CANONICAL "alpha-obrien-freebsd5"
+/* #define TARGET_CANONICAL "alpha-obrien-freebsd5.2" */
 
 /* Target CPU. */
-#define TARGET_CPU "alpha"
+/* #define TARGET_CPU "alpha" */
 
 /* Target vendor. */
-#define TARGET_VENDOR "obrien"
+/* #define TARGET_VENDOR "obrien" */
 
 /* Target OS. */
-#define TARGET_OS "freebsd5"
+/* #define TARGET_OS "freebsd5.2" */
 
 /* Define if you have the stpcpy function */
 #define HAVE_STPCPY 1
diff --git a/gnu/usr.bin/binutils/as/amd64-freebsd/config.h b/gnu/usr.bin/binutils/as/amd64-freebsd/config.h
index 52bf7cbf8a57..22e67310c0b4 100644
--- a/gnu/usr.bin/binutils/as/amd64-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/amd64-freebsd/config.h
@@ -2,7 +2,7 @@
 
 #define HAVE_DECL_GETOPT 1
 
-/* config.h.  Generated automatically by configure.  */
+/* config.h.  Generated by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
@@ -30,9 +30,6 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 /* #undef off_t */
 
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 /* #undef size_t */
 
@@ -142,16 +139,16 @@
 #define HAVE_UNISTD_H 1
 
 /* Define if you have the <values.h> header file.  */
-/* #undef HAVE_VALUES_H */
+#define HAVE_VALUES_H 1
 
 /* Define if you have the <varargs.h> header file.  */
-#define HAVE_VARARGS_H 1
+/* #undef HAVE_VARARGS_H */
 
 /* Name of package */
 #define PACKAGE "gas"
 
 /* Version number of package */
-/* #define VERSION "2.13.2" */
+/* #define VERSION "2.15" */
 
 /* Define if defaulting to ELF on SCO 5. */
 /* #undef SCO_ELF */
@@ -165,8 +162,20 @@
 /* Define as 1 if big endian. */
 /* #undef TARGET_BYTES_BIG_ENDIAN */
 
+/* Default CPU for MIPS targets.  */
+/* #undef MIPS_CPU_STRING_DEFAULT */
+
+/* Allow use of E_MIPS_ABI_O32 on MIPS targets.  */
+/* #undef USE_E_MIPS_ABI_O32 */
+
+/* Generate 64-bit code by default on MIPS targets.  */
+/* #undef MIPS_DEFAULT_64BIT */
+
+/* Choose a default ABI for MIPS targets.  */
+/* #undef MIPS_DEFAULT_ABI */
+
 /* Default architecture. */
-#define DEFAULT_ARCH "x86_64"
+/* #undef DEFAULT_ARCH */
 
 /* Using cgen code? */
 /* #undef USING_CGEN */
@@ -214,10 +223,10 @@
 /* #undef USE_EMULATIONS */
 
 /* Supported emulations. */
-#define EMULATIONS &i386elf,
+/* #define EMULATIONS */
 
 /* Default emulation. */
-#define DEFAULT_EMULATION "i386elf"
+/* #define DEFAULT_EMULATION "" */
 
 /* old COFF support? */
 /* #undef MANY_SEGMENTS */
@@ -226,19 +235,19 @@
 #define BFD_ASSEMBLER 1
 
 /* Target alias. */
-#define TARGET_ALIAS "x86_64-obrien-freebsd5"
+/* #define TARGET_ALIAS "amd64-obrien-freebsd5.2.1" */
 
 /* Canonical target. */
-#define TARGET_CANONICAL "x86_64-obrien-freebsd5"
+/* #define TARGET_CANONICAL "amd64-obrien-freebsd5.2.1" */
 
 /* Target CPU. */
-#define TARGET_CPU "x86_64"
+/* #define TARGET_CPU "amd64" */
 
 /* Target vendor. */
-#define TARGET_VENDOR "obrien"
+/* #define TARGET_VENDOR "obrien" */
 
 /* Target OS. */
-#define TARGET_OS "freebsd5"
+/* #define TARGET_OS "freebsd5.2.1" */
 
 /* Define if you have the stpcpy function */
 #define HAVE_STPCPY 1
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/config.h b/gnu/usr.bin/binutils/as/i386-freebsd/config.h
index 81c5ce67212c..877cadd64929 100644
--- a/gnu/usr.bin/binutils/as/i386-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/i386-freebsd/config.h
@@ -2,7 +2,7 @@
 
 #define HAVE_DECL_GETOPT 1
 
-/* config.h.  Generated automatically by configure.  */
+/* config.h.  Generated by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
@@ -30,9 +30,6 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 /* #undef off_t */
 
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 /* #undef size_t */
 
@@ -142,16 +139,16 @@
 #define HAVE_UNISTD_H 1
 
 /* Define if you have the <values.h> header file.  */
-/* #undef HAVE_VALUES_H */
+#define HAVE_VALUES_H 1
 
 /* Define if you have the <varargs.h> header file.  */
-#define HAVE_VARARGS_H 1
+/* #undef HAVE_VARARGS_H */
 
 /* Name of package */
 #define PACKAGE "gas"
 
 /* Version number of package */
-/* #define VERSION "2.13.2" */
+/* #define VERSION "2.15" */
 
 /* Define if defaulting to ELF on SCO 5. */
 /* #undef SCO_ELF */
@@ -165,6 +162,18 @@
 /* Define as 1 if big endian. */
 /* #undef TARGET_BYTES_BIG_ENDIAN */
 
+/* Default CPU for MIPS targets.  */
+/* #undef MIPS_CPU_STRING_DEFAULT */
+
+/* Allow use of E_MIPS_ABI_O32 on MIPS targets.  */
+/* #undef USE_E_MIPS_ABI_O32 */
+
+/* Generate 64-bit code by default on MIPS targets.  */
+/* #undef MIPS_DEFAULT_64BIT */
+
+/* Choose a default ABI for MIPS targets.  */
+/* #undef MIPS_DEFAULT_ABI */
+
 /* Default architecture. */
 /* #define DEFAULT_ARCH "i386" */
 
@@ -214,10 +223,10 @@
 /* #undef USE_EMULATIONS */
 
 /* Supported emulations. */
-#define EMULATIONS &i386elf,
+/* #define EMULATIONS &i386elf, */
 
 /* Default emulation. */
-#define DEFAULT_EMULATION "i386elf"
+/* #define DEFAULT_EMULATION "i386elf" */
 
 /* old COFF support? */
 /* #undef MANY_SEGMENTS */
@@ -226,19 +235,19 @@
 #define BFD_ASSEMBLER 1
 
 /* Target alias. */
-#define TARGET_ALIAS "i386-obrien-freebsd5"
+/* #define TARGET_ALIAS "i386-obrien-freebsd5.2" */
 
 /* Canonical target. */
-#define TARGET_CANONICAL "i386-obrien-freebsd5"
+/* #define TARGET_CANONICAL "i386-obrien-freebsd5.2" */
 
 /* Target CPU. */
-#define TARGET_CPU "i386"
+/* #define TARGET_CPU "i386" */
 
 /* Target vendor. */
 #define TARGET_VENDOR "obrien"
 
 /* Target OS. */
-#define TARGET_OS "freebsd5"
+/* #define TARGET_OS "freebsd5.2" */
 
 /* Define if you have the stpcpy function */
 #define HAVE_STPCPY 1
@@ -275,4 +284,3 @@
 
 /* Define if errno is not declared in system header files. */
 /* #undef NEED_DECLARATION_ERRNO */
-
diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/config.h b/gnu/usr.bin/binutils/as/ia64-freebsd/config.h
index 051de39729fc..7da7f88281df 100644
--- a/gnu/usr.bin/binutils/as/ia64-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/ia64-freebsd/config.h
@@ -278,4 +278,3 @@
 
 /* Define if errno is not declared in system header files. */
 /* #undef NEED_DECLARATION_ERRNO */
-
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
index e315bb14d133..616f96720ce4 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
@@ -278,4 +278,3 @@
 
 /* Define if errno is not declared in system header files. */
 /* #undef NEED_DECLARATION_ERRNO */
-
diff --git a/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h b/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h
index 22aa1aceed37..b35dc8c289b2 100644
--- a/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h
@@ -30,9 +30,6 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 /* #undef off_t */
 
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 /* #undef size_t */
 
@@ -151,7 +148,7 @@
 #define PACKAGE "gas"
 
 /* Version number of package */
-/* #define VERSION "2.13.2" */
+/* #define VERSION "2.15" */
 
 /* Define if defaulting to ELF on SCO 5. */
 /* #undef SCO_ELF */
@@ -164,9 +161,20 @@
 
 /* Define as 1 if big endian. */
 /* #undef TARGET_BYTES_BIG_ENDIAN */
+/* Default CPU for MIPS targets.  */
+/* #undef MIPS_CPU_STRING_DEFAULT */
+
+/* Allow use of E_MIPS_ABI_O32 on MIPS targets.  */
+/* #undef USE_E_MIPS_ABI_O32 */
+
+/* Generate 64-bit code by default on MIPS targets.  */
+/* #undef MIPS_DEFAULT_64BIT */
+
+/* Choose a default ABI for MIPS targets.  */
+/* #undef MIPS_DEFAULT_ABI */
 
 /* Default architecture. */
-#define DEFAULT_ARCH "v9-64"
+/* #define DEFAULT_ARCH "v9-64" */
 
 /* Using cgen code? */
 /* #undef USING_CGEN */
@@ -226,19 +234,19 @@
 #define BFD_ASSEMBLER 1
 
 /* Target alias. */
-#define TARGET_ALIAS "sparc64-obrien-freebsd5"
+/* #define TARGET_ALIAS "sparc64-obrien-freebsd5" */
 
 /* Canonical target. */
-#define TARGET_CANONICAL "sparc64-obrien-freebsd5"
+/* #define TARGET_CANONICAL "sparc64-obrien-freebsd5" */
 
 /* Target CPU. */
-#define TARGET_CPU "sparc64"
+/* #define TARGET_CPU "sparc64" */
 
 /* Target vendor. */
-#define TARGET_VENDOR "obrien"
+/* #define TARGET_VENDOR "obrien" */
 
 /* Target OS. */
-#define TARGET_OS "freebsd5"
+/* #define TARGET_OS "freebsd5" */
 
 /* Define if you have the stpcpy function */
 #define HAVE_STPCPY 1
@@ -275,4 +283,3 @@
 
 /* Define if errno is not declared in system header files. */
 /* #undef NEED_DECLARATION_ERRNO */
-