From patchwork Fri Mar 22 22:45:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1915083 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=STLQ/59E; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1csJ5t7Wz1yXr for ; Sat, 23 Mar 2024 09:47:16 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D7CBF3858434 for ; Fri, 22 Mar 2024 22:47:14 +0000 (GMT) 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 CAEE1385842F for ; Fri, 22 Mar 2024 22:45:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CAEE1385842F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CAEE1385842F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711147533; cv=none; b=akqjrksfy72eQoZAwMdzdWmp2qcaF3Tcnws6UQTd+Qotdoc0PlUGN9tCSQQiNZjRFEvIHmkWiUwb/LCWgfrVk5FpLpJliwnpT+dcD3imDb3dJcI1CBP4BGmJlDlhhfRB+dmIy4egDzUO2XMy5MPrBmWZXwHoBW9ZNU+nHG63NH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711147533; c=relaxed/simple; bh=zS3Wj3VrxF5hQTzfVWRwbJmYUBPOtBB2y3R46nAXSig=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=le7COcmDblgatPqlFjeO0oEa4iu6R5ZhFy5VZLqr39d6sOQBZts3fPNmwJQ68ZlPDLxV6edTuQo1bqkxWNIFGLbGQGTKZTwS6BsL1wwBIr9fWzonx7HfHKzypw4SHHa2qlfImVIO/GaMYghehaY1qNLNZVLvFUacNUBQEzFE52c= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711147530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDR5da347Wybr9P1W1SVVGzIG70tTlBEL8hz2gNM9xk=; b=STLQ/59EOUnEst9+jMJBFVWCXJ77mQhAbM3p23k2Aw4ZkVtU49a0l3QWsWzHg/oDsd3A5d qCexQV9o94dj4TO2EbYmkCph1jJelmlMovpne/M9nT5Kcb4yD9YRLURAC8s/Ur044rBvtf jhrvZk8w2DQaNN5Cj66GWVIehUXYG34= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-302-R8Yhln4ZNYeBkD-g0aWzEA-1; Fri, 22 Mar 2024 18:45:27 -0400 X-MC-Unique: R8Yhln4ZNYeBkD-g0aWzEA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5E6E3C01DE6; Fri, 22 Mar 2024 22:45:26 +0000 (UTC) Received: from localhost (unknown [10.42.28.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3F39C06202; Fri, 22 Mar 2024 22:45:26 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Reorder feature test macro definitions Date: Fri, 22 Mar 2024 22:45:01 +0000 Message-ID: <20240322224522.368473-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 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_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested aarch64-linux. Pushed to trunk. -- >8 -- Put the C++23 generator and tuple_like ones before the C++26 ones. libstdc++-v3/ChangeLog: * include/bits/version.def (generator, tuple_like): Move earlier in the file. * include/bits/version.h: Regenerate. --- libstdc++-v3/include/bits/version.def | 34 +++++++++++------------ libstdc++-v3/include/bits/version.h | 40 +++++++++++++-------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def index 26e62c6a9b2..5ad44941bff 100644 --- a/libstdc++-v3/include/bits/version.def +++ b/libstdc++-v3/include/bits/version.def @@ -1637,6 +1637,15 @@ ftms = { }; }; +ftms = { + name = generator; + values = { + v = 202207; + cxxmin = 23; + extra_cond = "__glibcxx_coroutine"; + }; +}; + ftms = { name = ios_noreplace; values = { @@ -1718,6 +1727,14 @@ ftms = { }; }; +ftms = { + name = tuple_like; + values = { + v = 202207; + cxxmin = 23; + }; +}; + ftms = { name = unreachable; values = { @@ -1771,23 +1788,6 @@ ftms = { }; }; -ftms = { - name = generator; - values = { - v = 202207; - cxxmin = 23; - extra_cond = "__glibcxx_coroutine"; - }; -}; - -ftms = { - name = tuple_like; - values = { - v = 202207; - cxxmin = 23; - }; -}; - // Standard test specifications. stds[97] = ">= 199711L"; stds[03] = ">= 199711L"; diff --git a/libstdc++-v3/include/bits/version.h b/libstdc++-v3/include/bits/version.h index 23c8c09ab4b..460a3e0116a 100644 --- a/libstdc++-v3/include/bits/version.h +++ b/libstdc++-v3/include/bits/version.h @@ -1823,6 +1823,16 @@ #endif /* !defined(__cpp_lib_forward_like) && defined(__glibcxx_want_forward_like) */ #undef __glibcxx_want_forward_like +#if !defined(__cpp_lib_generator) +# if (__cplusplus >= 202100L) && (__glibcxx_coroutine) +# define __glibcxx_generator 202207L +# if defined(__glibcxx_want_all) || defined(__glibcxx_want_generator) +# define __cpp_lib_generator 202207L +# endif +# endif +#endif /* !defined(__cpp_lib_generator) && defined(__glibcxx_want_generator) */ +#undef __glibcxx_want_generator + #if !defined(__cpp_lib_ios_noreplace) # if (__cplusplus >= 202100L) && _GLIBCXX_HOSTED # define __glibcxx_ios_noreplace 202207L @@ -1913,6 +1923,16 @@ #endif /* !defined(__cpp_lib_to_underlying) && defined(__glibcxx_want_to_underlying) */ #undef __glibcxx_want_to_underlying +#if !defined(__cpp_lib_tuple_like) +# if (__cplusplus >= 202100L) +# define __glibcxx_tuple_like 202207L +# if defined(__glibcxx_want_all) || defined(__glibcxx_want_tuple_like) +# define __cpp_lib_tuple_like 202207L +# endif +# endif +#endif /* !defined(__cpp_lib_tuple_like) && defined(__glibcxx_want_tuple_like) */ +#undef __glibcxx_want_tuple_like + #if !defined(__cpp_lib_unreachable) # if (__cplusplus >= 202100L) # define __glibcxx_unreachable 202202L @@ -1973,24 +1993,4 @@ #endif /* !defined(__cpp_lib_to_string) && defined(__glibcxx_want_to_string) */ #undef __glibcxx_want_to_string -#if !defined(__cpp_lib_generator) -# if (__cplusplus >= 202100L) && (__glibcxx_coroutine) -# define __glibcxx_generator 202207L -# if defined(__glibcxx_want_all) || defined(__glibcxx_want_generator) -# define __cpp_lib_generator 202207L -# endif -# endif -#endif /* !defined(__cpp_lib_generator) && defined(__glibcxx_want_generator) */ -#undef __glibcxx_want_generator - -#if !defined(__cpp_lib_tuple_like) -# if (__cplusplus >= 202100L) -# define __glibcxx_tuple_like 202207L -# if defined(__glibcxx_want_all) || defined(__glibcxx_want_tuple_like) -# define __cpp_lib_tuple_like 202207L -# endif -# endif -#endif /* !defined(__cpp_lib_tuple_like) && defined(__glibcxx_want_tuple_like) */ -#undef __glibcxx_want_tuple_like - #undef __glibcxx_want_all