diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 188ada01a3c637f162575c2a4292b66f888c6307..ada5f3f731dc520c484021d3a065c55e7fd65ef3 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-407a59831ea4fbfe03f0887c40497b73939e7c44
+0a58bd7d820dac8931e8da5b291f19c3c7e6bee3
 
 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 f1309aba39a3db359282755de7420ed5a881245d..0b2e572a90562b86057e18e9c503ca1042a0d24a 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -518,10 +518,9 @@ symtogo() {
   local ndots=""
   for tp in $*
   do
-    s=$(echo $tp | sed -e 's/\.\.z2f/%/g' | sed -e 's/.*%//')
+    s=$(echo "$tp" | sed -e 's/\.\.z2f/%/g' | sed -e 's/.*%//')
     # screen out methods (X.Y.Z)
-    ndots=$(echo $s | sed -e 's/\./ /g' | wc -w)
-    if [ $ndots -ne 2 ]; then
+    if ! expr "$s" : '^[^.]*\.[^.]*$' >/dev/null 2>&1; then
       continue
     fi
     if [ -z "${result}" ]; then