Bug 429952 - Errors when building regtest with clang

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 20c72c24317732fe646628970092777345819418..5df76150e938fb2b02bb636f1843e03785cbbb7e 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -6,6 +6,7 @@ dist_noinst_SCRIPTS =               \
        filter_annotate_barrier_xml \
        filter_error_count          \
        filter_error_summary        \
+       filter_lambda               \
        filter_stderr               \
        filter_stderr_and_thread_no \
        filter_stderr_and_thread_no_and_offset \

diff --git a/drd/tests/filter_lambda b/drd/tests/filter_lambda
new file mode 100755 (executable)
index 0000000..248132d
--- /dev/null
+++ b/drd/tests/filter_lambda
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+./filter_stderr |
+
+sed -e 's/\$_0/LAMBDA/' |
+sed -e 's/{lambda()#1}/LAMBDA/'
+

diff --git a/drd/tests/std_thread.cpp b/drd/tests/std_thread.cpp
index 27f9e2caadd31bce72713e62c5ef81934f5fc73e..7114e401e8a1963626b71a98bcc3802d7b87af24 100644 (file)
--- a/drd/tests/std_thread.cpp
+++ b/drd/tests/std_thread.cpp
@@ -21,7 +21,7 @@ int main(int argc, char** argv)
   return 0;
 }
 
-#if defined(__GNUC__) && __GNUC__ -0 < 6
+#if defined(__GNUC__) && __GNUC__ -0 < 6 && (defined(_GLIBCXX_THREAD_ABI_COMPAT) && _GLIBCXX_THREAD_ABI_COMPAT)
 //
 // From libstdc++-v3/src/c++11/thread.cc
 //

diff --git a/drd/tests/std_thread2.cpp b/drd/tests/std_thread2.cpp
index 5a4aff929476659c4a47c57af60555700befd00b..eef5ba30ffbebfa83e654ea159ae4bcc9cbe0d2c 100644 (file)
--- a/drd/tests/std_thread2.cpp
+++ b/drd/tests/std_thread2.cpp
@@ -26,7 +26,7 @@ int main(int argc, char** argv)
   return 0;
 }
 
-#if defined(__GNUC__) && __GNUC__ -0 < 6
+#if defined(__GNUC__) && __GNUC__ -0 < 6 && (defined(_GLIBCXX_THREAD_ABI_COMPAT) && _GLIBCXX_THREAD_ABI_COMPAT)
 //
 // From libstdc++-v3/src/c++11/thread.cc
 //

diff --git a/drd/tests/std_thread2.stderr.exp b/drd/tests/std_thread2.stderr.exp
index bb391c5715a7f4a2e51866cc10fa9c0b0ea5e10f..818b5cf579028712c12632d404a137512038e521 100644 (file)
--- a/drd/tests/std_thread2.stderr.exp
+++ b/drd/tests/std_thread2.stderr.exp
@@ -1,7 +1,7 @@
 
 Thread 2:
 Conflicting store by thread 2 at 0x........ size 4
-   at 0x........: main::{lambda()#1}::operator()() const (std_thread2.cpp:21)
+   at 0x........: main::LAMBDA::operator()() const (std_thread2.cpp:21)
 Allocation context: BSS section of std_thread2
 
 Done.

diff --git a/drd/tests/std_thread2.vgtest b/drd/tests/std_thread2.vgtest
index d2d4603468990c142a46dd0e149716f85fa3e7e3..74917b289d4940c4b38b040c1e39187ebab9e4f7 100644 (file)
--- a/drd/tests/std_thread2.vgtest
+++ b/drd/tests/std_thread2.vgtest
@@ -1,4 +1,4 @@
 prereq: test -e std_thread2 && ./supported_libpthread
 vgopts: --check-stack-var=yes --show-confl-seg=no --num-callers=1 --default-suppressions=no --suppressions=std_thread2.supp
 prog: std_thread2
-stderr_filter: filter_stderr
+stderr_filter: filter_lambda