diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 27f42275e0d..557e270527c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -fc3d6af694c518d73a126bcbd90d79982524f9f6 +3c1258156a2ae483c5cc523cb7a3c3374cbe7c2c The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/mksigtab.sh b/libgo/mksigtab.sh index 22547ffadc3..c3319705b81 100644 --- a/libgo/mksigtab.sh +++ b/libgo/mksigtab.sh @@ -28,7 +28,12 @@ SIGLIST="" addsig() { echo " $1: $2," # Get the signal number and add it to SIGLIST - signum=`grep "const $1 = " gen-sysinfo.go | sed -e 's/.* = \([0-9]*\)/\1/'` + signum=`grep "const $1 = " gen-sysinfo.go | sed -e 's/.* = //'` + if echo "$signum" | grep -q '^_SIG[A-Z0-9_]*$'; then + # Recurse once to obtain signal number + # This is needed for some MIPS signals defined as aliases of other signals + signum=`grep "const $signum = " gen-sysinfo.go | sed -e 's/.* = //'` + fi SIGLIST=$SIGLIST"_${signum}_" }