From patchwork Sat Sep 23 20:10:42 2023 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: 143992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp352321vqu; Sat, 23 Sep 2023 13:11:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgIVjixa7FI5KfKOWDFgtROtmmsQYsqg3uh9IOn9AkHeOnlibKXsa+s9IxOVLbD7t7PwL0 X-Received: by 2002:a05:6512:1056:b0:503:175e:f005 with SMTP id c22-20020a056512105600b00503175ef005mr3070597lfb.38.1695499915307; Sat, 23 Sep 2023 13:11:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695499915; cv=none; d=google.com; s=arc-20160816; b=w55TOmIDrThHRgrRqMbVJGsgE3AfuDRB1osN4gvlpmub4tzlGM1rP/2Q9bfEI3D7sE KIyE8K1Vvo9NoSI2J9HFwl0uFXQUfPwPNI3zZ4HDBP72JBkKTCHqwarRzufFIOzrrIRJ G8MLWSJjM3gp7vrXlpvZmjY/QLIwqunLVtQsrP8exCqcKBzi5yC7I26IR5OZZFStU7Zt 7KVHkTCjcuD/5xqZSX81kKGxmeWWy+o+4i743Tq3QqQY9yxek6t+MZWNuxQ7CAvSLsj+ +UC4ln+q/VswxbtM5Xk8pEnsqw/PbgZpIhsgQoc7NO7LrPCSOABKrI8GJ+lgfjuETQMx zuhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :dkim-signature:dmarc-filter:delivered-to; bh=YmuOBaKv5pP4E/7dkXCowND0pWlz2Lyby00KFVg7RA0=; fh=faxDgCAij9g4BlA5hhmHzgHTpv+tA7ipD3cJeceFm4s=; b=FhOINSMv4NbwayUrn9cKOfWk9+AQL3kdXeEyClFezs9p3VCfPR8sJyxo0eNY36+GlK 9fd5BiZNdOejPuiUvYSaJLDsrCLOKVEI0+ZY8KOg6iqcKdDpBMpag5AWtmObUVzj264h EuDzgKzEQmWn/Btj8pOe4jzvfYG1/VXC9RHT0+IF9K31FQIFgW/gLeqYaTA2K403azK/ p3OHQkwpRzSZkO/Fzp6/GUDdWWni8k9nodzd6hwNeBObvm5g2ES8pJ2MmhfZ+YT7I6ti kTlYXPMWGp3IzTHICSK4CZwAsw53zNypxZUhDiYLOfzrBXVqK6SgYpf4iNvPOH0Vam2V zpBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KdTfEIIH; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d6-20020aa7ce06000000b00530f636369esi5744124edv.675.2023.09.23.13.11.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 13:11:55 -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=@gmail.com header.s=20230601 header.b=KdTfEIIH; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1511C3856DFE for ; Sat, 23 Sep 2023 20:11:14 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 9C15A3858CDB; Sat, 23 Sep 2023 20:10:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C15A3858CDB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-405361bb9f7so38481145e9.2; Sat, 23 Sep 2023 13:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695499844; x=1696104644; darn=gcc.gnu.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=YmuOBaKv5pP4E/7dkXCowND0pWlz2Lyby00KFVg7RA0=; b=KdTfEIIHUAoLWbtfKHpJTEo+wdAQwKJz6cD+SIBqQEDVKlZ/7A9QVPKsYw/bCxVPSc iiGa2xHVfJkhZ3GWuemlz7tPWP4zugVVnJVsGN/IPOVDXEBmEqkExOI2e7pTc+IH5RgB w4V/6kTuZcVJY+c+QZrXOyJhgEyUOabbmxhOHOmcAihL4w+pEQB0nVYtrNqWd/2/cyFc Y/AbZSoA3o+mDLFnezEg3JDz/IGwgmIxIIqGqbK+pCsG0r7HIFzZ2s/h7LTTcPTJEo8A pRHYQ2vMKQd6QLAzHwlJmCyX16efSy1JvKE1g795HfFbuHmmSz9QgG+/sLAE13pmXQTL SvUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695499844; x=1696104644; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YmuOBaKv5pP4E/7dkXCowND0pWlz2Lyby00KFVg7RA0=; b=XImrEiljy0XRw1kijNbJO9NAXipXgrncR6zlZHUHC5l/XF37ts/vChzoqV9cju+VyO U1BcOZevd6UpFy3O+cp24IRVwcsAWcfZK9WDFuT0K1nzLB9B9cXel1kbT36/TMsVG7XJ n3YmzuHDhEWh9MZD9hSHVhDTvNst0Nhe0SZMzh0teAOy2SXnopLmpEf3XXIbE+PYId4o E8hU1SHWml7j+2mrErXoYbngj3QsQVN7smm9wumpKbEtjnqF7DuXH+zw8b6CVrrp5gZo 5PK4WhQBK/mfBYJf/za5qbJZp2/zHBDiP+TaT3YRHsJmTKYoW1VKhHkEupWSkCb/hxOk Cxsw== X-Gm-Message-State: AOJu0YzmpEa00q8QV5MBFK97AMHPTee7QDydz6zSsAOCpWve+xY8vTPP hLJTBDnEQrL6fsXWdIoVsBI0ie4p144LKA== X-Received: by 2002:a05:600c:21a:b0:3f8:fc2a:c7eb with SMTP id 26-20020a05600c021a00b003f8fc2ac7ebmr2541007wmi.5.1695499843845; Sat, 23 Sep 2023 13:10:43 -0700 (PDT) Received: from ?IPV6:2a01:e0a:1dc:b1c0:affb:7d2a:3873:aae2? ([2a01:e0a:1dc:b1c0:affb:7d2a:3873:aae2]) by smtp.gmail.com with ESMTPSA id v20-20020a05600c215400b00401b242e2e6sm5339210wml.47.2023.09.23.13.10.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 23 Sep 2023 13:10:43 -0700 (PDT) Message-ID: <4ebb6936-d652-84a5-0028-6ca0a5d2d238@gmail.com> Date: Sat, 23 Sep 2023 22:10:42 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: gcc@gcc.gnu.org, libstdc++ Cc: gcc-patches From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Subject: [PATCH] Fix coroutine tests for libstdc++ gnu-version-namespace mode X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777860519191364826 X-GMAIL-MSGID: 1777860519191364826 I'm eventually fixing those tests the same way we manage this problem in libstdc++ testsuite.    testsuite: Add optional libstdc++ version namespace in expected diagnostic     When libstdc++ is build with --enable-symvers=gnu-versioned-namespace diagnostics are     showing this namespace, currently __8.     gcc/testsuite/ChangeLog:             * testsuite/g++.dg/coroutines/coro-bad-alloc-00-bad-op-new.C: Add optional             '__8' version namespace in expected diagnostic.             * testsuite/g++.dg/coroutines/coro-bad-alloc-01-bad-op-del.C: Likewise.             * testsuite/g++.dg/coroutines/coro-bad-alloc-02-no-op-new-nt.C: Likewise.             * testsuite/g++.dg/coroutines/coro-bad-grooaf-01-grooaf-expected.C: Likewise.             * testsuite/g++.dg/coroutines/pr97438.C: Likewise.             * testsuite/g++.dg/coroutines/ramp-return-b.C: Likewise. Tested under Linux x86_64. I'm contributing to libstdc++ so I already have write access. Ok to commit ? François diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 73e7f381020..c44b71a04cb 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 6e9a532a359..14f9569597a 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -70712,13 +70712,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; } @@ -70737,7 +70736,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