From 1701a9d8f0ca4153bbf3cf75487c6a14606e5121 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 21 Jun 2017 21:55:34 +0000
Subject: [PATCH] libgo: use gc's arch names as the default GOARCHs on MIPS

    This means that the gc tools and gofrontend agree on the architecture names
    for the 3 MIPS ABIs which should allow a gofrontend compiler to build go.

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

From-SVN: r249476
---
 gcc/go/gofrontend/MERGE | 2 +-
 libgo/configure         | 9 +++++----
 libgo/configure.ac      | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d9c21fa3ce8..0c0d6e5869a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5a97e51022e3b7798f985714ced3e02d6e730b54
+3f713ddb2a9a2a736f3a12d71c56cb7fd444afba
 
 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 0700b7b6bb6..f120ed4d4dc 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13769,9 +13769,9 @@ 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 ;;
+    "o32") GOARCH=mips ;;
+    "n32") GOARCH=mips64p32 ;;
+    "n64") GOARCH=mips64 ;;
     "o64") GOARCH=mipso64 ;;
     esac
     case "$mips_abi" in
@@ -13785,7 +13785,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ;;
     esac
     case "${host}" in
-    mips*el)
+    mips*el-*-*)
+	GOARCH="${GOARCH}le"
         ;;
     *)
 	GOARCH_BIGENDIAN=1
diff --git a/libgo/configure.ac b/libgo/configure.ac
index d16547f4487..bded202fea2 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -299,9 +299,9 @@ GOARCH_HUGEPAGESIZE="1 << 21"
 	[AC_MSG_ERROR([unknown MIPS ABI])
 [mips_abi="n32"]])])])])
     case "$mips_abi" in
-    "o32") GOARCH=mipso32 ;;
-    "n32") GOARCH=mipsn32 ;;
-    "n64") GOARCH=mipsn64 ;;
+    "o32") GOARCH=mips ;;
+    "n32") GOARCH=mips64p32 ;;
+    "n64") GOARCH=mips64 ;;
     "o64") GOARCH=mipso64 ;;
     esac
     case "$mips_abi" in
@@ -315,7 +315,8 @@ GOARCH_HUGEPAGESIZE="1 << 21"
         ;;
     esac
     case "${host}" in
-    mips*el)
+    mips*el-*-*)
+        GOARCH="${GOARCH}le"
         ;;
     *)
 	GOARCH_BIGENDIAN=1
-- 
2.30.2