mksigtab.sh: skip signals defined as other signals

    Fixes Solaris build.

    Patch by Rainer Orth.

    Reviewed-on: https://go-review.googlesource.com/37587

From-SVN: r245794

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3f3dddeb5e727d245b1a7139e34c6ddd5d9cf956..181b018b77fdc403c59883ac24a435dc86b92adf 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e1502234b5011a1ab859519f1f217dbf4369ec9b
+a4f445e18fb06a032a4399859f432e03245f1a7d
 
 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 78b1655a517a00be5f4aef7eea3c11d522dbd5fc..fd31022824c00a4f9549b1809c4ac3aa776c7753 100644 (file)
--- a/libgo/mksigtab.sh
+++ b/libgo/mksigtab.sh
@@ -56,7 +56,8 @@ echo '        _SIGSYS:    {_SigThrow, "SIGSYS: bad system call"},'
 # Handle signals that are not supported on all systems.
 
 checksig() {
-    if grep "const $1 = " gen-sysinfo.go >/dev/null 2>&1; then
+    if grep "const $1 = " gen-sysinfo.go >/dev/null 2>&1 \
+       && ! grep "const $1 = _SIG" gen-sysinfo.go > /dev/null 2>&1; then
        echo "  $1: $2,"
     fi
 }