From patchwork Thu Aug 3 18:11:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 797357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-459780-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="HNsTvSYq"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xNdRC6k70z9s76 for ; Fri, 4 Aug 2017 04:11:18 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=Owe9EdhdAOMMwd8mPxGoXKP5qdpweirNsezjk9oZvpMFbD 5/1jsjDP15skWIxyeIX4M3AcEoei+V8J+HEEnc6RpILn9HcPeV/DoSbyH8wpAu27 QUzCDnPcrKL+XOD6MAOzNhSG1raYxJDHGo8sYAX7IOdznCNP0A7EVdVxTcWpg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=DMnynxJF16G+Awtc83Ip3tETnXU=; b=HNsTvSYqXdcibvouPemJ xuiiXNO4ox50wNdna1pKH2Ru44R134oDTUXsVn6MWQwRx1P4N4xyPEjFSTqMFXox NPvk58/O/hf9X9pJ1P2r0xLHOSgksy1lP/OBEp+Cth/izjch/MQaZB7utUgAk9gV lzJD5vQBUXYzbthzGkeAVhs= Received: (qmail 2255 invoked by alias); 3 Aug 2017 18:11:10 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 911 invoked by uid 89); 3 Aug 2017 18:11:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=H*RU:209.85.218.53, Hx-spam-relays-external:209.85.218.53 X-HELO: mail-oi0-f53.google.com Received: from mail-oi0-f53.google.com (HELO mail-oi0-f53.google.com) (209.85.218.53) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 03 Aug 2017 18:11:08 +0000 Received: by mail-oi0-f53.google.com with SMTP id g131so19932419oic.3 for ; Thu, 03 Aug 2017 11:11:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=1Gr5iUmQd1msPVQnWA9eJ7rI7WhFYl6/6kG1a67CH7E=; b=Kmc/G0O2sO/m/ASdtktWvQUp6mhvKjJSXLZRdRBBWK/OdvJvrHEMLoXTzSJTJjuv0G guqIE2OETw+2cbfPoqf9TYm71wlD9Fe5k8XBoVQLgn/TLKaQIoVs7QH/eehHbB72ZtZM x3u+5H2IZSXYWhWm3gpub+qBY8C8Erv6E+AoOFRYY7a7jDZsv51QLA4XD9EjgcXOIY9o 5vXCCgevw+WyCOdz8HW7uHfFtNmkMq3QienYTbQn8NmP1Tg9zXZs6kN3Ctuowo22NEaV fu1MYEDVS3iJgvaxVAbD0AjZwcdDex3Ss3/HlXfBy4eJo2SO282X5aD+9ssep4Z++LI9 emTA== X-Gm-Message-State: AHYfb5gs1RwS86xLwF1dLj2yqg/aeBj/LwczlnD5uYnsRaD48VhLzucQ ngyxtmT+xHzjWXXF60vZP1OTU+Ato9tEtTE= X-Received: by 10.202.185.11 with SMTP id j11mr2124533oif.250.1501783866210; Thu, 03 Aug 2017 11:11:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.208.20 with HTTP; Thu, 3 Aug 2017 11:11:05 -0700 (PDT) From: Ian Lance Taylor Date: Thu, 3 Aug 2017 11:11:05 -0700 Message-ID: Subject: libgo patch committed: Fix signal counting for glibc 2.26 To: gcc-patches , "gofrontend-dev@googlegroups.com" This patch to libgo changes the mksigtab script to recognize the glibc 2.26 NSIG expression. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Will commit to GCC 7 branch when it reopens. This fixes GCC PR 81617 and https://golang.org/issue/21147. Ian Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 250832) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -c1ac6bc99f988633c6bc68a5ca9ffad3487750ef +adac632f95d1cd3421c9c1df5204db10b6a92c44 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/mksigtab.sh =================================================================== --- libgo/mksigtab.sh (revision 250406) +++ libgo/mksigtab.sh (working copy) @@ -107,6 +107,19 @@ if test "${GOOS}" = "aix"; then nsig=`expr $nsig + 1` else nsig=`grep 'const _*NSIG = [0-9]*$' gen-sysinfo.go | sed -e 's/.* = \([0-9]*\)/\1/'` + if test -z "$nsig"; then + if grep 'const _*NSIG = [ (]*_*SIGRTMAX + 1[ )]*' gen-sysinfo.go >/dev/null 2>&1; then + rtmax=`grep 'const _*SIGRTMAX = [0-9]*$' gen-sysinfo.go | sed -e 's/.* = \([0-9]*\)/\1/'` + if test -n "$rtmax"; then + nsig=`expr $rtmax + 1` + fi + fi + fi +fi + +if test -z "$nsig"; then + echo 1>&2 "could not determine number of signals" + exit 1 fi i=1