From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 330D23858407 for ; Wed, 7 Sep 2022 21:59:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 330D23858407 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662587939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eXvT71p6KmwDyFGGNIFILG4J+h7XbM+U8lSqA6bPLXk=; b=F+l2NY4x/BtVEVIRsvxpA67qkTZGE54a7vCiSXPdav/uRiZAQ01pf7Y2mosX8ePdDaMQ1k Hk/m0HtWznaj+/f7tiAYRqVoY581MARmObzWDRK6ty7Bxpu9opfUv0yoDbbdfqdW4e1dCD KNDMQpxFOS8UF12G9rZRK7CxHVQMpC8= Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-270-qZahpSckPdKXi2DMoDU5Gg-1; Wed, 07 Sep 2022 17:58:58 -0400 X-MC-Unique: qZahpSckPdKXi2DMoDU5Gg-1 Received: by mail-oo1-f69.google.com with SMTP id b19-20020a4a3413000000b00448add2bb38so6555556ooa.11 for ; Wed, 07 Sep 2022 14:58:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=eXvT71p6KmwDyFGGNIFILG4J+h7XbM+U8lSqA6bPLXk=; b=sCAFmly4mnnSvXyMn22adZwcFMNWlxcgstqM88X7ECUULgiy6QvKgGNPHWCJGTJ2vv GOCBRBLGaEILcmghLPx7lySDIYlUHhu4PhRANOiHSRU4Ges8f5SR78Yvc2gyjcAJfEbr OLHKY9QKtYod/oZbtCLWQWZdl6mqzixYocNdesPyoOhyA3qNj6MmTb9/7aln9ZX8nyfI 6itGQ2+Ek9Q5IQwoqU/AyI9LfNDAbD/El8ZS0zIw85VHuWGoMd+4BwTMtHrPTpo1Os42 cr5q4UDUxaj0I9BhBOXufGODf/crciCfv98O9KHylyCAhXtDC/ZAJd+ZzDnJDtKrRfTd RW2g== X-Gm-Message-State: ACgBeo3lmyeGpSOyp9egPBmpo68J3z/45at956VP/ygcENW0DpLwoqIz JUVVOBKoHoa0S7rsThuL14pTR5/urRrjTTHnNdOhgnrn3XOe/9kS9KkvlNokyNNLJdVum2GR8Ga owZMQiDh6Fk/JXUPg9aVfeNZLvb7UOvE= X-Received: by 2002:a4a:b688:0:b0:448:69c6:2216 with SMTP id v8-20020a4ab688000000b0044869c62216mr1968659ooo.3.1662587937856; Wed, 07 Sep 2022 14:58:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR58kQuvuvDrfSxIprtBI6OYrsyTSMhhR5UBdTgmK179nyRKtA4PcF1sJ+7knSYNee1ukP8WOnZv98AfQAYgRE8= X-Received: by 2002:a4a:b688:0:b0:448:69c6:2216 with SMTP id v8-20020a4ab688000000b0044869c62216mr1968655ooo.3.1662587937616; Wed, 07 Sep 2022 14:58:57 -0700 (PDT) MIME-Version: 1.0 References: <20220907192612.1903546-1-jwakely@redhat.com> In-Reply-To: <20220907192612.1903546-1-jwakely@redhat.com> From: Thomas Rodgers Date: Wed, 7 Sep 2022 14:58:46 -0700 Message-ID: Subject: Re: [committed] libstdc++: Add missing runtime exception to licence notice To: Jonathan Wakely Cc: "libstdc++" , gcc Patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="0000000000006e06d905e81d6bfa" X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,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 List-Id: --0000000000006e06d905e81d6bfa Content-Type: text/plain; charset="UTF-8" Looks good to me. Tom. On Wed, Sep 7, 2022 at 12:27 PM Jonathan Wakely via Gcc-patches < gcc-patches@gcc.gnu.org> wrote: > 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 > -- > 2.37.3 > > --0000000000006e06d905e81d6bfa--