[valgrind] Update to 3.8.0-TEST1

Mark Wielaard mjw at fedoraproject.org
Tue Aug 7 22:37:29 UTC 2012


commit f4ddfbdeaaad9d16789c984b629ed906801eda41
Author: Mark Wielaard <mjw at redhat.com>
Date:   Wed Aug 8 00:24:14 2012 +0200

    Update to 3.8.0-TEST1

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 valgrind-3.7.0-debug-leak2.patch                   |   22 -
 valgrind-3.7.0-debug-types.patch                   | 1209 --------------------
 valgrind-3.7.0-dwz.patch                           |  909 ---------------
 valgrind-3.7.0-f-sgetown-ex.patch                  |  180 ---
 valgrind-3.7.0-glibc-2.15.patch                    |   65 --
 valgrind-3.7.0-glibc-2.16.patch                    |   57 -
 valgrind-3.7.0-ref_addr.patch                      |   29 -
 valgrind-3.7.0-rvalue-ref.patch                    |  201 ----
 valgrind-3.7.0-scsi-ioctls.patch                   |   72 --
 valgrind-3.7.0-tests.patch                         |   60 -
 valgrind-3.7.0-unspecified-type.patch              |   24 -
 ...=> valgrind-3.8.0-cachegrind-improvements.patch |    4 +-
 ...7.0-capget.patch => valgrind-3.8.0-capget.patch |    2 +-
 ...config_h.patch => valgrind-3.8.0-config_h.patch |    2 +-
 ...rmv5.patch => valgrind-3.8.0-enable-armv5.patch |    4 +-
 ...atch => valgrind-3.8.0-helgrind-race-supp.patch |    2 +-
 ...so-supp.patch => valgrind-3.8.0-ldso-supp.patch |    0
 ...7.0-openat.patch => valgrind-3.8.0-openat.patch |    6 +-
 ...ind-3.7.0-pie.patch => valgrind-3.8.0-pie.patch |    0
 ...7.0-stat_h.patch => valgrind-3.8.0-stat_h.patch |    8 +-
 valgrind-3.8.0-tests.patch                         |   48 +
 valgrind.spec                                      |   57 +-
 24 files changed, 83 insertions(+), 2881 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a00336e..5ee4a67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /valgrind-3.7.0.tar.bz2
+/valgrind-3.8.0-TEST1.tar.bz2
diff --git a/sources b/sources
index 518c77d..fc41671 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a855fda56edf05614f099dca316d1775  valgrind-3.7.0.tar.bz2
+7f757e3e8fc47c5ea2766385bfacdf7e  valgrind-3.8.0-TEST1.tar.bz2
diff --git a/valgrind-3.7.0-cachegrind-improvements.patch b/valgrind-3.8.0-cachegrind-improvements.patch
similarity index 93%
rename from valgrind-3.7.0-cachegrind-improvements.patch
rename to valgrind-3.8.0-cachegrind-improvements.patch
index 71b73d0..b74af5c 100644
--- a/valgrind-3.7.0-cachegrind-improvements.patch
+++ b/valgrind-3.8.0-cachegrind-improvements.patch
@@ -1,5 +1,5 @@
---- valgrind-3.7.0/cachegrind/cg_sim.c.jj	2011-10-26 23:24:32.000000000 +0200
-+++ valgrind-3.7.0/cachegrind/cg_sim.c	2011-12-09 17:31:19.256023683 +0100
+--- valgrind-3.8.0/cachegrind/cg_sim.c.jj	2011-10-26 23:24:32.000000000 +0200
++++ valgrind-3.8.0/cachegrind/cg_sim.c	2011-12-09 17:31:19.256023683 +0100
 @@ -42,27 +42,30 @@ typedef struct {
     Int          size;                   /* bytes */
     Int          assoc;
diff --git a/valgrind-3.7.0-capget.patch b/valgrind-3.8.0-capget.patch
similarity index 94%
rename from valgrind-3.7.0-capget.patch
rename to valgrind-3.8.0-capget.patch
index 727defa..562cdec 100644
--- a/valgrind-3.7.0-capget.patch
+++ b/valgrind-3.8.0-capget.patch
@@ -1,6 +1,6 @@
 --- valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c.jj	2010-04-07 08:14:12.000000000 -0400
 +++ valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c	2010-04-12 07:24:12.838876000 -0400
-@@ -1955,8 +1955,9 @@ PRE(sys_capget)
+@@ -2212,8 +2212,9 @@ PRE(sys_capget)
                   vki_cap_user_header_t, header, vki_cap_user_data_t, data);
     PRE_MEM_READ( "capget(header)", ARG1, 
                    sizeof(struct __vki_user_cap_header_struct) );
