From patchwork Thu Feb 16 12:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 58014 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp276547wrn; Thu, 16 Feb 2023 04:41:33 -0800 (PST) X-Google-Smtp-Source: AK7set9AavgdhaCRTVNxyoEbRlS56dET2x3FZHAwm0nlEaIdkhdmHN/p6NlX8w7vTPkvgQ94Z8EI X-Received: by 2002:aa7:cfc6:0:b0:4ab:2503:403a with SMTP id r6-20020aa7cfc6000000b004ab2503403amr5423490edy.34.1676551293167; Thu, 16 Feb 2023 04:41:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676551293; cv=none; d=google.com; s=arc-20160816; b=DRbtUTUdw3BPKpzA/bjdYs5HbMyW1PPocaHCRKa0uASS2OmAR1MTF/NEOEC9K0iSlR 72tT/LbWFQTZ5ehMR3WkLd6Yv4aO8z0sSWsX9JxbdztqtMiuL8FP/zQJMfSQePvsFLri oMIqmNOR7HeRgmIUIXOOWEBHgXGFTHqa6GOi5+V64RQbkOT0ltdYqmvw0qWoDhHGfPyv aO798191+0TCwnLl0QODGkWC4PUb+JBuMGnZRxlQ4J/Jbsg25qufVbtAWPoGI7SyVWAx C06jIc8c/AB3NWoacGhAVVoQePGku88pNsRg3DZ2CHXfrycYSf0/pJ19NbBVNodr6Tm3 CYtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=B1IWyrTKSATBm5jNdxdiGeErldv6+xpJ2Ltr6QynMwg=; b=R/m3V9wc/xBEAcIz8XUtfCyPUvTlYx7Rcg98XvLBXlXU7RgQp6ysVsDB4GDNuJ5bHQ fa25mrIR/5xWzPdfsQZjmegxhrtubzZ9AfhOQSsgk56cesS3TZrDHXmg8rS6zrSf7Uhu 3rQG1UzB/tmzF5JqIFXw8i8GCh08/nAcT6t8BoslH5pGXUZRkqrlegSYtQeXsisyjLvQ mbI8tMGFiwv1yX3mMWZOWBj/Q1WynRXw4WU/byNhXHdy/xEh1XKqlCwEtlB3LEa0tb/m iAeCaD6Dei2A11UYJ1Tg00lLoCB9zeDnKchb/h1m2/smAvwRdJvSATdgcNBXrs2QchnP fQhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vB1rMWoq; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id m4-20020a056402050400b004acbe0c5f69si2164048edv.444.2023.02.16.04.41.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 04:41:33 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vB1rMWoq; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 03B613858C78 for ; Thu, 16 Feb 2023 12:41:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03B613858C78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676551282; bh=B1IWyrTKSATBm5jNdxdiGeErldv6+xpJ2Ltr6QynMwg=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=vB1rMWoq9bm2w0zqDsDDcDYi3yJgaQD0v+mc5vJEbA50vuPeFPe/gzzc871lMaRzl Xb5t0zE65bsk773NSZrgK1bdoRJbhJHjX1XsZgrhrB1BxaluNn3yHO6KkgCXG2dwSr rkPBpXerb4xrxRy9m4l8vIog6PT8QU63RQBJIFK8= 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 66DAE3858C5F for ; Thu, 16 Feb 2023 12:40:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66DAE3858C5F Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-264-paeIWyP7M1ewXRM174g-xg-1; Thu, 16 Feb 2023 07:40:35 -0500 X-MC-Unique: paeIWyP7M1ewXRM174g-xg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D967C85A588; Thu, 16 Feb 2023 12:40:34 +0000 (UTC) Received: from localhost (unknown [10.33.37.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D12B2026D4B; Thu, 16 Feb 2023 12:40:34 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Thomas Rodgers Subject: [committed] libstdc++: Make names_pstl.cc require et tbb_backend Date: Thu, 16 Feb 2023 12:40:34 +0000 Message-Id: <20230216124034.124744-1-jwakely@redhat.com> In-Reply-To: <20230216114924.108222-1-jwakely@redhat.com> References: <20230216114924.108222-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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_NONE, RCVD_IN_MSPIKE_H2, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757991449009067576?= X-GMAIL-MSGID: =?utf-8?q?1757991449009067576?= Sigh ... this test still isn't right, because it fails on systems without a bug-fix for TBB 2020.3. We could just add -fpermissive to the test options, but let's just require tbb_backend (which isn't matched on systems with the buggy headers). Separately, I'm going to backport the TBB fix to Fedora 37 where I had the test FAIL. Tested x86_64-linux (Fedora 37 this time). Pushed to trunk. -- >8 -- The https://github.com/oneapi-src/oneTBB/pull/833 fix is needed for TBB headers to avoid an error with GCC 13. The new names_pstl.cc test needs to check effective target tbb_backend so that it's UNSUPPORTED on systems without fixed headers. libstdc++-v3/ChangeLog: * testsuite/17_intro/names_pstl.cc: Require et tbb_backend. --- libstdc++-v3/testsuite/17_intro/names_pstl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/17_intro/names_pstl.cc b/libstdc++-v3/testsuite/17_intro/names_pstl.cc index 42ce098550c..019e4774ff2 100644 --- a/libstdc++-v3/testsuite/17_intro/names_pstl.cc +++ b/libstdc++-v3/testsuite/17_intro/names_pstl.cc @@ -1,10 +1,12 @@ // { dg-do compile { target c++17 } } -// { dg-additional-options "-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" { target tbb_backend } } +// { dg-require-effective-target tbb_backend } +// { dg-add-options no_pch } // The TBB headers use non-reserved names (because they're not part of the // implementation) so we need to include them before the macro definitions // in names.cc: #if __has_include() +# define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 # include #endif // Now we can define the macros to poison uses of non-reserved names: