12 files changed, 28 insertions, 28 deletions

diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/config.h b/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
index a6226d3dee77..bd29b1efe7c8 100644
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
@@ -224,10 +224,10 @@
 #define BFD_ASSEMBLER 1
 
 /* Target alias. */
-#define TARGET_ALIAS "alpha-unknown-freebsdelf5.0"
+#define TARGET_ALIAS "alpha-unknown-freebsd5.0"
 
 /* Canonical target. */
-#define TARGET_CANONICAL "alpha-unknown-freebsdelf5.0"
+#define TARGET_CANONICAL "alpha-unknown-freebsd5.0"
 
 /* Target CPU. */
 #define TARGET_CPU "alpha"
@@ -236,7 +236,7 @@
 #define TARGET_VENDOR "unknown"
 
 /* Target OS. */
-#define TARGET_OS "freebsdelf5.0"
+#define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
 /* #undef HAVE_STPCPY */
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/config.h b/gnu/usr.bin/binutils/as/i386-freebsd/config.h
index ba81c7ff025e..8c473562cee0 100644
--- a/gnu/usr.bin/binutils/as/i386-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/i386-freebsd/config.h
@@ -224,10 +224,10 @@
 #define BFD_ASSEMBLER 1
 
 /* Target alias. */
-#define TARGET_ALIAS "i386-unknown-freebsdelf5.0"
+#define TARGET_ALIAS "i386-unknown-freebsd5.0"
 
 /* Canonical target. */
-#define TARGET_CANONICAL "i386-unknown-freebsdelf5.0"
+#define TARGET_CANONICAL "i386-unknown-freebsd5.0"
 
 /* Target CPU. */
 #define TARGET_CPU "i386"
@@ -236,7 +236,7 @@
 #define TARGET_VENDOR "unknown"
 
 /* Target OS. */
-#define TARGET_OS "freebsdelf5.0"
+#define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
 /* #undef HAVE_STPCPY */
diff --git a/gnu/usr.bin/binutils/as/m68k-freebsd/config.h b/gnu/usr.bin/binutils/as/m68k-freebsd/config.h
index eca6cfe5a6ce..faf5c520c669 100644
--- a/gnu/usr.bin/binutils/as/m68k-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/m68k-freebsd/config.h
@@ -49,9 +49,9 @@
 #define CROSS_COMPILE 1
 
 /* Some gas code wants to know these parameters.  */
-#define TARGET_ALIAS "m68k-unknown-freebsdelf"
+#define TARGET_ALIAS "m68k-unknown-freebsd"
 #define TARGET_CPU "m68k"
-#define TARGET_CANONICAL "m68k-unknown-freebsdelf"
+#define TARGET_CANONICAL "m68k-unknown-freebsd"
 #define TARGET_OS "freebsd"
 #define TARGET_VENDOR "unknown"
 
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
index ba59450c1582..2bcaeae7b6c5 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
@@ -224,10 +224,10 @@
 #define BFD_ASSEMBLER 1
 
 /* Target alias. */
-#define TARGET_ALIAS "powerpc-unknown-freebsdelf5.0"
+#define TARGET_ALIAS "powerpc-unknown-freebsd5.0"
 
 /* Canonical target. */
-#define TARGET_CANONICAL "powerpc-unknown-freebsdelf5.0"
+#define TARGET_CANONICAL "powerpc-unknown-freebsd5.0"
 
 /* Target CPU. */
 #define TARGET_CPU "powerpc"
@@ -236,7 +236,7 @@
 #define TARGET_VENDOR "unknown"
 
 /* Target OS. */
-#define TARGET_OS "freebsdelf5.0"
+#define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
 /* #undef HAVE_STPCPY */
diff --git a/gnu/usr.bin/binutils/as/sparc-freebsd/config.h b/gnu/usr.bin/binutils/as/sparc-freebsd/config.h
index 0a3d72c1b05a..8c5852a77b8c 100644
--- a/gnu/usr.bin/binutils/as/sparc-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/sparc-freebsd/config.h
@@ -44,10 +44,10 @@
 /* #undef CROSS_COMPILE */
 
 /* Some gas code wants to know these parameters.  */
-#define TARGET_ALIAS "i386-unknown-freebsdelf"
+#define TARGET_ALIAS "i386-unknown-freebsd"
 #define TARGET_CPU "i386"
