diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 07ae4d0f00c5..d7f1dbc734d2 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3de822d11255d439fac9717897b017aae2de18c2
+8edf085a94579bd819a10f50328233812ceeb950
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
index 9ba199b8caea..c6ac972bd410 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -2042,7 +2042,7 @@ doentersyscall()
 	m->mcache = nil;
 	m->p->m = nil;
 	runtime_atomicstore(&m->p->status, Psyscall);
-	if(runtime_sched.gcwaiting) {
+	if(runtime_atomicload(&runtime_sched.gcwaiting)) {
 		runtime_lock(&runtime_sched);
 		if (runtime_sched.stopwait > 0 && runtime_cas(&m->p->status, Psyscall, Pgcstop)) {
 			if(--runtime_sched.stopwait == 0)