cope with MACHINE_ARCH changing from x86_64 to amd64. For now, we want

the toolchain to remain at the name x86_64.  Tested on all other
architectures that care.  Done as very small snippets, so that espie does
not blow a fuse.

5 files changed, 16 insertions, 5 deletions

diff --git a/gnu/lib/libiberty/config.guess b/gnu/lib/libiberty/config.guess
index 4fc21ecc3aa..4054f16bdc8 100644
--- a/gnu/lib/libiberty/config.guess
+++ b/gnu/lib/libiberty/config.guess
@@ -202,6 +202,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
diff --git a/gnu/lib/libstdc++/config.guess b/gnu/lib/libstdc++/config.guess
index 4fc21ecc3aa..4054f16bdc8 100755
--- a/gnu/lib/libstdc++/config.guess
+++ b/gnu/lib/libstdc++/config.guess
@@ -202,6 +202,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index d61596035ab..a57796e94a6 100644
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.53 2004/02/10 22:28:04 mickey Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.54 2004/02/27 17:40:15 deraadt Exp $
 
-NEW_BINUTILS=alpha hppa i386 mips powerpc sparc sparc64 x86_64
+NEW_BINUTILS=alpha hppa i386 mips powerpc sparc sparc64 amd64
 
 SUBDIRS=	opcodes bfd
 ALL_X11_MODULES=
@@ -16,7 +16,7 @@ MANDIR=${PREFIX}/share/man/cat
 
 MAN=		binutils/objdump.1 c++filt.1
 
-.if (${MACHINE_ARCH} != "unknown") && (${MACHINE_ARCH} != "x86_64")
+.if (${MACHINE_ARCH} != "unknown") && (${MACHINE_ARCH} != "amd64")
 SUBDIRS+=	gdb mmalloc
 MAN+=		gdb/gdb.1
 ALL_X11_MODULES+=all-gdb
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index bbf5c0f6f2d..5890698bcc0 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.47 2004/02/21 01:06:47 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.48 2004/02/27 17:40:15 deraadt Exp $
 
 MAN=		gcc.1 cpp.1 gcov.1 protoize.1
 MLINKS+=	protoize.1 unprotoize.1
@@ -55,7 +55,9 @@ CLEANFILES=	.gdbinit */.gdbinit *.info* \
 		genrtl.c genrtl.h fixinc.sh fixinc/Makefile \
 		po/Makefile  po/Makefile.in  po/POTFILES
 
-.if ${MACHINE} == "arc" || ${MACHINE} == "pmax" || ${MACHINE} == "wgrisc"
+.if ${MACHINE} == "amd64"
+M_ARCH=		x86_64
+.elif ${MACHINE} == "arc" || ${MACHINE} == "pmax" || ${MACHINE} == "wgrisc"
 M_ARCH=		mipsel
 .elif ${MACHINE} == "hkmips" || ${MACHINE} == "sgi"
 M_ARCH=		mips
diff --git a/gnu/usr.bin/gcc/config.guess b/gnu/usr.bin/gcc/config.guess
index 4fc21ecc3aa..d374ffca404 100644
--- a/gnu/usr.bin/gcc/config.guess
+++ b/gnu/usr.bin/gcc/config.guess
@@ -199,6 +199,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;