libgo: don't use \? in grep pattern

    It's not supported by Solaris grep.  Just use * instead; it matches
    more but it shouldn't matter.

    Fixes https://gcc.gnu.org/PR91764

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/195238

From-SVN: r275700

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index f950ecdb0e32505b05a96b0c8982f569573d93b4..522d40824215774364f873c6ba5ceb6251f98df2 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ceb1e4f5614b4772eed44f9cf57780e52f44753e
+5af62eda697da21155091cf5375ed9edb4639b67
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/match.sh b/libgo/match.sh
index c8fb960514fb6e9f76fe6828e9c884d0e515aa46..281acf7ae1357d69449624f868288d22a6d56bb9 100755 (executable)
--- a/libgo/match.sh
+++ b/libgo/match.sh
@@ -135,7 +135,7 @@ for f in $gofiles; do
 
     if test x$tag1 != xnonmatchingtag -a x$tag2 != xnonmatchingtag; then
        # Pipe through cat so that `set -e` doesn't affect fgrep.
-       tags=`sed '/^package /q' < $f | grep '^// \?+build ' | cat`
+       tags=`sed '/^package /q' < $f | grep '^// *+build ' | cat`
        omatch=true
        first=true
        match=false

diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 9d46916d69af49cf3f3a42bbc8b2ae08acfb14bd..4f1a2f822e46338e27392a1511f9bd210ad65d2e 100755 (executable)
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -326,7 +326,7 @@ x)
            esac
 
            if test x$tag1 != xnonmatchingtag -a x$tag2 != xnonmatchingtag; then
-               tags=`sed '/^package /q' < $f | grep '^// \?+build '`
+               tags=`sed '/^package /q' < $f | grep '^// *+build '`
                omatch=true
                first=true
                match=false