amd64 canonicalization.

ok deraadt@, pvalchev@

5 files changed, 4 insertions, 23 deletions

diff --git a/gnu/lib/libf2c/config.guess b/gnu/lib/libf2c/config.guess
index e67c69a666f..c989465abca 100755
--- a/gnu/lib/libf2c/config.guess
+++ b/gnu/lib/libf2c/config.guess
@@ -196,9 +196,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
diff --git a/gnu/lib/libobjc/config.guess b/gnu/lib/libobjc/config.guess
index e67c69a666f..c989465abca 100755
--- a/gnu/lib/libobjc/config.guess
+++ b/gnu/lib/libobjc/config.guess
@@ -196,9 +196,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
diff --git a/gnu/lib/libstdc++/config.guess b/gnu/lib/libstdc++/config.guess
index e67c69a666f..c989465abca 100755
--- a/gnu/lib/libstdc++/config.guess
+++ b/gnu/lib/libstdc++/config.guess
@@ -196,9 +196,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 13d2bbd1cc9..8ce566acc35 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.51 2004/12/25 00:06:30 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.52 2005/04/08 21:11:08 kettenis Exp $
 
 MAN=		gcc.1 cpp.1 gcov.1 protoize.1
 MLINKS+=	protoize.1 unprotoize.1
@@ -55,14 +55,7 @@ CLEANFILES=	.gdbinit */.gdbinit *.info* \
 		genrtl.c genrtl.h fixinc.sh fixinc/Makefile \
 		po/Makefile  po/Makefile.in  po/POTFILES
 
-.if ${MACHINE} == "amd64"
-M_ARCH=		x86_64
-.else
-M_ARCH=		${MACHINE_ARCH}
-.endif
-
-
-GCCARCH=	${M_ARCH}-unknown-openbsd${OSREV}
+GCCARCH=	${MACHINE_ARCH}-unknown-openbsd${OSREV}
 GCCINC=	/usr/lib/gcc-lib/${GCCARCH}/$V/include
 
 # cross-compilation
@@ -171,12 +164,12 @@ depend: config.status
 	exec ${MAKE} ${MAKE_FLAGS} generated-manpages
 
 FILES= ${.CURDIR}/gcc/unwind.h
-.if ${M_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 FILES+=${.CURDIR}/gcc/config/i386/mmintrin.h \
 	${.CURDIR}/gcc/config/i386/xmmintrin.h \
 	${.CURDIR}/gcc/config/i386/emmintrin.h \
 	${.CURDIR}/gcc/config/i386/pmmintrin.h
-.elif ${M_ARCH} == "powerpc"
+.elif ${MACHINE_ARCH} == "powerpc"
 FILES+=${.CURDIR}/gcc/config/rs6000/altivec.h
 .endif
 
diff --git a/gnu/usr.bin/gcc/config.guess b/gnu/usr.bin/gcc/config.guess
index e67c69a666f..c989465abca 100644
--- a/gnu/usr.bin/gcc/config.guess
+++ b/gnu/usr.bin/gcc/config.guess
@@ -196,9 +196,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}