rpms/valgrind/F-10 valgrind-3.3.0-glibc29.patch, NONE, 1.1 valgrind.spec, 1.57, 1.58
Jakub Jelinek
jakub at fedoraproject.org
Fri Nov 14 19:34:56 UTC 2008
Author: jakub
Update of /cvs/pkgs/rpms/valgrind/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5144
Modified Files:
valgrind.spec
Added Files:
valgrind-3.3.0-glibc29.patch
Log Message:
valgrind-3.3.0-4
valgrind-3.3.0-glibc29.patch:
--- NEW FILE valgrind-3.3.0-glibc29.patch ---
--- valgrind-3.3.0/configure.in.jj 2008-11-14 06:51:43.000000000 -0500
+++ valgrind-3.3.0/configure.in 2008-11-14 06:53:04.664658000 -0500
@@ -481,6 +481,16 @@ AC_EGREP_CPP([GLIBC_28], [
],
libc="2.8")
+AC_EGREP_CPP([GLIBC_29], [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 9)
+ GLIBC_29
+ #endif
+#endif
+],
+libc="2.9")
+
AC_EGREP_CPP([AIX5_LIBC], [
#include <standards.h>
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
@@ -537,6 +547,12 @@ case "${libc}" in
DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
;;
+ 2.9)
+ AC_MSG_RESULT(2.9 family)
+ AC_DEFINE([GLIBC_2_9], 1, [Define to 1 if you're using glibc 2.9.x])
+ DEFAULT_SUPP="glibc-2.9.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])
@@ -545,7 +561,7 @@ case "${libc}" in
*)
AC_MSG_RESULT(unsupported version)
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.8])
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.9])
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 libc])
;;
esac
--- valgrind-3.3.0/glibc-2.34567-NPTL-helgrind.supp.jj 2008-11-14 06:51:43.000000000 -0500
+++ valgrind-3.3.0/glibc-2.34567-NPTL-helgrind.supp 2008-11-14 06:55:02.935064000 -0500
@@ -6,7 +6,7 @@
######------------ glibc-2.5 specific ------------######
#
## NB. This is the "reference set". Derived sets for
-## glibc 2.8, 2.7, 2.6, 2.4 and 2.3 follow below.
+## glibc 2.9, 2.8, 2.7, 2.6, 2.4 and 2.3 follow below.
{
helgrind-glibc25-001
Helgrind:Race
@@ -145,6 +145,65 @@
fun:start_thread
}
+######------------ glibc-2.9 specific ---------######
+#
+{
+ helgrind-glibc29-001
+ Helgrind:Race
+ obj:/lib*/ld-2.9.*so
+ obj:/lib*/ld-2.9.*so
+}
+{
+ helgrind-glibc29-003
+ Helgrind:Race
+ obj:/lib*/ld-2.9.*so
+ obj:/lib*/libc-2.9.*so
+ obj:/lib*/libc-2.9.*so
+}
+{
+ helgrind-glibc29-004
+ Helgrind:Race
+ obj:/lib*/libc-2.9.*so
+ obj:/lib*/libc-2.9.*so
+}
+{
+ helgrind-glibc29-005
+ Helgrind:Race
+ obj:/lib*/libpthread-2.9.*so
+ obj:/lib*/libpthread-2.9.*so
+ obj:/lib*/libpthread-2.9.*so
+}
+{
+ helgrind-glibc29-011
+ Helgrind:Race
+ obj:/lib*/libc-2.9.*so
+ obj:/lib*/libpthread-2.9.*so
+}
+
+{
+ helgrind-glibc29-101
+ Helgrind:Race
+ obj:/lib*/libpthread-2.9.*so
+ fun:pthread_*
+}
+{
+ helgrind-glibc29-102
+ Helgrind:Race
+ fun:mythread_wrapper
+ obj:/lib*/libpthread-2.9.*so
+}
+{
+ helgrind-glibc29-107
+ Helgrind:Race
+ obj:/lib*/libpthread-2.9.*so
+ fun:sem_*
+}
+{
+ helgrind-glibc29-199
+ Helgrind:Race
+ fun:pthread_barrier_wait
+}
+
######------------ glibc-2.8 specific ---------######
#
{
@@ -198,11 +257,6 @@
obj:/lib*/libpthread-2.8.*so
fun:sem_*
}
-{
- helgrind-glibc28-199
- Helgrind:Race
- fun:pthread_barrier_wait
-}
######------------ glibc-2.7 specific ---------######
#
--- valgrind-3.3.0/glibc-2.9.supp.jj 2008-11-14 06:55:20.412817000 -0500
+++ valgrind-3.3.0/glibc-2.9.supp 2008-11-14 06:55:33.029105000 -0500
@@ -0,0 +1,37 @@
+
+# Errors to suppress by default with glibc 2.9.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-hack1
+ Memcheck:Cond
+ fun:_dl_start
+ fun:_start
+}
+
+{
+ dl-hack3-1
+ Memcheck:Cond
+ obj:/lib*/ld-2.9*.so*
+ obj:/lib*/ld-2.9*.so*
+ obj:/lib*/ld-2.9*.so*
+}
--- valgrind-3.3.0/configure.jj 2008-11-14 06:51:43.000000000 -0500
+++ valgrind-3.3.0/configure 2008-11-14 06:59:26.356352000 -0500
@@ -4283,6 +4283,7 @@ echo $ECHO_N "checking for a supported C
+
case "$VG_ARCH-$VG_OS" in
x86-linux)
VG_PLATFORM_PRI="X86_LINUX"
@@ -4646,6 +4647,28 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 9)
+ GLIBC_29
+ #endif
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "GLIBC_29" >/dev/null 2>&1; then
+ libc="2.9"
+fi
+rm -f conftest*
+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#include <standards.h>
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
AIX5_LIBC
@@ -4743,6 +4766,17 @@ _ACEOF
DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
;;
+ 2.9)
+ echo "$as_me:$LINENO: result: 2.9 family" >&5
+echo "${ECHO_T}2.9 family" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define GLIBC_2_9 1
+_ACEOF
+
+ DEFAULT_SUPP="glibc-2.9.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ ;;
aix5)
echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5
echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6
@@ -4757,8 +4791,8 @@ _ACEOF
*)
echo "$as_me:$LINENO: result: unsupported version" >&5
echo "${ECHO_T}unsupported version" >&6
- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.8" >&5
-echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.8" >&2;}
+ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.9" >&5
+echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.9" >&2;}
{ (exit 1); exit 1; }; }
{ { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 libc" >&5
echo "$as_me: error: or AIX 5.1 or 5.2 or 5.3 libc" >&2;}
Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-10/valgrind.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- valgrind.spec 16 Apr 2008 15:03:58 -0000 1.57
+++ valgrind.spec 14 Nov 2008 19:34:24 -0000 1.58
@@ -1,7 +1,7 @@
Summary: Tool for finding memory management bugs in programs
Name: valgrind
Version: 3.3.0
-Release: 3
+Release: 4
Epoch: 1
Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
Patch1: valgrind-3.3.0-cachegrind-improvements.patch
@@ -13,6 +13,7 @@
Patch7: valgrind-3.3.0-glibc28.patch
Patch8: valgrind-3.3.0-syscalls1.patch
Patch9: valgrind-3.3.0-syscalls2.patch
+Patch10: valgrind-3.3.0-glibc29.patch
License: GPLv2
URL: http://www.valgrind.org/
Group: Development/Debuggers
@@ -22,7 +23,7 @@
# Ensure glibc{,-devel} is installed for both multilib arches
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
%endif
-BuildRequires: glibc-devel >= 2.8
+BuildRequires: glibc-devel >= 2.9
ExclusiveArch: %{ix86} x86_64 ppc ppc64
%ifarch %{ix86}
%define valarch x86
@@ -75,6 +76,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
%ifarch x86_64 ppc64
@@ -89,7 +91,7 @@
# Force a specific set of default suppressions
echo -n > default.supp
-for file in xfree-4.supp glibc-2.34567-NPTL-helgrind.supp glibc-2.8.supp; do
+for file in xfree-4.supp glibc-2.34567-NPTL-helgrind.supp glibc-2.9.supp; do
cat $file >> default.supp
done
@@ -170,6 +172,9 @@
%{_libdir}/pkgconfig/*
%changelog
+* Fri Nov 16 2008 Jakub Jelinek <jakub at redhat.com> 3.3.0-4
+- add suppressions for glibc 2.9
+
* Wed Apr 16 2008 Jakub Jelinek <jakub at redhat.com> 3.3.0-3
- add suppressions for glibc 2.8
- add a bunch of syscall wrappers (#441709)
More information about the scm-commits
mailing list