From 99fafd0ca469e7659ecb89c5ee4956c1f46701ef Mon Sep 17 00:00:00 2001
From: pefo <pefo@openbsd.org>
Date: Sun, 13 Apr 1997 21:00:18 +0000
Subject: [PATCH] More consistent MIPS config

---
 gnu/usr.bin/binutils/bfd/config.bfd |  6 +++++-
 gnu/usr.bin/binutils/bfd/configure  |  5 +----
 gnu/usr.bin/binutils/config.guess   | 14 ++++++++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/usr.bin/binutils/bfd/config.bfd b/gnu/usr.bin/binutils/bfd/config.bfd
index 4c86e4dc833..75595196b9e 100644
--- a/gnu/usr.bin/binutils/bfd/config.bfd
+++ b/gnu/usr.bin/binutils/bfd/config.bfd
@@ -353,10 +353,14 @@ case "${targ}" in
     targ_defvec=m88kbcs_vec
     targ_underscore=yes
     ;;
-  mips*-*-openbsd*)
+  mips*el-*-openbsd*)
     targ_defvec=bfd_elf32_littlemips_vec
     targ_selvecs=bfd_elf32_bigmips_vec
     ;;
+  mips*-*-openbsd*)
+    targ_defvec=bfd_elf32_bigmips_vec
+    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    ;;
   mips*-big-*)
     targ_defvec=ecoff_big_vec
     targ_selvecs=ecoff_little_vec
diff --git a/gnu/usr.bin/binutils/bfd/configure b/gnu/usr.bin/binutils/bfd/configure
index 3c5db469545..d0e575e252d 100644
--- a/gnu/usr.bin/binutils/bfd/configure
+++ b/gnu/usr.bin/binutils/bfd/configure
@@ -1664,7 +1664,7 @@ EOF
 EOF
 
 	;;
-  mips-*-openbsd*)
+  mips*-*-openbsd*)
 	COREFILE=netbsd-core.o
 	;;
   mips-dec-bsd*)
@@ -1680,9 +1680,6 @@ EOF
 #define TRAD_HEADER "hosts/mipsmach3.h"
 EOF
 
-	;;
-  mips-*-netbsd*)
-	COREFILE=netbsd-core.o
 	;;
   mips-*-openbsd*)
 	COREFILE=netbsd-core.o
diff --git a/gnu/usr.bin/binutils/config.guess b/gnu/usr.bin/binutils/config.guess
index 5ef19b5a18a..5ba0ad6bde5 100644
--- a/gnu/usr.bin/binutils/config.guess
+++ b/gnu/usr.bin/binutils/config.guess
@@ -71,16 +71,22 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    laguna:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
+    hkmips:OpenBSD:*:*)
+	echo mips-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}
-- 
2.20.1