diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 97be99e0c021..fcc2f9f9af9f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9806c8a8e4e448eaf6810ff1acffa715745d2549
+6d9929a1641b180e724c2fdcdd55f6a254f1dec0
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 1e99810f4788..2e46ecd514f8 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1230,7 +1230,7 @@ runtime-go.lo:
 runtime.inc: s-runtime-inc; @true
 s-runtime-inc: runtime-go.lo Makefile
 	rm -f runtime.inc.tmp2
-	grep -v "#define _" runtime.inc.tmp > runtime.inc.tmp2
+	grep -v "#define _" runtime.inc.tmp | grep -v "#define c0 " | grep -v "#define c1 " > runtime.inc.tmp2
 	for pattern in '_G[a-z]' '_P[a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
 	  grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
 	done
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index c85ec502236d..25b5a7be8ebb 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -3621,7 +3621,7 @@ runtime-go.lo:
 runtime.inc: s-runtime-inc; @true
 s-runtime-inc: runtime-go.lo Makefile
 	rm -f runtime.inc.tmp2
-	grep -v "#define _" runtime.inc.tmp > runtime.inc.tmp2
+	grep -v "#define _" runtime.inc.tmp | grep -v "#define c0 " | grep -v "#define c1 " > runtime.inc.tmp2
 	for pattern in '_G[a-z]' '_P[a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
 	  grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
 	done