Skip to content

R
riscv-gcc-1
Commit b95cd48b by Ian Lance Taylor
Options

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
parent 1701a9d8
Showing with 19 additions and 46 deletions
gcc/go/gofrontend/MERGE
3f713ddb2a9a2a736f3a12d71c56cb7fd444afba a4b455aa584e0d6e362a88597f11bba1427088e2
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.
libgo/configure
...@@ -13645,7 +13645,7 @@ esac ...@@ -13645,7 +13645,7 @@ esac
# supported by the gofrontend and all architectures supported by the # supported by the gofrontend and all architectures supported by the
# gc toolchain. # gc toolchain.
# N.B. Keep in sync with gcc/testsuite/go.test/go-test.exp (go-set-goarch). # 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. # All known GOARCH_FAMILY values.
ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 S390 S390X SPARC SPARC64" ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 S390 S390X SPARC SPARC64"
...@@ -13748,16 +13748,6 @@ _ACEOF ...@@ -13748,16 +13748,6 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
mips_abi="n64" mips_abi="n64"
else 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 as_fn_error "unknown MIPS ABI" "$LINENO" 5
mips_abi="n32" mips_abi="n32"
fi fi
...@@ -13766,20 +13756,17 @@ fi ...@@ -13766,20 +13756,17 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 case "$mips_abi" in
"o32") GOARCH=mips ;; "o32") GOARCH=mips ;;
"n32") GOARCH=mips64p32 ;; "n32") GOARCH=mips64p32 ;;
"n64") GOARCH=mips64 ;; "n64") GOARCH=mips64 ;;
"o64") GOARCH=mipso64 ;;
esac esac
case "$mips_abi" in case "$mips_abi" in
"o32" | "n32") "o32" | "n32")
GOARCH_FAMILY=MIPS GOARCH_FAMILY=MIPS
GOARCH_MINFRAMESIZE=4 GOARCH_MINFRAMESIZE=4
;; ;;
"n64" | "o64") "n64")
GOARCH_FAMILY=MIPS64 GOARCH_FAMILY=MIPS64
GOARCH_MINFRAMESIZE=8 GOARCH_MINFRAMESIZE=8
;; ;;
......
libgo/configure.ac
...@@ -208,7 +208,7 @@ AC_SUBST(USE_DEJAGNU) ...@@ -208,7 +208,7 @@ AC_SUBST(USE_DEJAGNU)
# supported by the gofrontend and all architectures supported by the # supported by the gofrontend and all architectures supported by the
# gc toolchain. # gc toolchain.
# N.B. Keep in sync with gcc/testsuite/go.test/go-test.exp (go-set-goarch). # 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. # All known GOARCH_FAMILY values.
ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 S390 S390X SPARC SPARC64" ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 S390 S390X SPARC SPARC64"
...@@ -291,25 +291,19 @@ GOARCH_HUGEPAGESIZE="1 << 21" ...@@ -291,25 +291,19 @@ GOARCH_HUGEPAGESIZE="1 << 21"
#error not n64 #error not n64
#endif], #endif],
[mips_abi="n64"], [mips_abi="n64"],
[AC_COMPILE_IFELSE([
#if _MIPS_SIM != _ABIO64
#error not o64
#endif],
[mips_abi="o64"],
[AC_MSG_ERROR([unknown MIPS ABI]) [AC_MSG_ERROR([unknown MIPS ABI])
[mips_abi="n32"]])])])]) [mips_abi="n32"]])])])
case "$mips_abi" in case "$mips_abi" in
"o32") GOARCH=mips ;; "o32") GOARCH=mips ;;
"n32") GOARCH=mips64p32 ;; "n32") GOARCH=mips64p32 ;;
"n64") GOARCH=mips64 ;; "n64") GOARCH=mips64 ;;
"o64") GOARCH=mipso64 ;;
esac esac
case "$mips_abi" in case "$mips_abi" in
"o32" | "n32") "o32" | "n32")
GOARCH_FAMILY=MIPS GOARCH_FAMILY=MIPS
GOARCH_MINFRAMESIZE=4 GOARCH_MINFRAMESIZE=4
;; ;;
"n64" | "o64") "n64")
GOARCH_FAMILY=MIPS64 GOARCH_FAMILY=MIPS64
GOARCH_MINFRAMESIZE=8 GOARCH_MINFRAMESIZE=8
;; ;;
......
libgo/go/cmd/cgo/main.go
...@@ -145,10 +145,6 @@ var ptrSizeMap = map[string]int64{ ...@@ -145,10 +145,6 @@ var ptrSizeMap = map[string]int64{
"arm": 4, "arm": 4,
"arm64": 8, "arm64": 8,
"m68k": 4, "m68k": 4,
"mipso32": 4,
"mipsn32": 4,
"mipso64": 8,
"mipsn64": 8,
"mips": 4, "mips": 4,
"mipsle": 4, "mipsle": 4,
"mips64": 8, "mips64": 8,
...@@ -171,10 +167,6 @@ var intSizeMap = map[string]int64{ ...@@ -171,10 +167,6 @@ var intSizeMap = map[string]int64{
"arm": 4, "arm": 4,
"arm64": 8, "arm64": 8,
"m68k": 4, "m68k": 4,
"mipso32": 4,
"mipsn32": 4,
"mipso64": 8,
"mipsn64": 8,
"mips": 4, "mips": 4,
"mipsle": 4, "mipsle": 4,
"mips64": 8, "mips64": 8,
......
libgo/go/go/build/syslist.go
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
package build package build
const goosList = "aix android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows zos " 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 "
libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build mipsn32 mips64p32 mips64p32le // +build mips64p32 mips64p32le
package unix package unix
......
libgo/go/internal/syscall/unix/getrandom_linux_mips64x.go
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build mips64 mips64le mipsn64 mipso64 // +build mips64 mips64le
package unix package unix
......
libgo/go/runtime/hash32.go
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// xxhash: https://code.google.com/p/xxhash/ // xxhash: https://code.google.com/p/xxhash/
// cityhash: https://code.google.com/p/cityhash/ // 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 package runtime
......
libgo/go/runtime/hash64.go
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// xxhash: https://code.google.com/p/xxhash/ // xxhash: https://code.google.com/p/xxhash/
// cityhash: https://code.google.com/p/cityhash/ // 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 package runtime
......
libgo/go/runtime/lfstack_32bit.go
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // 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 package runtime
......
libgo/go/runtime/lfstack_64bit.go
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // 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 package runtime
......
libgo/go/runtime/unaligned2.go
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // 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 package runtime
......
libgo/go/syscall/endian_big.go
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // 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 package syscall
......
libgo/match.sh
...@@ -116,7 +116,7 @@ for f in $gofiles; do ...@@ -116,7 +116,7 @@ for f in $gofiles; do
aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows) aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag1=nonmatchingtag 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 tag1=nonmatchingtag
;; ;;
esac esac
...@@ -128,7 +128,7 @@ for f in $gofiles; do ...@@ -128,7 +128,7 @@ for f in $gofiles; do
aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows) aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag2=nonmatchingtag 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 tag2=nonmatchingtag
;; ;;
esac esac
......
libgo/testsuite/gotest
...@@ -314,7 +314,7 @@ x) ...@@ -314,7 +314,7 @@ x)
aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows) aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag1=nonmatchingtag 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 tag1=nonmatchingtag
;; ;;
esac esac
...@@ -326,7 +326,7 @@ x) ...@@ -326,7 +326,7 @@ x)
aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows) aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag2=nonmatchingtag 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 tag2=nonmatchingtag
;; ;;
esac esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment