From: Thomas Rodgers <rodgert@appliantology.com>
Date: Tue, 21 Apr 2020 08:01:26 +0000 (-0700)
Subject: libstdc++: Fix PSTL tests to run correctly with newer Thread Building Blocks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b90ff7a20b2d1c84a05cba13a2f20e6ff2260828;p=gcc.git

libstdc++: Fix PSTL tests to run correctly with newer Thread Building Blocks

	* testsuite/lib/libstdc++.exp: Add additional_flags=
	-DTBB_SUPRESS_DEPRECATED_MESSAGES=1 to suppress warnings when
	compiling with a newer Thread Building Blocks.
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0cce2b03c18..d09d114d948 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-20  Thomas Rodgers  <trodgers@redhat.com>
+
+	* testsuite/lib/libstdc++.exp: Add additional_flags=
+	-DTBB_SUPRESS_DEPRECATED_MESSAGES=1 to suppress warnings when
+	compiling with a newer Thread Building Blocks.
+
 2020-04-20  Jonathan Wakely  <jwakely@redhat.com>
 
 	* testsuite/24_iterators/istreambuf_iterator/sentinel.cc: New test.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 7f4532c55b2..16963f2edd5 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -1597,7 +1597,8 @@ proc check_effective_target_tbb-backend { } {
         puts $f "}"
         close $f
 
-        set lines [v3_target_compile $src $exe executable "additional_flags=-std=c++17 additional_flags=-ltbb"]
+        set lines [v3_target_compile $src $exe executable "additional_flags=-std=c++17 additional_flags=-ltbb
+                                                           additional_flags=-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1"]
         file delete $src
 
         if [string match "" $lines] {