diff --git a/valgrind-3.7.0-config_h.patch b/valgrind-3.8.0-config_h.patch
similarity index 86%
rename from valgrind-3.7.0-config_h.patch
rename to valgrind-3.8.0-config_h.patch
index 3833da3..47a498f 100644
--- a/valgrind-3.7.0-config_h.patch
+++ b/valgrind-3.8.0-config_h.patch
@@ -1,6 +1,6 @@
 --- valgrind/include/pub_tool_basics.h.jj	2011-10-26 23:24:32.000000000 +0200
 +++ valgrind/include/pub_tool_basics.h	2011-12-09 17:42:50.828630546 +0100
-@@ -290,7 +290,7 @@ static inline Bool sr_EQ ( SysRes sr1, S
+@@ -297,7 +297,7 @@ static inline Bool sr_EQ ( SysRes sr1, S
  #define VG_BUGS_TO "www.valgrind.org"
  
  /* Branch prediction hints. */
diff --git a/valgrind-3.7.0-enable-armv5.patch b/valgrind-3.8.0-enable-armv5.patch
similarity index 90%
rename from valgrind-3.7.0-enable-armv5.patch
rename to valgrind-3.8.0-enable-armv5.patch
index 4d05cb8..9f9a66f 100644
--- a/valgrind-3.7.0-enable-armv5.patch
+++ b/valgrind-3.8.0-enable-armv5.patch
@@ -1,6 +1,6 @@
 --- valgrind-3.7.0.old/configure.in	2012-03-05 15:16:23.000000000 -0500
 +++ valgrind-3.7.0/configure.in	2012-03-05 13:49:04.000000000 -0500
-@@ -175,7 +175,7 @@ case "${host_cpu}" in
+@@ -186,7 +186,7 @@ case "${host_cpu}" in
          ARCH_MAX="s390x"
          ;;
  
@@ -11,7 +11,7 @@
  	;;
 --- valgrind-3.7.0.old/configure	2012-03-05 15:16:23.000000000 -0500
 +++ valgrind-3.7.0/configure	2012-03-05 13:49:04.000000000 -0500
-@@ -5279,7 +5279,7 @@
+@@ -5335,7 +5335,7 @@
          ARCH_MAX="s390x"
          ;;
  
diff --git a/valgrind-3.7.0-helgrind-race-supp.patch b/valgrind-3.8.0-helgrind-race-supp.patch
similarity index 91%
rename from valgrind-3.7.0-helgrind-race-supp.patch
rename to valgrind-3.8.0-helgrind-race-supp.patch
index 2fe5e07..759d151 100644
--- a/valgrind-3.7.0-helgrind-race-supp.patch
+++ b/valgrind-3.8.0-helgrind-race-supp.patch
@@ -1,7 +1,7 @@
 --- valgrind/glibc-2.34567-NPTL-helgrind.supp.jj	2009-08-19 15:37:48.000000000 +0200
 +++ valgrind/glibc-2.34567-NPTL-helgrind.supp	2009-10-21 16:46:31.000000000 +0200
 @@ -88,6 +88,12 @@
-    obj:/lib*/libpthread-2.*so*
+    obj:*/lib*/libpthread-2.*so*
  }
  {
 +   helgrind-glibc2X-102a
diff --git a/valgrind-3.7.0-ldso-supp.patch b/valgrind-3.8.0-ldso-supp.patch
similarity index 100%
rename from valgrind-3.7.0-ldso-supp.patch
rename to valgrind-3.8.0-ldso-supp.patch
diff --git a/valgrind-3.7.0-openat.patch b/valgrind-3.8.0-openat.patch
similarity index 87%
rename from valgrind-3.7.0-openat.patch
rename to valgrind-3.8.0-openat.patch
index 26070ef..87a4098 100644
--- a/valgrind-3.7.0-openat.patch
+++ b/valgrind-3.8.0-openat.patch
@@ -15,9 +15,9 @@ main (void)
   return 0;
 }
 
---- valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c.jj	2007-12-11 00:18:43.000000000 +0100
-+++ valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c	2008-03-03 11:35:15.000000000 +0100
-@@ -2455,10 +2455,15 @@ PRE(sys_openat)
+--- valgrind-3.8.0/coregrind/m_syswrap/syswrap-linux.c.jj	2007-12-11 00:18:43.000000000 +0100
++++ valgrind-3.8.0/coregrind/m_syswrap/syswrap-linux.c	2008-03-03 11:35:15.000000000 +0100
+@@ -3308,10 +3308,15 @@ PRE(sys_openat)
                      int, dfd, const char *, filename, int, flags);
     }
  
diff --git a/valgrind-3.7.0-pie.patch b/valgrind-3.8.0-pie.patch
similarity index 100%
rename from valgrind-3.7.0-pie.patch
rename to valgrind-3.8.0-pie.patch
diff --git a/valgrind-3.7.0-stat_h.patch b/valgrind-3.8.0-stat_h.patch
similarity index 90%
rename from valgrind-3.7.0-stat_h.patch
rename to valgrind-3.8.0-stat_h.patch
index 2b9304e..628dd79 100644
--- a/valgrind-3.7.0-stat_h.patch
+++ b/valgrind-3.8.0-stat_h.patch
@@ -1,6 +1,6 @@
 --- valgrind/include/vki/vki-amd64-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
 +++ valgrind/include/vki/vki-amd64-linux.h	2010-01-20 04:41:52.662552000 -0500
-@@ -310,6 +310,9 @@ struct vki_stat {
+@@ -328,6 +328,9 @@ struct vki_stat {
  	long		st_blksize;
  	long		st_blocks;	/* Number 512-byte blocks allocated. */
  
@@ -12,7 +12,7 @@
  	unsigned long	st_mtime;
 --- valgrind/include/vki/vki-x86-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
 +++ valgrind/include/vki/vki-x86-linux.h	2010-01-20 04:42:19.649995000 -0500
-@@ -348,6 +348,9 @@ struct vki_stat {
+@@ -366,6 +366,9 @@ struct vki_stat {
  	unsigned long  st_size;
  	unsigned long  st_blksize;
  	unsigned long  st_blocks;
@@ -24,7 +24,7 @@
  	unsigned long  st_mtime;
 --- valgrind/include/vki/vki-ppc32-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
 +++ valgrind/include/vki/vki-ppc32-linux.h	2010-01-20 04:42:44.861651000 -0500
-@@ -392,6 +392,9 @@ struct vki_stat {
+@@ -410,6 +410,9 @@ struct vki_stat {
     long			st_size;
     unsigned long	st_blksize;
     unsigned long	st_blocks;
@@ -36,7 +36,7 @@
     unsigned long	st_mtime;
 --- valgrind/include/vki/vki-ppc64-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
 +++ valgrind/include/vki/vki-ppc64-linux.h	2010-01-20 04:43:05.579922000 -0500
-@@ -428,6 +428,9 @@ struct vki_stat {
+@@ -446,6 +446,9 @@ struct vki_stat {
    long            st_size;
    unsigned long   st_blksize;
    unsigned long   st_blocks;
diff --git a/valgrind-3.8.0-tests.patch b/valgrind-3.8.0-tests.patch
new file mode 100644
index 0000000..f94b73f
--- /dev/null
+++ b/valgrind-3.8.0-tests.patch
@@ -0,0 +1,48 @@
+Disable some hanging tests.
+
+--- valgrind-3.8.0/helgrind/tests/Makefile.am.jj	2011-10-26 23:24:25.000000000 +0200
++++ valgrind-3.8.0/helgrind/tests/Makefile.am	2012-01-27 15:01:58.955624195 +0100
+@@ -96,7 +96,6 @@ EXTRA_DIST = \
+ # XXX: tc18_semabuse uses operations that are unsupported on Darwin.  It
+ # should be conditionally compiled like tc20_verifywrap is.
+ check_PROGRAMS = \
+-	annotate_hbefore \
+ 	cond_timedwait_invalid \
+ 	free_is_write \
+ 	hg01_all_ok \
+--- valgrind-3.8.0/helgrind/tests/Makefile.in.jj	2011-11-05 12:26:51.000000000 +0100
++++ valgrind-3.8.0/helgrind/tests/Makefile.in	2012-01-27 15:02:40.285383038 +0100
+@@ -54,8 +54,7 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE at am__append_2 = -DVGA_SEC_ at VGCONF_ARCH_SEC@=1  \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@		-DVGP_SEC_ at VGCONF_ARCH_PRI@_ at VGCONF_OS@=1
+ 
+-check_PROGRAMS = annotate_hbefore$(EXEEXT) \
+-	cond_timedwait_invalid$(EXEEXT) free_is_write$(EXEEXT) \
++check_PROGRAMS = cond_timedwait_invalid$(EXEEXT) free_is_write$(EXEEXT) \
+ 	hg01_all_ok$(EXEEXT) hg02_deadlock$(EXEEXT) \
+ 	hg03_inherit$(EXEEXT) hg04_race$(EXEEXT) hg05_race2$(EXEEXT) \
+ 	hg06_readshared$(EXEEXT) locked_vs_unlocked1$(EXEEXT) \
+--- valgrind-3.8.0/gdbserver_tests/Makefile.am.jj	2011-10-26 23:24:26.000000000 +0200
++++ valgrind-3.8.0/gdbserver_tests/Makefile.am	2012-01-27 14:56:43.369465872 +0100
+@@ -106,9 +106,7 @@ check_PROGRAMS = \
+ 	clean_after_fork \
+ 	fork_chain \
+ 	passsigalrm \
+-	sleepers \
+ 	main_pic \
+-	t \
+ 	watchpoints
+ 
+ AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
+--- valgrind-3.8.0/gdbserver_tests/Makefile.in.jj	2011-11-05 12:26:51.000000000 +0100
++++ valgrind-3.8.0/gdbserver_tests/Makefile.in	2012-01-27 14:57:30.278191493 +0100
+@@ -55,8 +55,7 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@		-DVGP_SEC_ at VGCONF_ARCH_PRI@_ at VGCONF_OS@=1
+ 
+ check_PROGRAMS = clean_after_fork$(EXEEXT) fork_chain$(EXEEXT) \
+-	passsigalrm$(EXEEXT) sleepers$(EXEEXT) main_pic$(EXEEXT) \
+-	t$(EXEEXT) watchpoints$(EXEEXT)
++	passsigalrm$(EXEEXT) main_pic$(EXEEXT) watchpoints$(EXEEXT)
+ subdir = gdbserver_tests
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
diff --git a/valgrind.spec b/valgrind.spec
index f84b631..3d12ce1 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,35 +1,24 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
-Version: 3.7.0
-Release: 7%{?dist}
+Version: 3.8.0
+Release: 0.1.TEST1.svn12858%{?dist}
 Epoch: 1
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
 
-Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Patch1: valgrind-3.7.0-cachegrind-improvements.patch
-Patch2: valgrind-3.7.0-openat.patch
-Patch3: valgrind-3.7.0-helgrind-race-supp.patch
-Patch4: valgrind-3.7.0-stat_h.patch
-Patch5: valgrind-3.7.0-config_h.patch
-Patch6: valgrind-3.7.0-capget.patch
-Patch7: valgrind-3.7.0-glibc-2.15.patch
-Patch8: valgrind-3.7.0-pie.patch
-Patch9: valgrind-3.7.0-tests.patch
-Patch10: valgrind-3.7.0-f-sgetown-ex.patch
-Patch11: valgrind-3.7.0-scsi-ioctls.patch
-Patch12: valgrind-3.7.0-enable-armv5.patch
-Patch13: valgrind-3.7.0-ldso-supp.patch
-Patch14: valgrind-3.7.0-unspecified-type.patch
-Patch15: valgrind-3.7.0-rvalue-ref.patch
-Patch16: valgrind-3.7.0-debug-leak1.patch
-Patch17: valgrind-3.7.0-debug-leak2.patch
-Patch18: valgrind-3.7.0-addToXA.patch
-Patch19: valgrind-3.7.0-debug-types.patch
-Patch20: valgrind-3.7.0-dwz.patch
-Patch21: valgrind-3.7.0-glibc-2.16.patch
-Patch22: valgrind-3.7.0-ref_addr.patch
+#Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
+Source0: valgrind-%{version}-TEST1.tar.bz2
+Patch1: valgrind-3.8.0-cachegrind-improvements.patch
+Patch2: valgrind-3.8.0-openat.patch
+Patch3: valgrind-3.8.0-helgrind-race-supp.patch
+Patch4: valgrind-3.8.0-stat_h.patch
+Patch5: valgrind-3.8.0-config_h.patch
+Patch6: valgrind-3.8.0-capget.patch
+Patch7: valgrind-3.8.0-pie.patch
+Patch8: valgrind-3.8.0-tests.patch
+Patch9: valgrind-3.8.0-enable-armv5.patch
+Patch10: valgrind-3.8.0-ldso-supp.patch
 
 Obsoletes: valgrind-callgrind
 %ifarch x86_64 ppc64
@@ -119,19 +108,6 @@ for details.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-touch memcheck/tests/dw4.stdout.exp
 
 %build
 CC=gcc
@@ -225,6 +201,11 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Tue Aug 07 2012 Mark Wielaard <mjw at redhat.com> 3.8.0-0.1.TEST1.svn12858
+- Update to 3.8.0-TEST1
+- Clear CFLAGS CXXFLAGS LDFLAGS.
+- Fix \ line continuation in configure line.
+
 * Fri Aug 03 2012 Mark Wielaard <mjw at redhat.com> 3.7.0-7
 - Fixup shadowing warnings valgrind-3.7.0-dwz.patch
 - Add valgrind-3.7.0-ref_addr.patch (#842659, KDE#298864)


More information about the scm-commits mailing list