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 ESMTP id 6E4433857809 for ; Fri, 8 Oct 2021 14:51:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6E4433857809 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-rn_73BzhPJGMZ47ev4BD2g-1; Fri, 08 Oct 2021 10:51:27 -0400 X-MC-Unique: rn_73BzhPJGMZ47ev4BD2g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF5DA18D6A34; Fri, 8 Oct 2021 14:51:26 +0000 (UTC) Received: from localhost (unknown [10.33.37.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id A23994DA31; Fri, 8 Oct 2021 14:51:26 +0000 (UTC) Date: Fri, 8 Oct 2021 15:51:25 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Detect miscompilation of src/c++11/limits.cc Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="4+SQIfCe8VoTKW8u" Content-Disposition: inline X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Oct 2021 14:51:30 -0000 --4+SQIfCe8VoTKW8u Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Add a #error directive to ensure that the definitions are not compiled as C++17, which would prevent them being emitted. libstdc++-v3/ChangeLog: PR libstdc++/98725 * src/c++11/limits.cc: Fail if __cpp_inline_variables is defined. Tested powerpc64le-linux. Committed to trunk. --4+SQIfCe8VoTKW8u Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit e6f6972b5f4711c110fa753c926df49415f230da Author: Jonathan Wakely Date: Fri Oct 8 14:45:23 2021 libstdc++: Detect miscompilation of src/c++11/limits.cc Add a #error directive to ensure that the definitions are not compiled as C++17, which would prevent them being emitted. libstdc++-v3/ChangeLog: PR libstdc++/98725 * src/c++11/limits.cc: Fail if __cpp_inline_variables is defined. diff --git a/libstdc++-v3/src/c++11/limits.cc b/libstdc++-v3/src/c++11/limits.cc index 21d4427f10b..585cb8c92db 100644 --- a/libstdc++-v3/src/c++11/limits.cc +++ b/libstdc++-v3/src/c++11/limits.cc @@ -29,6 +29,10 @@ // 18.2.1 // +#if __cpp_inline_variables +# error This file must be compiled as C++11 or C++14 +#endif + #include namespace std _GLIBCXX_VISIBILITY(default) --4+SQIfCe8VoTKW8u--