Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 239442) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -d51890dc96a2a33484623728bdc8ac258645e9cc +24e0c4c98e0614b1892316aca787f1c564f2d269 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/match.sh =================================================================== --- libgo/match.sh (revision 239225) +++ libgo/match.sh (working copy) @@ -10,10 +10,10 @@ set -e -unset LANG +LANG=C LC_ALL=C LC_CTYPE=C -export LC_ALL LC_CTYPE +export LANG LC_ALL LC_CTYPE srcdir="" goarch="" Index: libgo/testsuite/gotest =================================================================== --- libgo/testsuite/gotest (revision 239256) +++ libgo/testsuite/gotest (working copy) @@ -10,9 +10,10 @@ # Makes egrep,grep work better in general if we put them # in ordinary C mode instead of what the current language is. -unset LANG -export LC_ALL=C -export LC_CTYPE=C +LANG=C +LC_ALL=C +LC_CTYPE=C +export LANG LC_ALL LC_CTYPE GC=${GC:-gccgo} GL=${GL:-${GC-gccgo}}