diff mbox series

libgo patch committed: Handle go1.10+ correctly in match.sh

Message ID CAOyqgcXrJsTgTokhMGMM4CribsTn6014qdfmYWKaHagpu3vXcA@mail.gmail.com
State New
Headers show
Series libgo patch committed: Handle go1.10+ correctly in match.sh | expand

Commit Message

Ian Lance Taylor Oct. 7, 2020, 7:25 p.m. UTC 
This libgo patch by Nikhil Benesch handles go1.10+ correctly in
match.sh.  The same issue will arise with Go 1.100, but that is a long
ways off.  Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.
Committed to mainline.

Ian
33137fb1974e4b4aa5c82fbcecc2d9e2d854c394
diff mbox series

Patch

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index c5c02aa2392..15f01a0519b 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@ 
-613e530547549f4220c4571ea913acbe5fa56f72
+762b74a56f7ca102a5b8da1c9d0ffce592caa46b
 
 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 6f7b368f8bf..04db8d2c0d2 100755
--- a/libgo/match.sh
+++ b/libgo/match.sh
@@ -151,18 +151,18 @@  for f in $gofiles; do
 		    fi
 		    match=false
 		    ;;
-		$goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9])
+		$goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9] | go1.[0-9][0-9])
 		    match=true
 		    ;;
-		"!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9])
+		"!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9])
 		    ;;
 		*,*)
 		    cmatch=true
 		    for ctag in `echo $tag | sed -e 's/,/ /g'`; do
 			case $ctag in
-			    $goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9])
+			    $goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9] | go1.[0-9][0-9])
 				;;
-			    "!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9])
+			    "!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9])
 				cmatch=false
 				;;
 			    "!"*)
diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 5bb27ec1631..0fd64194360 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -342,18 +342,18 @@  x)
 			fi
 			match=false
 			;;
-		    $goos | $goarch | cgo | gccgo | go1.[0-9])
+		    $goos | $goarch | cgo | gccgo | go1.[0-9] | go1.[0-9][0-9])
 			match=true
 			;;
-		    "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9])
+		    "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9])
 			;;
 		    *,*)
 			cmatch=true
 			for ctag in `echo $tag | sed -e 's/,/ /g'`; do
 			    case $ctag in
-			    $goos | $goarch | cgo | gccgo | go1.[0-9])
+			    $goos | $goarch | cgo | gccgo | go1.[0-9] | go1.[0-9][0-9])
 				;;
-			    "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9])
+			    "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9])
 				cmatch=false
 				;;
 			    "!"*)