|
From: <sv...@va...> - 2008-05-29 15:42:06
|
Author: sewardj
Date: 2008-05-29 16:42:09 +0100 (Thu, 29 May 2008)
New Revision: 8150
Log:
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.
Added:
branches/VALGRIND_3_3_BRANCH/glibc-2.8.supp
Modified:
branches/VALGRIND_3_3_BRANCH/Makefile.am
branches/VALGRIND_3_3_BRANCH/configure.in
Modified: branches/VALGRIND_3_3_BRANCH/Makefile.am
===================================================================
--- branches/VALGRIND_3_3_BRANCH/Makefile.am 2008-05-29 13:45:49 UTC (rev 8149)
+++ branches/VALGRIND_3_3_BRANCH/Makefile.am 2008-05-29 15:42:09 UTC (rev 8150)
@@ -21,7 +21,8 @@
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
Modified: branches/VALGRIND_3_3_BRANCH/configure.in
===================================================================
--- branches/VALGRIND_3_3_BRANCH/configure.in 2008-05-29 13:45:49 UTC (rev 8149)
+++ branches/VALGRIND_3_3_BRANCH/configure.in 2008-05-29 15:42:09 UTC (rev 8150)
@@ -469,6 +469,16 @@
],
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 @@
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])
Added: branches/VALGRIND_3_3_BRANCH/glibc-2.8.supp
===================================================================
--- branches/VALGRIND_3_3_BRANCH/glibc-2.8.supp (rev 0)
+++ branches/VALGRIND_3_3_BRANCH/glibc-2.8.supp 2008-05-29 15:42:09 UTC (rev 8150)
@@ -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*
+}
|