From patchwork Wed Oct 7 19:25:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1378245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=fhEA18RS; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C647k6cB5z9sRk for ; Thu, 8 Oct 2020 06:26:07 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E3FB03857013; Wed, 7 Oct 2020 19:26:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E3FB03857013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1602098761; bh=ClacniNyzJgBGAxKHKJAVAlxCWWLEzhtljfUjQEE1D8=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=fhEA18RSYHfOjKOK9mD7SXHcWGIIPzPK/SEn6zASZo9K2KqicQ3MwZ8dhT4hC8XOu LwKVvCBQ2V1Jnxcawd9FE00U7LRz2hoghxXWAKa1fYsvMWEdDfjambh90kFy7l5+gi XdEUXaaJZKMv9RYbFW+jYI1YM4cruTSq0m0NloG4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id 2CCEE3857C44 for ; Wed, 7 Oct 2020 19:25:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2CCEE3857C44 Received: by mail-ot1-x333.google.com with SMTP id e20so2850803otj.11 for ; Wed, 07 Oct 2020 12:25:59 -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=ClacniNyzJgBGAxKHKJAVAlxCWWLEzhtljfUjQEE1D8=; b=W2CEJJF+WF5SHl/ZbiQw3pjNsCrNu+rkx3DY0h8zP229SLjD37onCsw57FzVNCVnl3 xD2vmcJwaput04RuHk3no7wRkTbVi4nQDXX4vbL0CDu1iNGI3LR24B6W+61ZL40kX1Jg epPzxY+kUZj3pfaozIoTsw/rlxUNelxZBFRG6uF/ZWdsqC6C48M5Dp8gYvKJGbHSDRPf IqSY/gUwjOcoiWBtkA3NxbrdxnWU1kWwe0EindZ8Op87g8EL+fD53kYXwDiXNP8nTl2Q HHm35vNW4Q0Y0338aE5U/Tj56Scwn2DcjUEnPLcWOgV+KBWJoT9dGhTkn1CgpbD0G6IL 9VTA== X-Gm-Message-State: AOAM533n41sZH+CCk8sW88NF3EkeUBMk1JaGtPrgugrHUEszT+Szrxr9 5yIe4i7agDx+1cS5DC7IolN8qPNUy7SqWom4JDbqTKKnBFS2UA== X-Google-Smtp-Source: ABdhPJyLpNSZKc4ytNIYvwqX89/hCvJt40ib/Btndu2o9SMqnFSnBOIOMrk50DMbPJEbMdrvlvk//zH9axyrKsyEWj4= X-Received: by 2002:a9d:2606:: with SMTP id a6mr2801051otb.259.1602098758244; Wed, 07 Oct 2020 12:25:58 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 7 Oct 2020 12:25:47 -0700 Message-ID: Subject: libgo patch committed: Handle go1.10+ correctly in match.sh To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ian Lance Taylor via Gcc-patches From: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This libgo patch by Nikhil Benesch handles go1.10+ correctly in match.sh. The same issue will arise with Go 1.100, but that is a long ways off. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian 33137fb1974e4b4aa5c82fbcecc2d9e2d854c394 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index c5c02aa2392..15f01a0519b 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -613e530547549f4220c4571ea913acbe5fa56f72 +762b74a56f7ca102a5b8da1c9d0ffce592caa46b The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/match.sh b/libgo/match.sh index 6f7b368f8bf..04db8d2c0d2 100755 --- a/libgo/match.sh +++ b/libgo/match.sh @@ -151,18 +151,18 @@ for f in $gofiles; do fi match=false ;; - $goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9]) + $goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9] | go1.[0-9][0-9]) match=true ;; - "!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9]) + "!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9]) ;; *,*) cmatch=true for ctag in `echo $tag | sed -e 's/,/ /g'`; do case $ctag in - $goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9]) + $goos | $goarch | $cgotag | $cmdlinetag | "gccgo" | go1.[0-9] | go1.[0-9][0-9]) ;; - "!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9]) + "!"$goos | "!"$goarch | "!"$cgotag | "!"$cmdlinetag | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9]) cmatch=false ;; "!"*) diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest index 5bb27ec1631..0fd64194360 100755 --- a/libgo/testsuite/gotest +++ b/libgo/testsuite/gotest @@ -342,18 +342,18 @@ x) fi match=false ;; - $goos | $goarch | cgo | gccgo | go1.[0-9]) + $goos | $goarch | cgo | gccgo | go1.[0-9] | go1.[0-9][0-9]) match=true ;; - "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9]) + "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9]) ;; *,*) cmatch=true for ctag in `echo $tag | sed -e 's/,/ /g'`; do case $ctag in - $goos | $goarch | cgo | gccgo | go1.[0-9]) + $goos | $goarch | cgo | gccgo | go1.[0-9] | go1.[0-9][0-9]) ;; - "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9]) + "!"$goos | "!"$goarch | "!cgo" | "!gccgo" | "!"go1.[0-9] | "!"go1.[0-9][0-9]) cmatch=false ;; "!"*)