diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index dee5f671184..386293981ef 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -262d629b1592f681fef396166a671e46cdb31230 +3287064c24cbf0c50776cdb87a720d29130b4363 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 6f7cba72494..1b40dbe73a7 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -1142,7 +1142,7 @@ grep '^const _RLIM_' gen-sysinfo.go | sed -e 's/^\(const \)_\(RLIM_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} if test "${rlimit}" = "_rlimit64" && grep '^const _RLIM64_INFINITY ' gen-sysinfo.go > /dev/null 2>&1; then echo 'const RLIM_INFINITY = _RLIM64_INFINITY' >> ${OUT} -elif grep '^const _RLIM_INFINITY ' gen-sysinfo-go; then +elif grep '^const _RLIM_INFINITY ' gen-sysinfo.go > /dev/null 2>&1; then echo 'const RLIM_INFINITY = _RLIM_INFINITY' >> ${OUT} fi