From patchwork Fri Sep 13 17:08:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1162175 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-508993-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=golang.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="jpKDc3S8"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=golang-org.20150623.gappssmtp.com header.i=@golang-org.20150623.gappssmtp.com header.b="Nng4JN3t"; 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 46VMYW231lz9sN1 for ; Sat, 14 Sep 2019 03:09:01 +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=ZtIXXb083yxkASUuefy8s2q+vs/Bc7isyzSCArWCuXSfUl 9Pen1LhTd+k4WaDFF5nUDAQFB7MiShHMHS8JcVVCfI4NyuOUhW10aeWt2s4t5pSV lG3Bcj//K2bIajUJqmaeHie2MrY6cgY95MgdKRWA2wvI8Kgd1cos5KXe6GZm8= 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=hfB6JyxwAFfMDRNtouqFEQCTqFM=; b=jpKDc3S8a+l5k6JHRt9t Kyl3ctf3NZbilgMyO++hnY1l5SAjRXgTJKQMi7eJiCGVWKC4TO+BLAInXFq9odOB MF3V0u3KM4Y65Fi6BKR/vuc+otZ1aUJZSx11MYA+61nbRfppSrPYC1Q3JHjL1+AY REnOaVvhwTTmzhNN8cwRU7Q= Received: (qmail 86577 invoked by alias); 13 Sep 2019 17:08:53 -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 86552 invoked by uid 89); 13 Sep 2019 17:08:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HTo:D*googlegroups.com, HX-Received:c6ca X-HELO: mail-ed1-f46.google.com Received: from mail-ed1-f46.google.com (HELO mail-ed1-f46.google.com) (209.85.208.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Sep 2019 17:08:51 +0000 Received: by mail-ed1-f46.google.com with SMTP id i8so27618264edn.13 for ; Fri, 13 Sep 2019 10:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=golang-org.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=fWYozlv3L6ljJb36InQ1nbmxg/lhCKTkUZNMylcineo=; b=Nng4JN3t5MhPYF1+UXGp2N1JSg9O5rbjnsgOaK1tsz+6FtOiTMnrC+KhnIU6UCJgGd Zbo2sp6d6vx2lx5soFy8JmAMmpwjmaz+eN8M4mpxy1+W0HXELiw6uqimTC74H11sDXyj hyJPkeZ3C2OJ7qIJp17k3Yqy/me5uDQBtqWhNAZ1QeO9Y2ms/iFHDMK+dYWhM7PGVpIX fl2AJnPG89KW42bj1m6ZRI4Nj26RvSIJrdS3uUQSfp/j8bVIwJuveFhiYFfbegtPlAC/ /K5zV9N4sARXj6UTPA1L4mAjt2A4SKG3FyqGJ7uT/pS2MJVpWnscpHirZZWaVrWzEUOr BYXg== MIME-Version: 1.0 From: Ian Lance Taylor Date: Fri, 13 Sep 2019 10:08:37 -0700 Message-ID: Subject: libgo patch committed: Don't use \? in grep pattern To: gcc-patches , gofrontend-dev This libgo patch avoids using \? in a grep pattern. It's not supported by Solaris grep. Just use * instead; it matches more but it shouldn't matter. This fixes GCC PR 91764. Bootstrapped and ran Go tests on x86_64-pc-linux-gnu. Committed to mainline. Ian Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 275698) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -ceb1e4f5614b4772eed44f9cf57780e52f44753e +5af62eda697da21155091cf5375ed9edb4639b67 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/match.sh =================================================================== --- libgo/match.sh (revision 275698) +++ libgo/match.sh (working copy) @@ -135,7 +135,7 @@ for f in $gofiles; do if test x$tag1 != xnonmatchingtag -a x$tag2 != xnonmatchingtag; then # Pipe through cat so that `set -e` doesn't affect fgrep. - tags=`sed '/^package /q' < $f | grep '^// \?+build ' | cat` + tags=`sed '/^package /q' < $f | grep '^// *+build ' | cat` omatch=true first=true match=false Index: libgo/testsuite/gotest =================================================================== --- libgo/testsuite/gotest (revision 275698) +++ libgo/testsuite/gotest (working copy) @@ -326,7 +326,7 @@ x) esac if test x$tag1 != xnonmatchingtag -a x$tag2 != xnonmatchingtag; then - tags=`sed '/^package /q' < $f | grep '^// \?+build '` + tags=`sed '/^package /q' < $f | grep '^// *+build '` omatch=true first=true match=false