configure.ac: Port to gcc 5

Apparently gcc 5 behaves as follows:
$ gcc -dumpversion
5

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15773

diff --git a/configure.ac b/configure.ac
index e93c882b86a00989e9383784964f473e7a5a9e4d..d621dcaf0739af55dc2eb3dc141139ed49ebdbb7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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]]*)

diff --git a/drd/tests/std_thread.cpp b/drd/tests/std_thread.cpp
index 9275c3abfc7ffd294f40b66e15624862ff755528..6af7455b5b3104c5e266bc5beefee8e23538738f 100644 (file)
--- a/drd/tests/std_thread.cpp
+++ b/drd/tests/std_thread.cpp
@@ -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

diff --git a/drd/tests/std_thread2.cpp b/drd/tests/std_thread2.cpp
index 9861c618f159066e482f909f8e4d646c74981a6c..7de4f9d86241d76546855dec3a872ed9d879e00a 100644 (file)
--- a/drd/tests/std_thread2.cpp
+++ b/drd/tests/std_thread2.cpp
@@ -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