From patchwork Sat May 4 21:11:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Patchwork-Id: 1931416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=g92Gx6SH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; 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 [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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VX0ln6CNXz1xnT for ; Sun, 5 May 2024 07:13:57 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1CE7A3842FDD for ; Sat, 4 May 2024 21:13:56 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id 906223844754; Sat, 4 May 2024 21:11:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 906223844754 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 906223844754 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714857119; cv=none; b=SjCNAmFo+BMWXHsokd/0QbOYyWWRlsfxH+FtYN97QyXbbU43MSg1obvZ755Tgwsw6dQ2bvoV0Tt5tmDIdy4AD2Rb+7tHA+gcy9uWvGkw+dYbfX9+aDfT6szc2jMrm7EvRJcDRAzkiMGB1jhc1T3rSyWl6fEEPf2CP0Bv79lriDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714857119; c=relaxed/simple; bh=zkFecCgYkF1Av8RoN8F3vClI+rI3eojXRcSH0nsy2rI=; h=DKIM-Signature:Message-ID:Date:MIME-Version:From:Subject:To; b=YBPq+8pTzP56F0O1GyCS4F34kmF38ggDEUgEGbnhi/vYwWdP70r6mCKMk7JMAkYDRxPaIjyCa8XzzFGOzW65dvsa7di9s7Beemq0/wal55Y1sNhRmxsyK042Gej4t6xZgNoCM82biJOa/ejwJ0FEBzdU1X75DdNzJnETa+yl+Uo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-41bab13ca81so7782615e9.1; Sat, 04 May 2024 14:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714857112; x=1715461912; darn=gcc.gnu.org; h=content-language:cc:to:subject:from:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=1vSzD+cJw1byHqrPNYU1UsPafdAk8WxI63/WqzP1EJ0=; b=g92Gx6SHP/CT9uj9mBT7kZz9o9Iu6bcBYEwhTp7LEHKZtwttEOFnK8mUL/Th2yn044 f5e6+cheWFQEYDJsgXdod9rDyrRQp2RexHpq8AClCZUrfq3elvhGRB4TTPh2C7TLds+H 3XRL3XekDm8OaHpkiVCUH2jHSqaWfAaDWeR4lEe9ULXlu/yHZzxbkzQOsxlCxt3l5BEA aeRlhb/mRyP6RpvTlIeeGLe6T21hqRLmOGB1ir8rBi0G1YkCuglvnSI59d5MppSBAxHm arkdliRl3L7/zQE3EfZ+JtF+obEHz5go61JSt0YkVgyArS6Qj711P9pbyLKSrM3/BbtP LL3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714857112; x=1715461912; h=content-language:cc:to:subject:from:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1vSzD+cJw1byHqrPNYU1UsPafdAk8WxI63/WqzP1EJ0=; b=vyVfRrhTxpPrw5iJBYYqXJa5eblRwvhYSgemijeMsgxyrKS+1BXdtk+PvKQY4lGl03 Q9vwgtTYrtDdU2/f+VRrjQIzoQ4tUBMmDG4Mio7SBX7AHRYfRxJlzs7+Mk5YpbahBW7m bpkVAu1KHO4Yadb26bCBQBnj/Dpq5vmvaNUVXD9SeG8Nr/BhOUEwEkgs9BaQL/w1pQ2c HmNRwjF9T854sGgRTMFYUhA3NiS+ygUy/GXf5TDQM6w+zo/lU15JJd8ZYObVbyDfVjaM GzObeMT6+4KaMyJT5PvzKbuMJ83fZvyIb2zERJ4MipH9UvqnXZTqWr5DLisxPLeKMw94 nLGg== X-Gm-Message-State: AOJu0Yw37761zjezWTuB/ck+atkqf0+y1aZ1D3HnEGMb5EdIaMaEO3Tu nnfFfOvOlPA+72tSK9zBulCfN8GbCudZPoqxe9pnwCl8iRpsPRtwViRZZMAH X-Google-Smtp-Source: AGHT+IH+NYRra6KJrshCbV2EKESPh94NOb4PYAAKW3ChGp4eMSVxrn/4Y1lM8F1tJK9l/lgG8f3lOw== X-Received: by 2002:a05:600c:5117:b0:419:a3f:f4f6 with SMTP id o23-20020a05600c511700b004190a3ff4f6mr6211491wms.8.1714857112120; Sat, 04 May 2024 14:11:52 -0700 (PDT) Received: from ?IPV6:2a01:e0a:1dc:b1c0:bea0:9b:a8bb:bc70? ([2a01:e0a:1dc:b1c0:bea0:9b:a8bb:bc70]) by smtp.gmail.com with ESMTPSA id t12-20020a05600c198c00b0041becb7ff05sm10227909wmq.26.2024.05.04.14.11.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 May 2024 14:11:51 -0700 (PDT) Message-ID: Date: Sat, 4 May 2024 23:11:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Subject: Fix gnu versioned namespace mode 03/03 To: libstdc++ Cc: gcc-patches Content-Language: en-US X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.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 libstdc++: Review configuration options to control abi     --disable-libstdcxx-dual-abi default to 'new' abi mode.     --with-default-libstdcxx-abi consider the requested abi mode regardless     of --disable-libstdcxx-dual-abi usage.     libstdc++-v3/ChangeLog             * acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI): Set             default_libstdcxx_abi to "new" when not using versioned namespace.             (GLIBCXX_DEFAULT_ABI): Remove enable_libstdcxx_dual_abi=yes check.             * configure: Regenerate. Ok to commit ? François diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 3da1d5f1a01..0ba755b08d2 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4867,7 +4867,7 @@ dnl dnl Control whether the library should define symbols for old and new ABIs. dnl This affects definitions of strings, stringstreams and locale facets. dnl -dnl --disable-libstdcxx-dual-abi will use old ABI for all types. +dnl --disable-libstdcxx-dual-abi will use new ABI for all types. dnl dnl Defines: dnl _GLIBCXX_USE_DUAL_ABI (always defined, either to 1 or 0) @@ -4883,7 +4883,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI], [ else if test x"$enable_libstdcxx_dual_abi" != xyes; then AC_MSG_NOTICE([dual ABI is disabled]) - default_libstdcxx_abi="gcc4-compatible" + default_libstdcxx_abi="new" fi fi GLIBCXX_CONDITIONAL(ENABLE_DUAL_ABI, test $enable_libstdcxx_dual_abi = yes) @@ -4898,7 +4898,6 @@ dnl Defines: dnl _GLIBCXX_USE_CXX11_ABI (always defined, either to 1 or 0) dnl AC_DEFUN([GLIBCXX_DEFAULT_ABI], [ - if test x$enable_libstdcxx_dual_abi = xyes; then AC_MSG_CHECKING([for default std::string ABI to use]) AC_ARG_WITH([default-libstdcxx-abi], AS_HELP_STRING([--with-default-libstdcxx-abi], @@ -4912,7 +4911,6 @@ AC_DEFUN([GLIBCXX_DEFAULT_ABI], [ ], [default_libstdcxx_abi="new"]) AC_MSG_RESULT(${default_libstdcxx_abi}) - fi if test $default_libstdcxx_abi = "new"; then glibcxx_cxx11_abi=1 glibcxx_cxx98_abi=0 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 341a8b2cb25..89201086507 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -51276,13 +51276,12 @@ $as_echo "$as_me: dual ABI is disabled" >&6;} if test x"$enable_libstdcxx_dual_abi" != xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: dual ABI is disabled" >&5 $as_echo "$as_me: dual ABI is disabled" >&6;} - default_libstdcxx_abi="gcc4-compatible" + default_libstdcxx_abi="new" fi fi - if test x$enable_libstdcxx_dual_abi = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default std::string ABI to use" >&5 $as_echo_n "checking for default std::string ABI to use... " >&6; } @@ -51301,7 +51300,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${default_libstdcxx_abi}" >&5 $as_echo "${default_libstdcxx_abi}" >&6; } - fi if test $default_libstdcxx_abi = "new"; then glibcxx_cxx11_abi=1 glibcxx_cxx98_abi=0