Replace freebsdelf with freebsd in most places.

Requested by: obrien

6 files changed, 16 insertions, 16 deletions

diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 0d29a53..341f95c 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -8,7 +8,7 @@ CFLAGS+=	-DDEFAULT_EMULATION=\"elf64alpha\"
 CFLAGS+=	-DTARGET=\"alpha-unknown-freebsdelf\"
 _alpha_path=	\"/usr/lib\"
 .else
-_alpha_path=	\"/usr/cross/alpha-freebsdelf/usr/lib\"
+_alpha_path=	\"/usr/cross/alpha-freebsd/usr/lib\"
 .endif
 EMS+=		ld_elf64alpha_emulation
 LDSCRIPTS+=	elf64alpha.x elf64alpha.xbn elf64alpha.xn elf64alpha.xr \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 8339a5e..2bc7a90 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -8,7 +8,7 @@ CFLAGS+=	-DDEFAULT_EMULATION=\"elf_i386\"
 CFLAGS+=	-DTARGET=\"i386-unknown-freebsdelf\"
 _i386_path=	\"/usr/lib\"
 .else
-_i386_path=	\"/usr/cross/i386-freebsdelf/usr/lib\"
+_i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
 .endif
 EMS+=		ld_elf_i386_emulation
 LDSCRIPTS+=	elf_i386.x elf_i386.xbn elf_i386.xn elf_i386.xr \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.m68k b/gnu/usr.bin/binutils/ld/Makefile.m68k
index 2ce71c3..5ab6454 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.m68k
+++ b/gnu/usr.bin/binutils/ld/Makefile.m68k
@@ -3,12 +3,12 @@
 #
 
 .if	${MACHINE_ARCH} == "m68k"
-HOST=		m68k-unknown-freebsdelf
+HOST=		m68k-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf_m68k\"
-CFLAGS+=	-DTARGET=\"m68k-unknown-freebsdelf\"
+CFLAGS+=	-DTARGET=\"m68k-unknown-freebsd\"
 _m68k_path=	\"/usr/lib\"
 .else
-_m68k_path=	\"/usr/cross/m68k-freebsdelf/usr/lib\"
+_m68k_path=	\"/usr/cross/m68k-freebsd/usr/lib\"
 .endif
 EMS+=		ld_m68kelf_emulation	\
 		ld_m68klynx_emulation	\
diff --git a/gnu/usr.bin/binutils/ld/Makefile.mips b/gnu/usr.bin/binutils/ld/Makefile.mips
index 5e928b8..923947b 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.mips
+++ b/gnu/usr.bin/binutils/ld/Makefile.mips
@@ -13,7 +13,7 @@ CFLAGS+=	-DDEFAULT_EMULATION=\"elf32lmip\"
 CFLAGS+=	-DTARGET=\"elf32-littlemips\"
 _mips_path=	\"/usr/lib\"
 .else
-_mips_path=	\"/usr/cross/mips-freebsdelf/usr/lib\"
+_mips_path=	\"/usr/cross/mips-freebsd/usr/lib\"
 .endif
 EMS+=		ld_elf32bmip_emulation ld_elf32lmip_emulation
 LDSCRIPTS+=	elf32bmip.x elf32bmip.xbn elf32bmip.xn elf32bmip.xr \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index cc25f9d..82d93dc 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -3,12 +3,12 @@
 #
 
 .if	${MACHINE_ARCH} == "powerpc"
-HOST=		powerpc-unknown-freebsdelf
+HOST=		powerpc-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf_powerpc\"
-CFLAGS+=	-DTARGET=\"powerpc-unknown-freebsdelf\"
+CFLAGS+=	-DTARGET=\"powerpc-unknown-freebsd\"
 _powerpc_path=	\"/usr/lib\"
 .else
-_powerpc_path=	\"/usr/cross/powerpc-freebsdelf/usr/lib\"
+_powerpc_path=	\"/usr/cross/powerpc-freebsd/usr/lib\"
 .endif
 EMS+=		ld_elf32ppc_emulation	\
 		ld_ppcmacos_emulation	\
@@ -63,8 +63,8 @@ CLEANFILES+=	eelf32ppc.c		\
 eelf32ppc.c:	emulparams/elf32ppc.sh emultempl/elf32.em \
 		scripttempl/elfppc.sc genscripts.sh emultempl/stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
-	    ${_powerpc_path} ${HOST} powerpc-unknown-freebsdelf \
-	    powerpc-unknown-freebsdelf elf32ppc "" elf32ppc
+	    ${_powerpc_path} ${HOST} powerpc-unknown-freebsd \
+	    powerpc-unknown-freebsd elf32ppc "" elf32ppc
 
 eppcmacos.c:	emulparams/ppcmacos.sh emultempl/aix.em \
 		scripttempl/aix.sc genscripts.sh emultempl/stringify.sed
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc b/gnu/usr.bin/binutils/ld/Makefile.sparc
index 11daf55..c84e63d 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc
@@ -3,12 +3,12 @@
 #
 
 .if	${MACHINE_ARCH} == "sparc"
-HOST=		sparc-unknown-freebsdelf
+HOST=		sparc-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf32_sparc\"
-CFLAGS+=	-DTARGET=\"sparc-unknown-freebsdelf\"
+CFLAGS+=	-DTARGET=\"sparc-unknown-freebsd\"
 _sparc_path=	\"/usr/lib\"
 .else
-_sparc_path=	\"/usr/cross/sparc-freebsdelf/usr/lib\"
+_sparc_path=	\"/usr/cross/sparc-freebsd/usr/lib\"
 .endif
 EMS+=		ld_elf32_sparc_emulation
 LDSCRIPTS+=	elf32_sparc.x elf32_sparc.xbn elf32_sparc.xn elf32_sparc.xr \
@@ -19,6 +19,6 @@ CLEANFILES+=	eelf32_sparc.c
 eelf32_sparc.c:	emulparams/elf32_sparc.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld ${_sparc_path} \
-	    ${HOST} sparc-unknown-freebsdelf sparc-unknown-freebsdelf \
-	    elf32_sparc "" elf32_sparc sparc-unknown-freebsdelf
+	    ${HOST} sparc-unknown-freebsd sparc-unknown-freebsd \
+	    elf32_sparc "" elf32_sparc sparc-unknown-freebsd