From: James Cowgill <James.Cowgill@imgtec.com>
Date: Fri, 23 Jun 2017 13:19:30 +0000 (+0000)
Subject: go-test.exp (go-set-goarch): Update MIPS architecture names.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb68f296283941d15505fcf610099281562fa9e0;p=gcc.git

go-test.exp (go-set-goarch): Update MIPS architecture names.

	* go.test/go-test.exp (go-set-goarch): Update MIPS architecture
        names.

From-SVN: r249589
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b41c8d9c441..24532f7873e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-23  James Cowgill  <James.Cowgill@imgtec.com>
+
+	* go.test/go-test.exp (go-set-goarch): Update MIPS architecture
+        names.
+
 2017-06-22  Matt Turner  <mattst88@gmail.com>
 
 	* gcc.target/i386/builtin_target.c: Add Kaby Lake models to
diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index 5f6ef299e55..4b10e4e2d16 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -213,29 +213,27 @@ proc go-set-goarch { } {
 		#error FOO
 		#endif
 	    }] {
-		set goarch "mipso32"
+		set goarch "mips"
 	    } elseif [check_no_compiler_messages mipsn32 assembly {
 		#if _MIPS_SIM != _ABIN32
 		#error FOO
 		#endif
 	    }] {
-		set goarch "mipsn32"
+		set goarch "mips64p32"
 	    } elseif [check_no_compiler_messages mipsn64 assembly {
 		#if _MIPS_SIM != _ABI64
 		#error FOO
 		#endif
 	    }] {
-		set goarch "mipsn64"
-	    } elseif [check_no_compiler_messages mipso64 assembly {
-		#if _MIPS_SIM != _ABIO64
-		#error FOO
-		#endif
-	    }] {
-		set goarch "mipso64"
+		set goarch "mips64"
 	    } else {
 		perror "$target_triplet: unrecognized MIPS ABI"
 		return ""
 	    }
+
+	    if [istarget "mips*el-*-*"] {
+		append goarch "le"
+	    }
 	}
 	"powerpc*-*-*" {
 	    if [check_effective_target_ilp32] {