From 53f0465917b87a014de6acbb3e986a5444a52ead Mon Sep 17 00:00:00 2001
From: tv <tv@NetBSD.org>
Date: Fri, 22 May 1998 17:19:12 +0000
Subject: [PATCH] Switch to new GNU_ARCH remapper.

---
 gnu/usr.bin/gas.new/Makefile                | 6 ++----
 gnu/usr.bin/gas.new/arch/arm32/Makefile.inc | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/usr.bin/gas.new/Makefile b/gnu/usr.bin/gas.new/Makefile
index ec555e48c610..0ae1a09593e7 100644
--- a/gnu/usr.bin/gas.new/Makefile
+++ b/gnu/usr.bin/gas.new/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1998/05/21 18:43:27 cgd Exp $
+#	$NetBSD: Makefile,v 1.3 1998/05/22 17:19:12 tv Exp $
 #
 
 DIST=	${.CURDIR}/../../dist
@@ -20,10 +20,8 @@ CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${TARGET_ARCH} \
 
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
-# May be overridden in the Makefile.inc above:
-TARGET_CPU ?= ${TARGET_ARCH}
-
 SRCS+=	${TARG_CPU_C} ${OBJ_FORMAT_C} ${ATOF_TARG_C}
+TARGET_CPU= ${GNU_ARCH.${TARGET_ARCH}}
 CPPFLAGS+= -DTARGET_ALIAS=\"${TARGET_CPU}-netbsd\"
 CPPFLAGS+= -DTARGET_CPU=\"${TARGET_CPU}\"
 CPPFLAGS+= -DTARGET_CANONICAL=\"${TARGET_CPU}-unknown-netbsd\"
diff --git a/gnu/usr.bin/gas.new/arch/arm32/Makefile.inc b/gnu/usr.bin/gas.new/arch/arm32/Makefile.inc
index 08402470262a..909e143f254b 100644
--- a/gnu/usr.bin/gas.new/arch/arm32/Makefile.inc
+++ b/gnu/usr.bin/gas.new/arch/arm32/Makefile.inc
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.1 1998/05/19 19:09:32 tv Exp $
+#	$NetBSD: Makefile.inc,v 1.2 1998/05/22 17:19:12 tv Exp $
 
 TARG_CPU_C=	tc-arm.c
 OBJ_FORMAT_C=	obj-aout.c
 ATOF_TARG_C=	atof-ieee.c
 
 CPPFLAGS+=-DBFD_ASSEMBLER=1
-
-TARGET_CPU=arm