From patchwork Wed Sep 7 19:26:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1078 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp1290564wrt; Wed, 7 Sep 2022 12:27:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR7GxQmY8dKl/VrIAX6TbegcJGvtieTvLv0BcxSFRkQ0DE1QBzYDuleM7fBCK9HAZieD88Lp X-Received: by 2002:a17:907:a053:b0:741:698d:4e40 with SMTP id gz19-20020a170907a05300b00741698d4e40mr3304684ejc.616.1662578823066; Wed, 07 Sep 2022 12:27:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662578823; cv=none; d=google.com; s=arc-20160816; b=Sd5gUIamsxb78d+xP+6Nruw0mEsaswm49vYJyX8JDGCvgWH6ljHpgLAaKVzVoJ9q/j NyvwTEN9yjhh8+loYQiXLD8dc3X/m0Ur4PPHJJ+wsA7MhVEKc/dpwNfbay2lRHM85HV2 gGL/1Yy+PPpeoAiRoPWqTNndxfsduL6ns7EXQ4+i/ilssornYlH2ILeaRdPkBUCNHbCj zfYEiSJYvxg1zjVv17u6jiTPhdE8fPXdeu2KJ8Ya5jqtuuoMZQn7CWg4FFVAMMtUhDNK yTtKkhrrapSi4Zc3zxK/PEdx3UmAApu8vh2V3wHdlMjgHlkOdgVAkNamKRL0Hynuy56u sDng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=fRmuR2/SUqF6cbOlRvXaWllUvt3GN7XVUrRXr/pYfLM=; b=JEd4d5qnIiyJGtoAjvkerYfDYDf0LDPefGFH9tcZgHJ7gMQSm869Mozr8o3TuS5OsM A/9q7cx+EvrMGeAJTFTM+jILRYWagSemo5u8IydN5lPAmcfimcN4fDDGnGgce4AJfHLl Cn4gBGU84wsF3/zAqbQG9WCYj2auOmaiRen9Vq5jQQSf7iHdlvRrUh9V9wxScxkv9ZV0 VEDHuN1D11YaaorspYY8Moyghm18B0y2xxjBs31/hM476hlsICnQ1wil/T8qYTGQ5s8r /I1V+F2XgmPvgDooL2h3kDXophygppTK0aF34wz705g9DkD72Xw0mbJGZJfyKnpwF9nc 1DxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=aSgbqbiI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qb38-20020a1709077ea600b007317ad1f9a4si240544ejc.310.2022.09.07.12.27.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 12:27:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=aSgbqbiI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DCC043857C7C for ; Wed, 7 Sep 2022 19:27:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DCC043857C7C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662578821; bh=fRmuR2/SUqF6cbOlRvXaWllUvt3GN7XVUrRXr/pYfLM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=aSgbqbiISPsC8MTaM3do+bdsPJ3gRXy+elyybj0KS5EwU4IW13sj2nKv5nR9oKwuk FE4LVB1tzJxFrEQc3oGqwIyltEl6GY17YqezuuFcEZPQdDPnHIlSGm5AlK5fYrMj6p J2B7HeyOxm4Pa7Org5s47nvUZEqvmnGUjkJlLI3g= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 67EBA3858407 for ; Wed, 7 Sep 2022 19:26:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 67EBA3858407 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-Z_CvJVL1Odend_XtoBwETw-1; Wed, 07 Sep 2022 15:26:14 -0400 X-MC-Unique: Z_CvJVL1Odend_XtoBwETw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C21592999B5A; Wed, 7 Sep 2022 19:26:13 +0000 (UTC) Received: from localhost (unknown [10.33.36.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EB031415102; Wed, 7 Sep 2022 19:26:13 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add missing runtime exception to licence notice Date: Wed, 7 Sep 2022 20:26:12 +0100 Message-Id: <20220907192612.1903546-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1743340252006959743?= X-GMAIL-MSGID: =?utf-8?q?1743340252006959743?= Tested powerpc64le-linux, pushed to trunk. Backports to gcc-11 and gcc-12 needed too. -- >8 -- This file is missing the GCC Runtime Library Exception text in the licence header. That is unintentional, and it should have been present. libstdc++-v3/ChangeLog: * include/std/barrier: Add missing runtime exception. --- libstdc++-v3/include/std/barrier | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/barrier b/libstdc++-v3/include/std/barrier index 2a2650546ad..997e0a8f7ab 100644 --- a/libstdc++-v3/include/std/barrier +++ b/libstdc++-v3/include/std/barrier @@ -13,8 +13,13 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // . // This implementation is based on libcxx/include/barrier