Change all mips ports to use mips-unknown-openbsd2.0 like gcc does.

This should allow for gdb to at least build on pmax, modulo potential platform
specific include files.    This impacts gas, ld, and other critical system
components.  Don't build this unless you are happy with your backups, as
always for a change of this nature.  It works for me on my machine, however.

7 files changed, 9 insertions, 25 deletions

diff --git a/gnu/usr.bin/binutils/bfd/config.bfd b/gnu/usr.bin/binutils/bfd/config.bfd
index 833a2bdda5c..f2c7222a6b3 100644
--- a/gnu/usr.bin/binutils/bfd/config.bfd
+++ b/gnu/usr.bin/binutils/bfd/config.bfd
@@ -353,8 +353,7 @@ case "${targ}" in
     targ_defvec=m88kbcs_vec
     targ_underscore=yes
     ;;
-
-  mips-arc-openbsd*)
+  mips-*-openbsd*)
     targ_defvec=bfd_elf32_littlemips_vec
     targ_selvecs=bfd_elf32_bigmips_vec
     ;;
@@ -366,14 +365,6 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlemips_vec
     targ_selvecs=bfd_elf32_bigmips_vec
     ;;
-  mips-dec-openbsd*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs=bfd_elf32_bigmips_vec
-    ;;
-  mips-arc-openbsd*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs=bfd_elf32_bigmips_vec
-    ;;
   mips*-dec-bsd*)
     targ_defvec=aout_mips_little_vec
     targ_underscore=yes
diff --git a/gnu/usr.bin/binutils/config.guess b/gnu/usr.bin/binutils/config.guess
index 81c31ec2697..d102288f3e8 100644
--- a/gnu/usr.bin/binutils/config.guess
+++ b/gnu/usr.bin/binutils/config.guess
@@ -65,7 +65,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo m68k-cbm-sysv4
 	exit 0;;
     arc:OpenBSD:*:*)
-      echo mips-arc-openbsd${UNAME_RELEASE}
+      echo mips-unknown-openbsd${UNAME_RELEASE}
       exit 0 ;;
     amiga:NetBSD:*:*)
       echo m68k-cbm-netbsd${UNAME_RELEASE}
@@ -73,11 +73,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     amiga:OpenBSD:*:*)
       echo m68k-cbm-openbsd${UNAME_RELEASE}
       exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mips-arc-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     pmax:OpenBSD:*:*)
-	echo mips-dec-openbsd${UNAME_RELEASE}
+	echo mips-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/binutils/gas/configure b/gnu/usr.bin/binutils/gas/configure
index bd1d754599b..a374899fe77 100644
--- a/gnu/usr.bin/binutils/gas/configure
+++ b/gnu/usr.bin/binutils/gas/configure
@@ -843,8 +843,7 @@ for this_target in $target $canon_targets ; do
 
       # don't change em like *-*-bsd does
       mips-dec-netbsd*)	    fmt=elf targ=mips-lit endian=little ;;
-      mips-arc-openbsd*)    fmt=elf targ=mips-lit endian=little ;;
-      mips-dec-openbsd*)    fmt=elf targ=mips-lit endian=little ;;
+      mips-*-openbsd*)      fmt=elf targ=mips-lit endian=little ;;
       mips-dec-bsd*)        fmt=aout targ=mips-lit ;;
       mips-sony-bsd*)       fmt=ecoff targ=mips-big ;;
       mips-*-bsd*)          { echo "configure: error: Unknown vendor for mips-bsd configuration." 1>&2; exit 1; } ;;
diff --git a/gnu/usr.bin/binutils/gas/configure.in b/gnu/usr.bin/binutils/gas/configure.in
index 1dab6a704d0..1707f200358 100644
--- a/gnu/usr.bin/binutils/gas/configure.in
+++ b/gnu/usr.bin/binutils/gas/configure.in
@@ -198,8 +198,7 @@ changequote([,])dnl
 
       # don't change em like *-*-bsd does
       mips-dec-netbsd*)	    fmt=elf targ=mips-lit endian=little ;;
-      mips-arc-openbsd*)    fmt=elf targ=mips-lit endian=little ;;
-      mips-dec-openbsd*)    fmt=elf targ=mips-lit endian=little ;;
+      mips-*-openbsd*)      fmt=elf targ=mips-lit endian=little ;;
       mips-dec-bsd*)        fmt=aout targ=mips-lit ;;
       mips-sony-bsd*)       fmt=ecoff targ=mips-big ;;
       mips-*-bsd*)          AC_MSG_ERROR(Unknown vendor for mips-bsd configuration.) ;;
