Merge r14507 from trunk (Handle gcc version 5.x.y.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14511

diff --git a/NEWS b/NEWS
index 6f637e64e0de4094768fe6b368ff548cd4630af8..d315e5bee0935f0b39c22669971c6c4216611e87 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -327,6 +327,7 @@ where XXXXXX is the bug number as listed below.
 338703  helgrind on arm-linux gets false positives in dynamic loader
 338791  alt dwz files can be relative of debug/main file
 338878  on MacOS: assertion 'VG_IS_PAGE_ALIGNED(clstack_end+1)' failed
+338932  build V-trunk with gcc-trunk
 n-i-bz  Fix KVM_CREATE_IRQCHIP ioctl handling
 n-i-bz  s390x: Fix memory corruption for multithreaded applications
 n-i-bz  vex arm->IR: allow PC as basereg in some LDRD cases

diff --git a/configure.ac b/configure.ac
index 429aa05ef1fe34c5224cf2d462c6eb9f6132cc49..542dbe8cb9c3dd13d49843c8f0bb662ff6a0dd19 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,9 @@ case "${is_clang}-${gcc_version}" in
      notclang-4.*)
        AC_MSG_RESULT([ok (${gcc_version})])
        ;;
+     notclang-5.*)
+       AC_MSG_RESULT([ok (${gcc_version})])
+       ;;
      clang-2.9|clang-3.*|clang-4.*)
        AC_MSG_RESULT([ok (clang-${gcc_version})])
        ;;
@@ -855,7 +858,7 @@ if test x$ac_cv_header_features_h = xyes; then
 glibc version is: __GLIBC__ __GLIBC_MINOR__
 #endif
 _ACEOF
-  GLIBC_VERSION="`$CPP conftest.$ac_ext | $SED -n 's/^glibc version is: //p' | $SED 's/ /./g'`"
+  GLIBC_VERSION="`$CPP -P conftest.$ac_ext | $SED -n 's/^glibc version is: //p' | $SED 's/ /./g'`"
 fi
 
 # not really a version check