s/MACHINE_ARCH/TARGET_ARCH/g

The target machine is represented by TARGET_ARCH. MACHINE_ARCH always
represents the host machine. When TARGET_ARCH is not defined, it is
assumed to be equal to MACHINE_ARCH. This means that we're building a
native toolset by default. We're creating cross-compilation tools when
MACHINE_ARCH != TARGET_ARCH.

TARGET_ARCH is defined when building binutils as part of the bootstrap
build and is set to reflect the architecture we're currently cross-
building. With this change binutils is ready for cross-building.

18 files changed, 22 insertions, 22 deletions

diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index c7445c7..f9b2e63 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -9,11 +9,12 @@
 #
 
 VERSION=	2.9.1
+TARGET_ARCH?=	${MACHINE_ARCH}
 
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
+.if ${TARGET_ARCH} == "mipsel" || ${TARGET_ARCH} == "mipseb"
 BINUTIL_ARCH=mips
 .else
-BINUTIL_ARCH=${MACHINE_ARCH}
+BINUTIL_ARCH=${TARGET_ARCH}
 .endif
 
 # RELTOP is the relative path to this point in the source or object
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index 17150e6..0e69355 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -8,8 +8,7 @@ GASES=		${BINUTIL_ARCH}
 FORMATS=	freebsd
 
 # Only build the cross tools when not cross-compiling.
-__MA!=/sbin/sysctl -b hw.machine_arch
-.if ${__MA} == ${MACHINE_ARCH}
+.if ${TARGET_ARCH} == ${MACHINE_ARCH}
 .if defined(CROSS_ARCH)
 .for _g in ${CROSS_ARCH}
 .if (${GASES:R:M${_g:R}} == "")
diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile b/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
index 2c83e7f..f35fe71 100644
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
@@ -5,7 +5,7 @@
 .include "${.CURDIR}/../Makefile.inc0"
 
 PROG=		as
-.if	${MACHINE_ARCH} != "alpha"
+.if	${TARGET_ARCH} != "alpha"
 NOMAN=		1
 BINDIR=		/usr/libexec/cross/alpha-freebsd
 .endif
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/Makefile b/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
index 412640a..7e6010b 100644
--- a/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
@@ -5,7 +5,7 @@
 .include "${.CURDIR}/../Makefile.inc0"
 
 PROG=		as
-.if	${MACHINE_ARCH} != "i386"
+.if	${TARGET_ARCH} != "i386"
 NOMAN=		1
 BINDIR=		/usr/libexec/cross/i386-freebsd
 .endif
diff --git a/gnu/usr.bin/binutils/as/sparc-freebsd/Makefile b/gnu/usr.bin/binutils/as/sparc-freebsd/Makefile
index d6ce629..49784f3 100644
--- a/gnu/usr.bin/binutils/as/sparc-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/sparc-freebsd/Makefile
@@ -5,7 +5,7 @@
 .include "${.CURDIR}/../Makefile.inc0"
 
 PROG=		as
-.if	${MACHINE_ARCH} != "sparc"
+.if	${TARGET_ARCH} != "sparc"
 NOMAN=		1
 BINDIR=		/usr/libexec/cross/sparc-freebsd
 .endif
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile
index 6d90bd9..a08909f 100644
--- a/gnu/usr.bin/binutils/gasp/Makefile
+++ b/gnu/usr.bin/binutils/gasp/Makefile
@@ -11,7 +11,7 @@ SRCS+=		gasp.c macro.c sb.c hash.c
 CFLAGS+=	-I${SRCDIR}
 CFLAGS+=	-I${SRCDIR}/gas
 CFLAGS+=	-I${SRCDIR}/gas/config
-CFLAGS+=	-I${.CURDIR}/../as/${MACHINE_ARCH}-freebsd
+CFLAGS+=	-I${.CURDIR}/../as/${TARGET_ARCH}-freebsd
 CFLAGS+=	-DBFD_ASSEMBLER
 LDADD+=		-L${RELTOP}/libiberty -liberty
 DPADD+=		${RELTOP}/libiberty/libiberty.a
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 341f95c..cd85ee4 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-.if	${MACHINE_ARCH} == "alpha"
+.if	${TARGET_ARCH} == "alpha"
 HOST=		alpha-unknown-freebsdelf
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf64alpha\"
 CFLAGS+=	-DTARGET=\"alpha-unknown-freebsdelf\"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 2bc7a90..0e4e99e 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-.if	${MACHINE_ARCH} == "i386"
+.if	${TARGET_ARCH} == "i386"
 HOST=		i386-unknown-freebsdelf
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf_i386\"
 CFLAGS+=	-DTARGET=\"i386-unknown-freebsdelf\"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.m68k b/gnu/usr.bin/binutils/ld/Makefile.m68k
