From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 26 Mar 2018 19:29:27 +0000 (+0000)
Subject: runtime: don't check for stale runtime
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8ebf991f368de92ec22a431920cc7c4332be5d4;p=gcc.git

runtime: don't check for stale runtime

    The gccgo runtime is never stale, and on a system with gc sources in
    ~/go the test may wind up checking whether the gc runtime is stale.

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

From-SVN: r258865
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 5efedb7fc5b..76b5acac1f8 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e9c0e4d8fd3d951a367bb6a50e5cb546e01b81a8
+3aa5fc91094c5f24b26747ec176ad44cde784fc7
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/runtime/crash_test.go b/libgo/go/runtime/crash_test.go
index 7a099beb765..602630d955f 100644
--- a/libgo/go/runtime/crash_test.go
+++ b/libgo/go/runtime/crash_test.go
@@ -150,6 +150,9 @@ var (
 
 func checkStaleRuntime(t *testing.T) {
 	staleRuntimeOnce.Do(func() {
+		if runtime.Compiler == "gccgo" {
+			return
+		}
 		// 'go run' uses the installed copy of runtime.a, which may be out of date.
 		out, err := testenv.CleanCmdEnv(exec.Command(testenv.GoToolPath(t), "list", "-gcflags=all="+os.Getenv("GO_GCFLAGS"), "-f", "{{.Stale}}", "runtime")).CombinedOutput()
 		if err != nil {