From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Cc: Thomas Rodgers <trodgers@redhat.com>
Subject: [committed] libstdc++: Make names_pstl.cc require et tbb_backend
Date: Thu, 16 Feb 2023 12:40:34 +0000 [thread overview]
Message-ID: <20230216124034.124744-1-jwakely@redhat.com> (raw)
In-Reply-To: <20230216114924.108222-1-jwakely@redhat.com>
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(<tbb/tbb.h>)
+# define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
# include <tbb/tbb.h>
#endif
// Now we can define the macros to poison uses of non-reserved names:
--
2.39.1
prev parent reply other threads:[~2023-02-16 12:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 11:40 [committed] libstdc++: Fix non-reserved names in PSTL headers Jonathan Wakely
2023-02-16 11:49 ` [committed] libstdc++: Add missing space after effective-target name in test Jonathan Wakely
2023-02-16 12:40 ` Jonathan Wakely [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230216124034.124744-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
--cc=trodgers@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).