From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Mon, 26 Nov 2007 15:15:40 +0000 (+0000)
Subject: backport minimal glibc 2.7 support
X-Git-Tag: svn/VALGRIND_3_2_3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e64e85bedf9ec46353d0960a3b83bd2065612704;p=thirdparty%2Fvalgrind.git

backport minimal glibc 2.7 support


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@7227
---

diff --git a/Makefile.am b/Makefile.am
index e1a0667d42..a6e4e724f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ DIST_SUBDIRS  = $(SUBDIRS)
 
 SUPP_FILES = \
 	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
+	glibc-2.6.supp glibc-2.7.supp \
 	xfree-3.supp xfree-4.supp
 
 dist_val_DATA = $(SUPP_FILES) default.supp
diff --git a/configure.in b/configure.in
index 2ffc46515c..e62e305fbf 100644
--- a/configure.in
+++ b/configure.in
@@ -369,6 +369,16 @@ AC_EGREP_CPP([GLIBC_26], [
 ],
 glibc="2.6")
 
+AC_EGREP_CPP([GLIBC_27], [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 7)
+  GLIBC_27
+ #endif
+#endif
+],
+glibc="2.7")
+
 AC_MSG_CHECKING([the glibc version])
 
 case "${glibc}" in
@@ -401,10 +411,15 @@ case "${glibc}" in
 	AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
 	DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
 	;;
-
+     2.7)
+        AC_MSG_RESULT(2.7 family)
+        AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x])
+        DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+       ;;
      *)
 	AC_MSG_RESULT(unsupported version)
-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7])
 	;;
 esac
 
diff --git a/glibc-2.7.supp b/glibc-2.7.supp
new file mode 100644
index 0000000000..1079dcfb88
--- /dev/null
+++ b/glibc-2.7.supp
@@ -0,0 +1,30 @@
+
+# Errors to suppress by default with glibc 2.7.x
+
+# Format of this file is:
+# {
+#     name_of_suppression
+#     tool_name:supp_kind
+#     (optional extra info for some suppression types)
+#     caller0 name, or /name/of/so/file.so
+#     caller1 name, or ditto
+#     (optionally: caller2 name)
+#     (optionally: caller3 name)
+#  }
+#
+# For Memcheck, the supp_kinds are:
+#
+#     Param Value1 Value2 Value4 Value8 Value16 Jump
+#     Free Addr1 Addr2 Addr4 Addr8 Addr16
+#     Cond (previously known as Value0)
+#
+# and the optional extra info is:
+#     if Param: name of system call param
+
+{
+   dl-hack3-1
+   Memcheck:Cond
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+}