|
From: <sv...@va...> - 2005-06-30 04:06:41
|
Author: njn
Date: 2005-06-30 05:06:38 +0100 (Thu, 30 Jun 2005)
New Revision: 4063
Log:
Allow for glibc-2.4.
Added:
trunk/glibc-2.4.supp
Modified:
trunk/Makefile.am
trunk/configure.in
trunk/memcheck/tests/x86/scalar.c
Modified: trunk/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.am 2005-06-30 03:44:55 UTC (rev 4062)
+++ trunk/Makefile.am 2005-06-30 04:06:38 UTC (rev 4063)
@@ -21,7 +21,7 @@
DIST_SUBDIRS =3D $(SUBDIRS) addrcheck
=20
SUPP_FILES =3D \
- glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp \
+ glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp \
xfree-3.supp xfree-4.supp
=20
dist_val_DATA =3D $(SUPP_FILES) default.supp
Modified: trunk/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/configure.in 2005-06-30 03:44:55 UTC (rev 4062)
+++ trunk/configure.in 2005-06-30 04:06:38 UTC (rev 4063)
@@ -265,6 +265,16 @@
],
glibc=3D"2.3")
=20
+AC_EGREP_CPP([GLIBC_24], [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ =3D=3D 2 && __GLIBC_MINOR__ =3D=3D 4)
+ GLIBC_24
+ #endif
+#endif
+],
+glibc=3D"2.4")
+
AC_MSG_CHECKING([the glibc version])
=20
case "${glibc}" in
@@ -286,9 +296,15 @@
DEFAULT_SUPP=3D"${DEFAULT_SUPP} glibc-2.3.supp"
;;
=20
+ 2.4)
+ AC_MSG_RESULT(2.4 family)
+ AC_DEFINE([GLIBC_2_4], 1, [Define to 1 if you're using glibc 2.4.x])
+ DEFAULT_SUPP=3D"${DEFAULT_SUPP} glibc-2.4.supp"
+ ;;
+
*)
AC_MSG_RESULT(unsupported version)
- AC_MSG_ERROR([Valgrind requires the glibc version 2.1, 2.2 or 2.3])
+ AC_MSG_ERROR([Valgrind requires glibc version 2.1, 2.2, 2.3 or 2.4])
;;
esac
=20
Added: trunk/glibc-2.4.supp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/glibc-2.4.supp 2005-06-30 03:44:55 UTC (rev 4062)
+++ trunk/glibc-2.4.supp 2005-06-30 04:06:38 UTC (rev 4063)
@@ -0,0 +1,27 @@
+
+##----------------------------------------------------------------------=
##
+
+# Errors to suppress by default with glibc 2.4.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
+# Free Addr1 Addr2 Addr4 Addr8 Addr16
+# Cond (previously known as Value0)
+#
+# and the optional extra info is:
+# if Param: name of system call param
+# if Free: name of free-ing fn)
+
+# ... insert suppressions here ...
Modified: trunk/memcheck/tests/x86/scalar.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/x86/scalar.c 2005-06-30 03:44:55 UTC (rev 4062)
+++ trunk/memcheck/tests/x86/scalar.c 2005-06-30 04:06:38 UTC (rev 4063)
@@ -14,7 +14,7 @@
// PRE_MEM_READ/PRE_MEM_WRITE calls. (Note that Memcheck and Addrcheck =
will
// always issue an error message immediately before these seg faults occ=
ur).
=20
-#include <asm/ipc.h>
+//#include <asm/ipc.h>
#include <sched.h>
#include <signal.h>
=20
|