libgo: remove old MIPS architecture names

    This removes the old names for the 3 main MIPS ABIs: mipso32, mipsn32
    and mipsn64. It also removes the mipso64 ABI which has no equivalent
    architecture name in go. This ABI has been dead for sometime and I doubt
    anyone will miss it.

    Reviewed-on: https://go-review.googlesource.com/46154

From-SVN: r249477

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 0c0d6e5869ab89780a94c8a86dec466078b19c2b..7eb0770fd65d0b3975d9b21fbe5f5719debd4bf8 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3f713ddb2a9a2a736f3a12d71c56cb7fd444afba
+a4b455aa584e0d6e362a88597f11bba1427088e2
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/configure b/libgo/configure
index f120ed4d4dc1d2e4ff2ced3d87328548f4386a9f..48feebdb10d4d57ad837272cbb6b84159b87a196 100755 (executable)
--- a/libgo/configure
+++ b/libgo/configure
@@ -13645,7 +13645,7 @@ esac
 # supported by the gofrontend and all architectures supported by the
 # gc toolchain.
 # N.B. Keep in sync with gcc/testsuite/go.test/go-test.exp (go-set-goarch).
-ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mipso32 mipsn32 mipso64 mipsn64 mips mipsle mips64 mips64le mips64p32 mips64p32le ppc ppc64 ppc64le s390 s390x sparc sparc64"
+ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mips mipsle mips64 mips64le mips64p32 mips64p32le ppc ppc64 ppc64le s390 s390x sparc sparc64"
 
 # All known GOARCH_FAMILY values.
 ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 S390 S390X SPARC SPARC64"
@@ -13747,16 +13747,6 @@ else
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   mips_abi="n64"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#if _MIPS_SIM != _ABIO64
-#error not o64
-#endif
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  mips_abi="o64"
 else
   as_fn_error "unknown MIPS ABI" "$LINENO" 5
 mips_abi="n32"
@@ -13765,21 +13755,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     case "$mips_abi" in
     "o32") GOARCH=mips ;;
     "n32") GOARCH=mips64p32 ;;
     "n64") GOARCH=mips64 ;;
-    "o64") GOARCH=mipso64 ;;
     esac
     case "$mips_abi" in
     "o32" | "n32")
         GOARCH_FAMILY=MIPS
        GOARCH_MINFRAMESIZE=4
         ;;
-    "n64" | "o64")
+    "n64")
         GOARCH_FAMILY=MIPS64
        GOARCH_MINFRAMESIZE=8
         ;;

diff --git a/libgo/configure.ac b/libgo/configure.ac
index bded202fea29639b71d8e26d5981f3df34913d70..45cd086b272771107b58282d5fd2c38e03e04726 100644 (file)
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -208,7 +208,7 @@ AC_SUBST(USE_DEJAGNU)
 # supported by the gofrontend and all architectures supported by the
 # gc toolchain.
 # N.B. Keep in sync with gcc/testsuite/go.test/go-test.exp (go-set-goarch).
-ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mipso32 mipsn32 mipso64 mipsn64 mips mipsle mips64 mips64le mips64p32 mips64p32le ppc ppc64 ppc64le s390 s390x sparc sparc64"
+ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mips mipsle mips64 mips64le mips64p32 mips64p32le ppc ppc64 ppc64le s390 s390x sparc sparc64"
 
 # All known GOARCH_FAMILY values.
 ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 S390 S390X SPARC SPARC64"
@@ -291,25 +291,19 @@ GOARCH_HUGEPAGESIZE="1 << 21"
 #error not n64
 #endif],
 [mips_abi="n64"],
-       [AC_COMPILE_IFELSE([
-#if _MIPS_SIM != _ABIO64
-#error not o64
-#endif],
-[mips_abi="o64"],
        [AC_MSG_ERROR([unknown MIPS ABI])
-[mips_abi="n32"]])])])])
+[mips_abi="n32"]])])])
     case "$mips_abi" in
     "o32") GOARCH=mips ;;
     "n32") GOARCH=mips64p32 ;;
     "n64") GOARCH=mips64 ;;
-    "o64") GOARCH=mipso64 ;;
     esac
     case "$mips_abi" in
     "o32" | "n32")
         GOARCH_FAMILY=MIPS
        GOARCH_MINFRAMESIZE=4
         ;;
-    "n64" | "o64")
+    "n64")
         GOARCH_FAMILY=MIPS64
        GOARCH_MINFRAMESIZE=8
         ;;

