valgrind/gcc5.patch

59 lines
1.6 KiB
Diff
Raw Normal View History

------------------------------------------------------------------------
r15773 | bart | 2016-01-25 05:27:25 +0100 (Mo, 25. Jan 2016) | 7 Zeilen
configure.ac: Port to gcc 5
Apparently gcc 5 behaves as follows:
$ gcc -dumpversion
5
------------------------------------------------------------------------
Index: configure.ac
===================================================================
--- configure.ac (Revision 15772)
+++ configure.ac (Revision 15773)
@@ -160,7 +160,7 @@ case "${is_clang}-${gcc_version}" in
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
===================================================================
--- drd/tests/std_thread2.cpp (Revision 15772)
+++ drd/tests/std_thread2.cpp (Revision 15773)
@@ -26,6 +26,7 @@ int main(int argc, char** argv)
return 0;
}
+#if defined(__GNUC__) && __GNUC__ -0 < 6
//
// From libstdc++-v3/src/c++11/thread.cc
//
@@ -70,3 +71,4 @@ namespace std
}
}
}
+#endif
Index: drd/tests/std_thread.cpp
===================================================================
--- drd/tests/std_thread.cpp (Revision 15772)
+++ drd/tests/std_thread.cpp (Revision 15773)
@@ -21,6 +21,7 @@ int main(int argc, char** argv)
return 0;
}
+#if defined(__GNUC__) && __GNUC__ -0 < 6
//
// From libstdc++-v3/src/c++11/thread.cc
//
@@ -65,3 +66,4 @@ namespace std
}
}
}
+#endif