-#define TARGET_CANONICAL "i386-unknown-freebsdelf"
-#define TARGET_OS "freebsdelf"
+#define TARGET_CANONICAL "i386-unknown-freebsd"
+#define TARGET_OS "freebsd"
 #define TARGET_VENDOR "unknown"
 
 /* Sometimes the system header files don't declare strstr.  */
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 8278733581c8..bfb9f60846ba 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -3,9 +3,9 @@
 #
 
 .if	${TARGET_ARCH} == "alpha"
-HOST=		alpha-unknown-freebsdelf
+HOST=		alpha-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf64alpha\"
-CFLAGS+=	-DTARGET=\"alpha-unknown-freebsdelf\"
+CFLAGS+=	-DTARGET=\"alpha-unknown-freebsd\"
 _alpha_path=	\"/usr/lib\"
 .else
 _alpha_path=	\"/usr/cross/alpha-freebsd/usr/lib\"
@@ -20,11 +20,11 @@ CLEANFILES+=	eelf64alpha.c ealpha.c
 eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
-	    ${HOST} alpha-unknown-freebsdelf alpha-unknown-freebsdelf \
-	    elf64alpha ""  elf64alpha alpha-unknown-freebsdelf
+	    ${HOST} alpha-unknown-freebsd alpha-unknown-freebsd \
+	    elf64alpha ""  elf64alpha alpha-unknown-freebsd
 
 ealpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
-	    ${HOST} alpha-unknown-freebsdelf alpha-unknown-freebsdelf \
+	    ${HOST} alpha-unknown-freebsd alpha-unknown-freebsd \
 	    elf64alpha ""  alpha alpha-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index bbe0a7ea9d09..6e4a4fafa5ed 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -3,9 +3,9 @@
 #
 
 .if	${TARGET_ARCH} == "i386"
-HOST=		i386-unknown-freebsdelf
+HOST=		i386-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf_i386\"
-CFLAGS+=	-DTARGET=\"i386-unknown-freebsdelf\"
+CFLAGS+=	-DTARGET=\"i386-unknown-freebsd\"
 _i386_path=	\"/usr/lib\"
 .else
 _i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
@@ -19,8 +19,8 @@ CLEANFILES+=	eelf_i386.c
 eelf_i386.c:	emulparams/elf_i386.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \
-	    ${HOST} i386-unknown-freebsdelf i386-unknown-freebsdelf \
-	    elf_i386 "" elf_i386 i386-unknown-freebsdelf
+	    ${HOST} i386-unknown-freebsd i386-unknown-freebsd \
+	    elf_i386 "" elf_i386 i386-unknown-freebsd
 
 .if	defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
 EMS+=		ld_i386pe_emulation
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index ea60cc51875e..ed667123fb1c 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -14,7 +14,7 @@ CFLAGS+=	-DTARGET=\"elf32-bigmips\"
 .elif ${TARGET_ARCH} == "mipsel"
 CFLAGS+=	-DTARGET=\"elf32-littlemips\"
 .else
-CFLAGS+=	-DTARGET=\"${TARGET_ARCH}-unknown-freebsdelf\"
+CFLAGS+=	-DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
 .endif
 CFLAGS+=	-DVERSION=\"${VERSION}\"
 CFLAGS+=	-I${SRCDIR}/binutils
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.alpha b/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
index d214e9cfd524..caedb476ca01 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
@@ -2,4 +2,4 @@
 # $FreeBSD$
 #
 
-TARGET=		alpha-unknown-freebsdelf
+TARGET=		alpha-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.i386 b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
index f52be9a2b5d6..e734a615ff86 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
@@ -2,4 +2,4 @@
 # $FreeBSD$
 #
 
-TARGET=		i386-unknown-freebsdelf
+TARGET=		i386-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.mips b/gnu/usr.bin/binutils/libbinutils/Makefile.mips
index 0ec4cdcff984..c66e00059530 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.mips
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.mips
@@ -2,4 +2,4 @@
 # $FreeBSD$
 #
 
-TARGET=		${MACHINE_ARCH}-unknown-freebsdelf
+TARGET=		${MACHINE_ARCH}-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/libbinutils/config.h b/gnu/usr.bin/binutils/libbinutils/config.h
index 6d250b872477..18eebd0bc7e5 100644
--- a/gnu/usr.bin/binutils/libbinutils/config.h
+++ b/gnu/usr.bin/binutils/libbinutils/config.h
@@ -188,5 +188,5 @@
 /* #undef USE_BINARY_FOPEN */
 
 /* Configured target name. */
-/* #define TARGET "alpha-unknown-freebsdelf5.0" */
+/* #define TARGET "alpha-unknown-freebsd5.0" */