From ecc4dcbd828295057f2272b8c0a2d1ac0a910d92 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 17 Dec 1999 15:50:45 +0000 Subject: 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. --- gnu/usr.bin/binutils/Makefile.inc0 | 5 +++-- gnu/usr.bin/binutils/as/Makefile | 3 +-- gnu/usr.bin/binutils/as/alpha-freebsd/Makefile | 2 +- gnu/usr.bin/binutils/as/i386-freebsd/Makefile | 2 +- gnu/usr.bin/binutils/as/sparc-freebsd/Makefile | 2 +- gnu/usr.bin/binutils/gasp/Makefile | 2 +- gnu/usr.bin/binutils/ld/Makefile.alpha | 2 +- gnu/usr.bin/binutils/ld/Makefile.i386 | 2 +- gnu/usr.bin/binutils/ld/Makefile.m68k | 2 +- gnu/usr.bin/binutils/ld/Makefile.powerpc | 2 +- gnu/usr.bin/binutils/ld/Makefile.sparc | 2 +- gnu/usr.bin/binutils/libbfd/Makefile.alpha | 2 +- gnu/usr.bin/binutils/libbfd/Makefile.i386 | 2 +- gnu/usr.bin/binutils/libbfd/Makefile.m68k | 2 +- gnu/usr.bin/binutils/libbfd/Makefile.powerpc | 2 +- gnu/usr.bin/binutils/libbfd/Makefile.rs6000 | 2 +- gnu/usr.bin/binutils/libbfd/Makefile.sparc | 2 +- gnu/usr.bin/binutils/libbinutils/Makefile | 6 +++--- 18 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/usr.bin/binutils') diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0 index c7445c7aaad20..f9b2e631f061f 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 17150e6c20ec0..0e693558df9b7 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 2c83e7f0fce07..f35fe71088f64 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 412640a83e0c4..7e6010b872f93 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 d6ce629e44c85..49784f37a09da 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 6d90bd938f9cc..a08909fd0ce78 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 341f95cacf846..cd85ee44176fd 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 2bc7a9018c5e8..0e4e99e6b94ea 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 5ab6454b03eb1..ad51a5647547b 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 82d93dc1ac408..d1bb4bc43f733 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 c84e63db056cb..2b2b9c5c450d4 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 33024a562274b..c26229260e799 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 e7044fb986ed0..b777cf4fe1a44 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 53ba0e181e276..99937a440c453 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 a91c0ab8a91b3..bc02946c697b4 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 d54374ca6cc3d..daf3f653b2a36 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 4937d0b9afab1..219386d3dfcdb 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 b6b4fa7f697bd..c6ee50c62d611 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 -- cgit v1.3