From 7efb3707f267d5d47c4e0c929fa269adf32b11bc Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 28 Feb 2017 22:30:57 +0000
Subject: [PATCH] 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
---
 gcc/go/gofrontend/MERGE | 2 +-
 libgo/mksigtab.sh       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3f3dddeb5e7..181b018b77f 100644
--- 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 78b1655a517..fd31022824c 100644
--- 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
 }
-- 
2.30.2