diff --git a/gnu/usr.bin/binutils/gdb/configure.host b/gnu/usr.bin/binutils/gdb/configure.host
index 8c9609b5f08..f9d3eb5dc43 100644
--- a/gnu/usr.bin/binutils/gdb/configure.host
+++ b/gnu/usr.bin/binutils/gdb/configure.host
@@ -105,7 +105,7 @@ m88*-motorola-sysv*)	gdb_host=delta88 ;;
 m88*-*-mach3*)		gdb_host=mach3 ;;
 m88*-*-*)		gdb_host=m88k ;;
 
-mips*-arc-*)		gdb_host=arcmips ;;
+mips*-*-openbsd*)	gdb_host=arcmips ;;
 mips-dec-mach3*)	gdb_host=mach3 ;;
 mips-dec-*)		gdb_host=decstation ;;
 mips-little-*)		gdb_host=littlemips ;;
@@ -114,7 +114,6 @@ mips-sgi-irix4*)	gdb_host=irix4 ;;
 mips-sgi-irix5*)	gdb_host=irix5 ;;
 mips-sony-*)		gdb_host=news-mips ;;
 mips-*-mach3*)		gdb_host=mach3 ;;
-mips-*-openbsd*)	gdb_host=obsd ;;
 mips-*-sysv4*)		gdb_host=mipsv4 ;;
 mips-*-sysv*)		gdb_host=riscos ;;
 mips-*-riscos*)		gdb_host=riscos ;;
diff --git a/gnu/usr.bin/binutils/gdb/configure.tgt b/gnu/usr.bin/binutils/gdb/configure.tgt
index 20ae654eaec..126c02b49ef 100644
--- a/gnu/usr.bin/binutils/gdb/configure.tgt
+++ b/gnu/usr.bin/binutils/gdb/configure.tgt
@@ -148,7 +148,7 @@ m88*-*-*)		gdb_target=m88k ;;
 
 mips64*-big-*)		gdb_target=bigmips64 ;;
 mips*-big-*)		gdb_target=bigmips ;;
-mips*-arc-*)		gdb_target=arcmips ;;
+mips*-*-openbsd*)	gdb_target=arcmips ;;
 mips*-dec-mach3*)	gdb_target=mach3 ;;
 mips*-dec-*)		gdb_target=decstation ;;
 mips64*el-*-ecoff*)	gdb_target=embedl64 ;;
@@ -170,7 +170,6 @@ mips*-sgi-irix5*)	gdb_target=irix5 ;;
 mips*-sgi-*)		gdb_target=irix3 ;;
 mips*-sony-*)		gdb_target=bigmips ;;
 mips*-*-mach3*)		gdb_target=mach3 ;;
-mips*-*-openbsd*)	gdb_target=obsd ;;
 mips*-*-sysv4*)		gdb_target=mipsv4 ;;
 mips*-*-sysv*)		gdb_target=bigmips ;;
 mips*-*-riscos*)	gdb_target=bigmips ;;
diff --git a/gnu/usr.bin/binutils/ld/configure.tgt b/gnu/usr.bin/binutils/ld/configure.tgt
index d48d1926c7c..4260419a0c7 100644
--- a/gnu/usr.bin/binutils/ld/configure.tgt
+++ b/gnu/usr.bin/binutils/ld/configure.tgt
@@ -126,9 +126,9 @@ mips*el-*-ecoff*)	targ_emul=mipsidtl ;;
 mips*-*-ecoff*)		targ_emul=mipsidt ;;
 mips*-dec-bsd*)		targ_emul=mipsbsd ;;
 mips*-dec-netbsd*)	targ_emul=elf32lmip ;;
-mips*-arc-openbsd*)	targ_emul=elf32arc ;;
+mips*-*-openbsd*)	targ_emul=elf32arc ;;
 mips-heurikon-openbsd*) targ_emul=elf32bmip ;;
-mips*-dec-openbsd*)	targ_emul=elf32lmip ;;
+# mips*-dec-openbsd*)	targ_emul=elf32lmip ;;
 mips*-*-bsd*)		targ_emul=mipsbig ;;
 mips*vr4300el-*-elf*)	targ_emul=elf32l4300 ;;
 mips*vr4300-*-elf*)	targ_emul=elf32b4300 ;;