diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/crash_test.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 5efedb7..76b5aca 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 7a099be..602630d 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 { |