blob: 76bc8218720a1497b18aac721a5c679439d65723 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
backport fix from upstream to fix build errors with gcc 6
http://valgrind.10908.n7.nabble.com/Valgrind-r15773-in-trunk-configure-ac-drd-tests-std-thread-cpp-drd-tests-std-thread2-cpp-td56109.html
../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:3: error: '_Impl_base' is not a member of 'std::thread'
std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
^~~
../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:28: error: '__t' was not declared in this scope
std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
^~~
../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:59: error: '_Impl_base' in 'class std::thread' does not name a type
std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
^~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Backport
Index: configure.ac
===================================================================
--- a/configure.ac (revision 15772)
+++ b/configure.ac (revision 15773)
@@ -160,7 +160,7 @@
icc-1[[3-9]].*)
AC_MSG_RESULT([ok (ICC version ${gcc_version})])
;;
- notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
+ notclang-[[3-9]]|notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
AC_MSG_RESULT([ok (${gcc_version})])
;;
clang-2.9|clang-[[3-9]].*|clang-[[1-9][0-9]]*)
Index: drd/tests/std_thread2.cpp
===================================================================
--- a/drd/tests/std_thread2.cpp (revision 15772)
+++ b/drd/tests/std_thread2.cpp (revision 15773)
@@ -26,6 +26,7 @@
return 0;
}
+#if defined(__GNUC__) && __GNUC__ -0 < 6
//
// From libstdc++-v3/src/c++11/thread.cc
//
@@ -70,3 +71,4 @@
}
}
}
+#endif
Index: drd/tests/std_thread.cpp
===================================================================
--- a/drd/tests/std_thread.cpp (revision 15772)
+++ b/drd/tests/std_thread.cpp (revision 15773)
@@ -21,6 +21,7 @@
return 0;
}
+#if defined(__GNUC__) && __GNUC__ -0 < 6
//
// From libstdc++-v3/src/c++11/thread.cc
//
@@ -65,3 +66,4 @@
}
}
}
+#endif
|
