diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-09 16:59:38 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-09 16:59:38 +0000 |
commit | 7d87883aa475403a899dce8ecc6f333b8c58ea6e (patch) | |
tree | 4f89aac562b08da9309687e5d72502505488af4a /libgo/configure | |
parent | b05980c7ab3ff3f96ebd5531777095ac2496516b (diff) |
Backport correct Go MIPS architecture names from trunk.
Brings in the following patches:
https://golang.org/cl/46150
https://golang.org/cl/46151
https://golang.org/cl/46152
https://golang.org/cl/46153
https://golang.org/cl/46154
https://gcc.gnu.org/ml/gcc-patches/2017-06/msg01777.html
* go.test/go-test.exp (go-set-goarch): Update MIPS architecture names.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@253551 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/configure')
-rwxr-xr-x | libgo/configure | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/libgo/configure b/libgo/configure index f571d97aad68..b848167d5178 100755 --- a/libgo/configure +++ b/libgo/configure @@ -13625,7 +13625,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" @@ -13728,16 +13728,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 @@ -13746,26 +13736,24 @@ 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=mipso32 ;; - "n32") GOARCH=mipsn32 ;; - "n64") GOARCH=mipsn64 ;; - "o64") GOARCH=mipso64 ;; + "o32") GOARCH=mips ;; + "n32") GOARCH=mips64p32 ;; + "n64") GOARCH=mips64 ;; esac case "$mips_abi" in "o32" | "n32") GOARCH_FAMILY=MIPS GOARCH_MINFRAMESIZE=4 ;; - "n64" | "o64") + "n64") GOARCH_FAMILY=MIPS64 GOARCH_MINFRAMESIZE=8 ;; esac case "${host}" in - mips*el) + mips*el-*-*) + GOARCH="${GOARCH}le" ;; *) GOARCH_BIGENDIAN=1 @@ -14762,7 +14750,7 @@ $as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h fi -for ac_header in port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/reboot.h netinet/icmp6.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h +for ac_header in port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/icmp6.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |