rpms/valgrind/devel valgrind-2.4.0-valgrind_h.patch, NONE, 1.1 valgrind-2.4.0-regtest.patch, 1.1, 1.2 valgrind.spec, 1.15, 1.16 valgrind-2.1.2-4G.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 29 22:12:11 UTC 2005
Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2644
Modified Files:
valgrind-2.4.0-regtest.patch valgrind.spec
Added Files:
valgrind-2.4.0-valgrind_h.patch
Removed Files:
valgrind-2.1.2-4G.patch
Log Message:
2.4.0-2
valgrind-2.4.0-valgrind_h.patch:
valgrind.h.in | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE valgrind-2.4.0-valgrind_h.patch ---
--- valgrind-2.4.0/include/valgrind.h.in.jj 2005-03-11 01:28:13.000000000 -0500
+++ valgrind-2.4.0/include/valgrind.h.in 2005-03-29 16:42:31.000000000 -0500
@@ -215,10 +215,11 @@ typedef
#ifndef NVALGRIND
-int VALGRIND_PRINTF(const char *format, ...)
- __attribute__((format(__printf__, 1, 2)));
-__attribute__((weak))
-int
+/* Modern GCC will optimize the static routine out if unused,
+ and unused attribute will shut down warnings about it. */
+static int VALGRIND_PRINTF(const char *format, ...)
+ __attribute__((format(__printf__, 1, 2), __unused__));
+static int
VALGRIND_PRINTF(const char *format, ...)
{
unsigned int _qzz_res;
@@ -230,10 +231,9 @@ VALGRIND_PRINTF(const char *format, ...)
return _qzz_res;
}
-int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
- __attribute__((format(__printf__, 1, 2)));
-__attribute__((weak))
-int
+static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+ __attribute__((format(__printf__, 1, 2), __unused__));
+static int
VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
{
unsigned int _qzz_res;
valgrind-2.4.0-regtest.patch:
valgrind-2.2.0/none/tests/mq.c | 3 +++
valgrind-2.2.0/tests/filter_stderr_basic | 2 ++
valgrind-2.4.0/memcheck/tests/Makefile.am | 2 +-
valgrind-2.4.0/memcheck/tests/Makefile.in | 2 +-
valgrind-2.4.0/none/tests/exec-sigmask.c | 2 +-
5 files changed, 8 insertions(+), 3 deletions(-)
Index: valgrind-2.4.0-regtest.patch
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind-2.4.0-regtest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valgrind-2.4.0-regtest.patch 28 Mar 2005 14:39:19 -0000 1.1
+++ valgrind-2.4.0-regtest.patch 29 Mar 2005 22:12:08 -0000 1.2
@@ -26,7 +26,7 @@
# Remove line info out of order warnings
sed "/warning: line info addresses out of order/d" |
---- valgrind-2.4.0/none/tests/exec-sigmask.c~ 2005-03-27 10:48:10.000000000 -0500
+--- valgrind-2.4.0/none/tests/exec-sigmask.c.jj 2005-03-27 10:48:10.000000000 -0500
+++ valgrind-2.4.0/none/tests/exec-sigmask.c 2005-03-27 10:50:20.000000000 -0500
@@ -73,7 +73,7 @@
if (sigismember(&mask, i))
@@ -37,3 +37,25 @@
printf("full: signal %d missing from mask\n", i);
}
}
+--- valgrind-2.4.0/memcheck/tests/Makefile.am.jj 2005-03-13 20:29:30.000000000 -0500
++++ valgrind-2.4.0/memcheck/tests/Makefile.am 2005-03-29 16:34:31.000000000 -0500
+@@ -114,7 +114,7 @@ check_PROGRAMS = \
+
+
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
+-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
++AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -fno-builtin
+ AM_CXXFLAGS = $(AM_CFLAGS)
+
+ # C ones
+--- valgrind-2.4.0/memcheck/tests/Makefile.in.jj 2005-03-23 21:30:41.000000000 -0500
++++ valgrind-2.4.0/memcheck/tests/Makefile.in 2005-03-29 16:37:11.000000000 -0500
+@@ -616,7 +616,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
+ zeropage.stderr.exp zeropage.stderr.exp2 zeropage.vgtest
+
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
+-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
++AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -fno-builtin
+ AM_CXXFLAGS = $(AM_CFLAGS)
+
+ # C ones
Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- valgrind.spec 28 Mar 2005 14:36:03 -0000 1.15
+++ valgrind.spec 29 Mar 2005 22:12:08 -0000 1.16
@@ -1,11 +1,11 @@
Summary: Tool for finding memory management bugs in programs
Name: valgrind
Version: 2.4.0
-Release: 1
+Release: 2
Epoch: 1
Source0: http://developer.kde.org/~sewardj/valgrind-%{version}.tar.bz2
Patch1: valgrind-2.4.0-regtest.patch
-Patch2: valgrind-2.1.2-4G.patch
+Patch2: valgrind-2.4.0-valgrind_h.patch
License: GPL
URL: http://valgrind.kde.org/
Group: Development/Debuggers
@@ -32,7 +32,7 @@
%prep
%setup -q
%patch1 -p1
-#%patch2 -p1
+%patch2 -p1
%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
find_provides=`rpm --eval %%{__find_provides}`
@@ -100,6 +100,11 @@
%{_mandir}/man1/valgrind*
%changelog
+* Wed Mar 30 2005 Colin Walters <walters at redhat.com> 2.4.0-2
+- resurrect the non-upstreamed part of valgrind_h patch
+- remove 2.1.2-4G patch, seems to be upstreamed
+- resurrect passing -fno-builtin in memcheck tests
+
* Sun Mar 27 2005 Colin Walters <walters at redhat.com> 2.4.0-1
- New upstream version
- Update valgrind-2.2.0-regtest.patch to 2.4.0; required minor
--- valgrind-2.1.2-4G.patch DELETED ---
More information about the fedora-cvs-commits
mailing list