Add configure-time support for glibc 2.8. I know Dirk's solution for

the trunk is cleaner (see r7915) but this is a stable branch and
probably the end of the line for the 3.3 branch, so just do the
obvious thing.

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8150

diff --git a/Makefile.am b/Makefile.am
index e6d735f0b4000b0c6b11981baa3e855b54a4bafe..ccdf02729e2432722df9fd1204611f935176da79 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@ 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 aix5libc.supp xfree-3.supp xfree-4.supp \
+       glibc-2.6.supp glibc-2.7.supp glibc-2.8.supp \
+       aix5libc.supp xfree-3.supp xfree-4.supp \
        glibc-2.34567-NPTL-helgrind.supp \
        glibc-2.2-LinuxThreads-helgrind.supp \
        glibc-2.X-drd.supp

diff --git a/configure.in b/configure.in
index 790420a736a712930d98cc114f6dfae707a58279..0962afb720271be6d2fb339044aed8b395dec493 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -469,6 +469,16 @@ AC_EGREP_CPP([GLIBC_27], [
 ],
 libc="2.7")
 
+AC_EGREP_CPP([GLIBC_28], [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 8)
+  GLIBC_28
+ #endif
+#endif
+],
+libc="2.8")
+
 AC_EGREP_CPP([AIX5_LIBC], [
 #include <standards.h>
 #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
@@ -519,6 +529,12 @@ case "${libc}" in
        DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}"
        DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
        ;;
+     2.8)
+       AC_MSG_RESULT(2.8 family)
+       AC_DEFINE([GLIBC_2_8], 1, [Define to 1 if you're using glibc 2.8.x])
+       DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
+       DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+       ;;
      aix5)
        AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
        AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])

diff --git a/glibc-2.8.supp b/glibc-2.8.supp
new file mode 100644 (file)
index 0000000..3cbd9d9
--- /dev/null
+++ b/glibc-2.8.supp
@@ -0,0 +1,30 @@
+
+# Errors to suppress by default with glibc 2.8.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.8*.so*
+   obj:/lib*/ld-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
+}