commit ef3ac601dfcd45b2e27bd09b84e85607ebd5183f

Author: bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9>

Date:   Mon Jan 25 04:27:25 2016 +0000

    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 a5019735-40e9-0310-863c-91ae7b9d1cf9

diff --git a/configure.ac b/configure.ac

index e93c882..d621dca 100644

--- 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 9275c3a..6af7455 100644

--- 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 9861c61..7de4f9d 100644

--- 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

--- valgrind-3.11.0.orig/configure	2016-01-25 21:16:13.019563625 +0100

+++ valgrind-3.11.0/configure	2016-01-25 21:17:31.120337140 +0100

@@ -5453,7 +5453,7 @@

 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (ICC version ${gcc_version})" >&5

 $as_echo "ok (ICC version ${gcc_version})" >&6; }

 	;;

-     notclang-[3-9].*|notclang-[1-9][0-9]*)

+     notclang-[3-9]|notclang-[3-9].*|notclang-[1-9][0-9]*)

 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${gcc_version})" >&5

 $as_echo "ok (${gcc_version})" >&6; }

 	;;