index 5ab6454..ad51a56 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.m68k
+++ b/gnu/usr.bin/binutils/ld/Makefile.m68k
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-.if	${MACHINE_ARCH} == "m68k"
+.if	${TARGET_ARCH} == "m68k"
 HOST=		m68k-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf_m68k\"
 CFLAGS+=	-DTARGET=\"m68k-unknown-freebsd\"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index 82d93dc..d1bb4bc 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-.if	${MACHINE_ARCH} == "powerpc"
+.if	${TARGET_ARCH} == "powerpc"
 HOST=		powerpc-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf_powerpc\"
 CFLAGS+=	-DTARGET=\"powerpc-unknown-freebsd\"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc b/gnu/usr.bin/binutils/ld/Makefile.sparc
index c84e63d..2b2b9c5 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-.if	${MACHINE_ARCH} == "sparc"
+.if	${TARGET_ARCH} == "sparc"
 HOST=		sparc-unknown-freebsd
 CFLAGS+=	-DDEFAULT_EMULATION=\"elf32_sparc\"
 CFLAGS+=	-DTARGET=\"sparc-unknown-freebsd\"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 33024a5..c262292 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -5,7 +5,7 @@
 SRCS+=		coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha.c \
 		elf64-target.h elf64.c elflink.c
 VECS+=		bfd_elf64_alpha_vec ecoffalpha_little_vec
-.if ${MACHINE_ARCH} == "alpha"
+.if ${TARGET_ARCH} == "alpha"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf64_alpha_vec
 .endif
 CFLAGS+=	-DHAVE_bfd_elf64_alpha_vec
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index e7044fb..b777cf4 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -3,7 +3,7 @@
 #
 SRCS+=		cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c
 VECS+=		bfd_elf32_i386_vec
-.if ${MACHINE_ARCH} == "i386"
+.if ${TARGET_ARCH} == "i386"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
 .endif
 CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.m68k b/gnu/usr.bin/binutils/libbfd/Makefile.m68k
index 53ba0e1..99937a4 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.m68k
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.m68k
@@ -30,7 +30,7 @@ VECS+=		bfd_elf32_m68k_vec	\
 		m68knetbsd_vec		\
 		m68ksysvcoff_vec	\
 		sunos_big_vec
-.if ${MACHINE_ARCH} == "m68k"
+.if ${TARGET_ARCH} == "m68k"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_m68k_vec
 .endif
 CFLAGS+=	-DHAVE_bfd_elf32_m68k_vec
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
index a91c0ab..bc02946 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
@@ -19,7 +19,7 @@ VECS+=		bfd_elf32_powerpc_vec	\
 		bfd_powerpcle_pe_vec	\
 		bfd_powerpcle_pei_vec	\
 		ppcboot_vec
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${TARGET_ARCH} == "powerpc"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_powerpc_vec
 .endif
 CFLAGS+=	-DHAVE_bfd_elf32_powerpc_vec	\
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.rs6000 b/gnu/usr.bin/binutils/libbfd/Makefile.rs6000
index d54374c..daf3f65 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.rs6000
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.rs6000
@@ -7,7 +7,7 @@ SRCS+=		coff-rs6000.c	\
 		cpu-rs6000.c	\
 		xcofflink.c
 VECS+=		rs6000coff_vec
-.if ${MACHINE_ARCH} == "rs6000"
+.if ${TARGET_ARCH} == "rs6000"
 CFLAGS+=	-DDEFAULT_VECTOR=rs6000coff_vec
 .endif
 CFLAGS+=	-DHAVE_rs6000coff_vec
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc b/gnu/usr.bin/binutils/libbfd/Makefile.sparc
index 4937d0b..219386d 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc
@@ -13,7 +13,7 @@ SRCS+=		aout-sparcle.c	\
 		sparclynx.c	\
 		sparcnetbsd.c
 VECS+=		bfd_elf32_sparc_vec
-.if ${MACHINE_ARCH} == "sparc"
+.if ${TARGET_ARCH} == "sparc"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_sparc_vec
 .endif
 CFLAGS+=	-DHAVE_elf32_sparc_vec
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index b6b4fa7..c6ee50c 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -9,12 +9,12 @@
 LIB=		binutils
 SRCS+=		arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
 		ieee.c rdcoff.c rddbg.c stabs.c wrstabs.c version.c
-.if ${MACHINE_ARCH} == "mipseb"
+.if ${TARGET_ARCH} == "mipseb"
 CFLAGS+=	-DTARGET=\"elf32-bigmips\"
-.elif ${MACHINE_ARCH} == "mipsel"
+.elif ${TARGET_ARCH} == "mipsel"
 CFLAGS+=	-DTARGET=\"elf32-littlemips\"
 .else
-CFLAGS+=	-DTARGET=\"${MACHINE_ARCH}-unknown-freebsdelf\"
+CFLAGS+=	-DTARGET=\"${TARGET_ARCH}-unknown-freebsdelf\"
 .endif
 CFLAGS+=	-DVERSION=\"${VERSION}\"
 CFLAGS+=	-I${SRCDIR}/binutils