diff --git a/libgo/go/cmd/cgo/main.go b/libgo/go/cmd/cgo/main.go
index e8f3a0334b0202893e7db1aa90a22f5fce9b2bf0..ac102050dadc18dde2040b378b5f9f43e16e9569 100644 (file)
--- a/libgo/go/cmd/cgo/main.go
+++ b/libgo/go/cmd/cgo/main.go
@@ -145,10 +145,6 @@ var ptrSizeMap = map[string]int64{
        "arm":         4,
        "arm64":       8,
        "m68k":        4,
-       "mipso32":     4,
-       "mipsn32":     4,
-       "mipso64":     8,
-       "mipsn64":     8,
        "mips":        4,
        "mipsle":      4,
        "mips64":      8,
@@ -171,10 +167,6 @@ var intSizeMap = map[string]int64{
        "arm":         4,
        "arm64":       8,
        "m68k":        4,
-       "mipso32":     4,
-       "mipsn32":     4,
-       "mipso64":     8,
-       "mipsn64":     8,
        "mips":        4,
        "mipsle":      4,
        "mips64":      8,

diff --git a/libgo/go/go/build/syslist.go b/libgo/go/go/build/syslist.go
index fe9820ee66959ec0bb442973dc28bdb90a90d13e..290ba9efa0cf6b770617c29c494c1f28b6f687c9 100644 (file)
--- a/libgo/go/go/build/syslist.go
+++ b/libgo/go/go/build/syslist.go
@@ -5,4 +5,4 @@
 package build
 
 const goosList = "aix android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows zos "
-const goarchList = "386 amd64 amd64p32 arm armbe arm64 arm64be alpha m68k ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le mipso32 mipsn32 mipsn64 mipso64 ppc s390 s390x sparc sparc64 "
+const goarchList = "386 amd64 amd64p32 arm armbe arm64 arm64be alpha m68k ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le ppc s390 s390x sparc sparc64 "

diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go b/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go
index d8f6ae551d2fe3195c18649a312568f40d320919..4d8f6c53a9929d87435507fcd3f1ed0e41cebc8e 100644 (file)
--- a/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go
+++ b/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build mipsn32 mips64p32 mips64p32le
+// +build mips64p32 mips64p32le
 
 package unix
 

diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_mips64x.go b/libgo/go/internal/syscall/unix/getrandom_linux_mips64x.go
index 02fd1a0642301355906f9b064ec7ed23b66113bf..b328b8f1f0e59e5fcc120da0e08455d0ef9046a1 100644 (file)
--- a/libgo/go/internal/syscall/unix/getrandom_linux_mips64x.go
+++ b/libgo/go/internal/syscall/unix/getrandom_linux_mips64x.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build mips64 mips64le mipsn64 mipso64
+// +build mips64 mips64le
 
 package unix
 

diff --git a/libgo/go/runtime/hash32.go b/libgo/go/runtime/hash32.go
index cfb3a58c7c875297595516e32ca82fbf254a5c84..dd2e657fe3f7b42c39d2619c0746f6887183442d 100644 (file)
--- a/libgo/go/runtime/hash32.go
+++ b/libgo/go/runtime/hash32.go
@@ -6,7 +6,7 @@
 //   xxhash: https://code.google.com/p/xxhash/
 // cityhash: https://code.google.com/p/cityhash/
 
-// +build 386 arm armbe m68k mipso32 mipsn32 mips mipsle ppc s390 sparc
+// +build 386 arm armbe m68k mips mipsle ppc s390 sparc
 
 package runtime
 

diff --git a/libgo/go/runtime/hash64.go b/libgo/go/runtime/hash64.go
index 551d5b5f8d839a8856fe1d6ed37efe4496b8ea26..f7d4a6f2f2a23a6b93b8f8eeac0d0c6442f60baf 100644 (file)
--- a/libgo/go/runtime/hash64.go
+++ b/libgo/go/runtime/hash64.go
@@ -6,7 +6,7 @@
 //   xxhash: https://code.google.com/p/xxhash/
 // cityhash: https://code.google.com/p/cityhash/
 
-// +build amd64 amd64p32 arm64 mips64 mips64le ppc64 ppc64le s390x alpha arm64be ia64 mipso64 mipsn64 mips64p32 mips64p32le sparc64
+// +build amd64 amd64p32 arm64 mips64 mips64le ppc64 ppc64le s390x alpha arm64be ia64 mips64p32 mips64p32le sparc64
 
 package runtime
 

diff --git a/libgo/go/runtime/lfstack_32bit.go b/libgo/go/runtime/lfstack_32bit.go
index bc53b13c414f89d4e400897a4460ae4fb5557a8f..ab0edab68f50f0efeaf28e7e9c0adf361142c43c 100644 (file)
--- a/libgo/go/runtime/lfstack_32bit.go
+++ b/libgo/go/runtime/lfstack_32bit.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build 386 arm nacl armbe m68k mips mipsle mips64p32 mips64p32le mipso32 mipsn32 ppc s390 sparc
+// +build 386 arm nacl armbe m68k mips mipsle mips64p32 mips64p32le ppc s390 sparc
 
 package runtime
 

diff --git a/libgo/go/runtime/lfstack_64bit.go b/libgo/go/runtime/lfstack_64bit.go
index 8a39fee87945e913667af03dd28287fc57982cb9..3d5588df558b1102bd5b463ae5a6e2bc45d38253 100644 (file)
--- a/libgo/go/runtime/lfstack_64bit.go
+++ b/libgo/go/runtime/lfstack_64bit.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build amd64 arm64 mips64 mips64le ppc64 ppc64le s390x arm64be alpha mipsn64 sparc64 ia64
+// +build amd64 arm64 mips64 mips64le ppc64 ppc64le s390x arm64be alpha sparc64 ia64
 
 package runtime
 

diff --git a/libgo/go/runtime/unaligned2.go b/libgo/go/runtime/unaligned2.go
index b8aefb952236b236215dc9e61a13ef5ba8a208ba..a33c87acd56a0cf466dcdc2fcf41f685b508e0f4 100644 (file)
--- a/libgo/go/runtime/unaligned2.go
+++ b/libgo/go/runtime/unaligned2.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build arm mips mipsle mips64 mips64le armbe m68k mipso32 mipsn32 sparc alpha ia64 mipso64 mipsn64 mips64p32 mips64p32le sparc64
+// +build arm mips mipsle mips64 mips64le armbe m68k sparc alpha ia64 mips64p32 mips64p32le sparc64
 
 package runtime
 

diff --git a/libgo/go/syscall/endian_big.go b/libgo/go/syscall/endian_big.go
index b96594ec280e4274df9afa2efffaf4a002214e1a..f8ee7cfc233f6686cc1601e111d309d291310659 100644 (file)
--- a/libgo/go/syscall/endian_big.go
+++ b/libgo/go/syscall/endian_big.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
-// +build ppc64 s390x mips mips64 armbe arm64be m68k ppc mipso32 mipsn32 mipso64 mipsn64 mips64p32 s390 sparc sparc64
+// +build ppc64 s390x mips mips64 armbe arm64be m68k ppc mips64p32 s390 sparc sparc64
 
 package syscall
 

diff --git a/libgo/match.sh b/libgo/match.sh
index dc50cc4dc7ea14aa4f966e9a12b9159b5a4ae331..f87a51d8f1f5ed10ccd7bb8ca6790e0dbe01f3e3 100755 (executable)
--- a/libgo/match.sh
+++ b/libgo/match.sh
@@ -116,7 +116,7 @@ for f in $gofiles; do
        aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
            tag1=nonmatchingtag
            ;;
-       386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+       386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | s390 | s390x | sparc | sparc64)
            tag1=nonmatchingtag
            ;;
     esac
@@ -128,7 +128,7 @@ for f in $gofiles; do
        aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
            tag2=nonmatchingtag
            ;;
-       386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+       386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | s390 | s390x | sparc | sparc64)
            tag2=nonmatchingtag
            ;;
     esac

diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index a961cbf187f7857ce15199e9f1ca1442cfdf8e31..ad3a485d14fe24c795618108bde575e305807186 100755 (executable)
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -314,7 +314,7 @@ x)
            aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
                tag1=nonmatchingtag
                ;;
-           386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+           386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | s390 | s390x | sparc | sparc64)
                tag1=nonmatchingtag
                ;;
            esac
@@ -326,7 +326,7 @@ x)
            aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
                tag2=nonmatchingtag
                ;;
-           386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+           386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | s390 | s390x | sparc | sparc64)
                tag2=nonmatchingtag
                ;;
            esac