diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index e48abcf71d6..5aecee18dd6 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -b76c83f34c006938fe6c3311d949496990bc5db9 +761d68dacefc578e45ff299761f20989aef67823 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest index 33f99d77a31..2bd6b5e2b2a 100755 --- a/libgo/testsuite/gotest +++ b/libgo/testsuite/gotest @@ -36,7 +36,7 @@ keep=false pkgpath= prefix= dejagnu=no -timeout=240 +timeout=600 testname="" bench="" trace=false