diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index ccdfb1c61ffb..2f678352d9fc 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -4db15776701a7cfc1abcef08f7a98c63343d17e6 +be6dbbdbe29f39d6d2ec0d5574ced398cb6e250a 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/os/signal/signal_test.go b/libgo/go/os/signal/signal_test.go index ecb05fd16c3e..6ea59f4697f6 100644 --- a/libgo/go/os/signal/signal_test.go +++ b/libgo/go/os/signal/signal_test.go @@ -432,12 +432,12 @@ func atomicStopTestProgram() { // At this point we should either die from SIGINT or // get a notification on cs. If neither happens, we - // dropped the signal. Give it a second to deliver, - // which is far far longer than it should require. + // dropped the signal. It is given 2 seconds to + // deliver, as needed for gccgo on some loaded test systems. select { case <-cs: - case <-time.After(1 * time.Second): + case <-time.After(2 * time.Second): if !printed { fmt.Print("lost signal on tries:") printed = true