Handle gcc version 5.x.y.

Recognize the future versions of gcc will be called 5.x.y.
Ignore line directives in glibc version configure test (newer
gcc/cpp will mark system macros with an extra line comment).

Patch from  Dmitry Djachenko (dimhen@gmail.com). Fixes #338932.

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

diff --git a/NEWS b/NEWS
index 440529972f5b7f857a45b6ddbf208e47ac1f4af0..d467258932a25d3e0444e5dabb706ffca8b8f887 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 336445cb21541cced0c8845260123d8bdf9093f9..8e16bdaf3a72690e2a485d949b429cddca70d9e3 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