From: Julian Seward <jseward@acm.org>
Date: Wed, 10 Sep 2014 20:11:34 +0000 (+0000)
Subject: Merge r14507 from trunk (Handle gcc version 5.x.y.)
X-Git-Tag: svn/VALGRIND_3_10_0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fd11337555cb385a2eccb551d179d146e7786b3;p=thirdparty%2Fvalgrind.git

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 6f637e64e0..d315e5bee0 100644
--- 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 429aa05ef1..542dbe8cb9 100644
--- 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