From a0a8b9ebfc6b03e374572f3cb5cf715fc700c8a9 Mon Sep 17 00:00:00 2001
From: pefo <pefo@openbsd.org>
Date: Sat, 12 Apr 1997 21:54:42 +0000
Subject: [PATCH] Make MIPS configuration more consistent

---
 gnu/usr.bin/gcc/Makefile.bsd-wrapper |  8 ++++----
 gnu/usr.bin/gcc/config.guess         | 16 +++++++++++-----
 gnu/usr.bin/gcc/configure            |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 8174450cbcd..bf5e5961c2f 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.22 1997/04/07 00:18:17 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.23 1997/04/12 21:54:42 pefo Exp $
 
 MAN=		cccp.1 gcc.1 cp/g++.1 f/g77.1
 MLINKS+=	gcc.1 cc.1
@@ -12,9 +12,9 @@ CLEANFILES=	.gdbinit cp/.gdbinit *.info* bi-parser.c bi-parser.h \
 		objc-parse.c objc-parse.y f/.gdbinit f/*.info*
 
 .if ${MACHINE} == "arc" || ${MACHINE} == "pmax"
-M_ARCH=		mips64el
-.elif ${MACHINE} == "laguna"
-M_ARCH=		mips64
+M_ARCH=		mipsel
+.elif ${MACHINE} == "hkmips" || ${MACHINE} == "sgi"
+M_ARCH=		mips
 .else
 M_ARCH=		${MACHINE_ARCH}
 .endif
diff --git a/gnu/usr.bin/gcc/config.guess b/gnu/usr.bin/gcc/config.guess
index 5ef19b5a18a..9fce8ac2005 100644
--- a/gnu/usr.bin/gcc/config.guess
+++ b/gnu/usr.bin/gcc/config.guess
@@ -70,17 +70,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    arc:OpenBSD:*:*)
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    laguna:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     pmax:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     wgrisc:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
diff --git a/gnu/usr.bin/gcc/configure b/gnu/usr.bin/gcc/configure
index 1244600058f..af392eb5f2d 100644
--- a/gnu/usr.bin/gcc/configure
+++ b/gnu/usr.bin/gcc/configure
@@ -1798,7 +1798,7 @@ for machine in $canon_build $canon_host $canon_target; do
 		fixincludes=Makefile.in
 		prefix=$native_prefix
 		;;
-	mips64el-*-openbsd*)  		    # MIPS R4k running OpenBSD
+	mips*el-*-openbsd*)  		    # MIPS running OpenBSD
 		tm_file=mips/openbsd-le.h
 		xm_file=mips/xm-openbsd.h
 		cpu_type=mips
@@ -1807,7 +1807,7 @@ for machine in $canon_build $canon_host $canon_target; do
 		fixincludes=Makefile.in
 		prefix=$native_prefix
 		;;
-	mips64-*-openbsd*)	    # MIPS R4k big-endian running OpenBSD
+	mips*-*-openbsd*)	    # MIPS big-endian running OpenBSD
 		tm_file=mips/openbsd-be.h
 		xm_file=mips/xm-openbsd.h
 		cpu_type=mips
-- 
2.20.1