diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 8fe2b207c75..bcbffccc05c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e9550aa81d38ada037f675f50cbc09e6f1c35c12
+3b06572039eb525abfecce15f066ad6ab0fdea05
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index eb44acf4dc1..3bb7eabdcc8 100755
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -183,6 +183,9 @@ enum {
 #ifdef TIOCSCTTY
   TIOCSCTTY_val = TIOCSCTTY,
 #endif
+#ifdef TIOCGPGRP
+  TIOCGPGRP_val = TIOCGPGRP,
+#endif
 #ifdef TIOCSPGRP
   TIOCSPGRP_val = TIOCSPGRP,
 #endif
@@ -920,6 +923,11 @@ if ! grep '^const TIOCSCTTY' ${OUT} >/dev/null 2>&1; then
     echo 'const TIOCSCTTY = _TIOCSCTTY_val' >> ${OUT}
   fi
 fi
+if ! grep '^const TIOCGPGRP' ${OUT} >/dev/null 2>&1; then
+  if grep '^const _TIOCGPGRP_val' ${OUT} >/dev/null 2>&1; then
+    echo 'const TIOCGPGRP = _TIOCGPGRP_val' >> ${OUT}
+  fi
+fi
 if ! grep '^const TIOCSPGRP' ${OUT} >/dev/null 2>&1; then
   if grep '^const _TIOCSPGRP_val' ${OUT} >/dev/null 2>&1; then
     echo 'const TIOCSPGRP = _TIOCSPGRP_val' >> ${OUT}