Get rid of GCC_ARCH, and just use plain TARGET_ARCH.

We got rid of the MIPS le/be stuff that needed this a long time ago.

3 files changed, 22 insertions, 22 deletions

diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 30a725b..49c1aa5 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -7,14 +7,13 @@
 GCCDIR=		${.CURDIR}/../../../../contrib/gcc.295
 
 TARGET_ARCH?=	${MACHINE_ARCH}
-GCC_ARCH=	${TARGET_ARCH}
 
 # Machine description.
-MD_FILE=	${GCCDIR}/config/${GCC_ARCH}/${GCC_ARCH}.md
+MD_FILE=	${GCCDIR}/config/${TARGET_ARCH}/${TARGET_ARCH}.md
 target=		${TARGET_ARCH}-unknown-freebsd
 
 # These architectures are Cygnus's default for enabling Haifa.
-.if ${GCC_ARCH} == "alpha" || ${GCC_ARCH} == "sparc" || ${GCC_ARCH} == "sparc64"
+.if ${TARGET_ARCH} == "alpha"
 USE_EGCS_HAIFA=	1
 .endif
 
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 81ee262..834ebc2 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -2,7 +2,7 @@
 
 .include "../Makefile.inc"
 
-.PATH: ../cc_tools ${GCCDIR}/config/${GCC_ARCH} ${GCCDIR}
+.PATH: ../cc_tools ${GCCDIR}/config/${TARGET_ARCH} ${GCCDIR}
 
 LIB=		cc_int
 NOPROFILE=	YES
@@ -21,7 +21,7 @@ SRCS=	c-aux-info.c c-common.c c-convert.c c-iterate.c \
 	toplev.c tree.c unroll.c varasm.c version.c xcoffout.c \
 	alias.c bitmap.c dwarf2out.c dyn-string.c except.c \
 	gcse.c genrtl.c profile.c regmove.c varray.c \
-	${GCC_ARCH}.c
+	${TARGET_ARCH}.c
 .if defined(USE_EGCS_HAIFA) && ${USE_EGCS_HAIFA} == 1
 SRCS+=	haifa-sched.c
 .else
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index a23879f..9ee62ef 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -12,6 +12,7 @@
 # aliases of generated headers.
 
 CFLAGS+=	-I.
+WARNS=		0
 
 .include "../Makefile.inc"
 
@@ -101,10 +102,10 @@ COMMONHDRS=	config.h hconfig.h multilib.h options.h specs.h tconfig.h tm.h
 GENSRCS+=	${COMMONHDRS} gencheck.h
 
 config.h hconfig.h:
-	echo '#include "auto-host.h"'			> ${.TARGET}
-	echo '#include "gansidecl.h"'			>> ${.TARGET}
-	echo '#include "${GCC_ARCH}/xm-${GCC_ARCH}.h"'	>> ${.TARGET}
-	echo '#include "hwint.h"'			>> ${.TARGET}
+	echo '#include "auto-host.h"'				> ${.TARGET}
+	echo '#include "gansidecl.h"'				>> ${.TARGET}
+	echo '#include "${TARGET_ARCH}/xm-${TARGET_ARCH}.h"'	>> ${.TARGET}
+	echo '#include "hwint.h"'				>> ${.TARGET}
 
 gencheck.h:
 	echo '#include "cp/cp-tree.def"'		> ${.TARGET}
@@ -127,25 +128,25 @@ specs.h:
 	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
 
 tconfig.h:
-	echo '#include "gansidecl.h"'			> ${.TARGET}
-	echo '#include "${GCC_ARCH}/xm-${GCC_ARCH}.h"'	>> ${.TARGET}
+	echo '#include "gansidecl.h"'				> ${.TARGET}
+	echo '#include "${TARGET_ARCH}/xm-${TARGET_ARCH}.h"'	>> ${.TARGET}
 
 # KEEP THIS IN SYNC with src/gcc/lib/libgcc/Makefile !!
 tm.h:
-	echo '#include "${GCC_ARCH}/${GCC_ARCH}.h"'	> ${.TARGET}
-.if ${GCC_ARCH} == "i386"
-	echo '#include "${GCC_ARCH}/att.h"'		>> ${.TARGET}
+	echo '#include "${TARGET_ARCH}/${TARGET_ARCH}.h"'	> ${.TARGET}
+.if ${TARGET_ARCH} == "i386"
+	echo '#include "${TARGET_ARCH}/att.h"'			>> ${.TARGET}
 .endif
-	echo '#include <freebsd.h>'			>> ${.TARGET}
-	echo '#include "dbxelf.h"'			>> ${.TARGET}
-.if exists(${GCCDIR}/config/${GCC_ARCH}/elf.h)
-	echo '#include "${GCC_ARCH}/elf.h"'		>> ${.TARGET}
+	echo '#include <freebsd.h>'				>> ${.TARGET}
+	echo '#include "dbxelf.h"'				>> ${.TARGET}
+.if exists(${GCCDIR}/config/${TARGET_ARCH}/elf.h)
+	echo '#include "${TARGET_ARCH}/elf.h"'			>> ${.TARGET}
 .endif
-	echo '#include "${GCC_ARCH}/freebsd.h"'		>> ${.TARGET}
-.if ${GCC_ARCH} == "i386"
-	echo '#include "${GCC_ARCH}/perform.h"'		>> ${.TARGET}
+	echo '#include "${TARGET_ARCH}/freebsd.h"'		>> ${.TARGET}
+.if ${TARGET_ARCH} == "i386"
+	echo '#include "${TARGET_ARCH}/perform.h"'		>> ${.TARGET}
 .endif
-	echo '#include <freebsd-native.h>'		>> ${.TARGET}
+	echo '#include <freebsd-native.h>'			>> ${.TARGET}
 
 #-----------------------------------------------------------------------
 # General things.