aboutsummaryrefslogtreecommitdiff
path: root/libgo/configure
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-06-21 22:11:04 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-06-21 22:11:04 +0000
commitb95cd48b01b1340475dd7a408af6d665822a8cf5 (patch)
tree72625660a997749459ccfe70d454dc9febc61f6f /libgo/configure
parent1701a9d8f0ca4153bbf3cf75487c6a14606e5121 (diff)
downloadgcc-b95cd48b01b1340475dd7a408af6d665822a8cf5.zip
gcc-b95cd48b01b1340475dd7a408af6d665822a8cf5.tar.gz
gcc-b95cd48b01b1340475dd7a408af6d665822a8cf5.tar.bz2
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
Diffstat (limited to 'libgo/configure')
-rwxr-xr-xlibgo/configure17
1 files changed, 2 insertions, 15 deletions
diff --git a/libgo/configure b/libgo/configure
index f120ed4..48feebd 100755
--- 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"
@@ -13748,16 +13748,6 @@ _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"
fi
@@ -13766,20 +13756,17 @@ 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
;;