rpms/valgrind/F-12 valgrind-3.5.0-adjtimex.patch, 1.1, 1.2 valgrind.spec, 1.77, 1.78

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544

Modified Files:
	valgrind-3.5.0-adjtimex.patch valgrind.spec 
Log Message:
3.5.0-12

valgrind-3.5.0-adjtimex.patch:
 coregrind/m_syswrap/syswrap-linux.c |   23 ++++++++++++++---------
 include/vki/vki-linux.h             |    3 +++
 2 files changed, 17 insertions(+), 9 deletions(-)

Index: valgrind-3.5.0-adjtimex.patch
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind-3.5.0-adjtimex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- valgrind-3.5.0-adjtimex.patch	21 Dec 2009 10:57:44 -0000	1.1
+++ valgrind-3.5.0-adjtimex.patch	21 Dec 2009 11:42:57 -0000	1.2
@@ -1,22 +1,49 @@
---- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-08 16:11:18.000000000 +0100
-+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-09 15:06:39.000000000 +0100
-@@ -627,7 +627,8 @@ PRE(sys_adjtimex)
-       PRE_MEM_READ( "adjtimex(timex->"#field")",	\
- 		    (Addr)&tx->field, sizeof(tx->field))
- 
--   ADJX(VKI_ADJ_OFFSET, offset);
-+   if ((tx->modes & VKI_ADJ_OFFSET_SS_READ) != VKI_ADJ_OFFSET_SS_READ)
-+      ADJX(VKI_ADJ_OFFSET, offset);
-    ADJX(VKI_ADJ_FREQUENCY, freq);
-    ADJX(VKI_ADJ_MAXERROR, maxerror);
-    ADJX(VKI_ADJ_ESTERROR, esterror);
---- valgrind-3.5.0/include/vki/vki-linux.h	2009-12-08 16:11:18.000000000 +0100
-+++ valgrind-3.5.0/include/vki/vki-linux.h	2009-12-09 15:04:20.000000000 +0100
-@@ -285,6 +285,7 @@ struct vki_timex {
+--- valgrind-3.5.0/include/vki/vki-linux.h	(revision 10968)
++++ valgrind-3.5.0/include/vki/vki-linux.h	(revision 10969)
+@@ -283,8 +283,11 @@ struct vki_timex {
+ #define VKI_ADJ_ESTERROR		0x0008	/* estimated time error */
+ #define VKI_ADJ_STATUS			0x0010	/* clock status */
  #define VKI_ADJ_TIMECONST		0x0020	/* pll time constant */
++#define VKI_ADJ_TAI			0x0080	/* set TAI offset */
  #define VKI_ADJ_TICK			0x4000	/* tick value */
++#define VKI_ADJ_ADJTIME			0x8000	/* switch between adjtime/adjtimex modes */
  //#define VKI_ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
-+#define VKI_ADJ_OFFSET_SS_READ		0xa001	/* read-only adjtime */
++#define VKI_ADJ_OFFSET_READONLY		0x2000	/* read-only adjtime */
  
  //----------------------------------------------------------------------
  // From linux-2.6.8.1/include/linux/times.h
+--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	(revision 10968)
++++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	(revision 10969)
+@@ -623,18 +623,23 @@ PRE(sys_adjtimex)
+    PRE_REG_READ1(long, "adjtimex", struct timex *, buf);
+    PRE_MEM_READ( "adjtimex(timex->modes)", ARG1, sizeof(tx->modes));
+ 
+-#define ADJX(bit,field) 				\
+-   if (tx->modes & bit)					\
++#define ADJX(bits,field) 				\
++   if (tx->modes & (bits))                              \
+       PRE_MEM_READ( "adjtimex(timex->"#field")",	\
+ 		    (Addr)&tx->field, sizeof(tx->field))
+ 
+-   ADJX(VKI_ADJ_OFFSET, offset);
+-   ADJX(VKI_ADJ_FREQUENCY, freq);
+-   ADJX(VKI_ADJ_MAXERROR, maxerror);
+-   ADJX(VKI_ADJ_ESTERROR, esterror);
+-   ADJX(VKI_ADJ_STATUS, status);
+-   ADJX(VKI_ADJ_TIMECONST, constant);
+-   ADJX(VKI_ADJ_TICK, tick);
++   if (tx->modes & VKI_ADJ_ADJTIME) {
++      if (!(tx->modes & VKI_ADJ_OFFSET_READONLY))
++         PRE_MEM_READ( "adjtimex(timex->offset)", (Addr)&tx->offset, sizeof(tx->offset));
++   } else {
++      ADJX(VKI_ADJ_OFFSET, offset);
++      ADJX(VKI_ADJ_FREQUENCY, freq);
++      ADJX(VKI_ADJ_MAXERROR, maxerror);
++      ADJX(VKI_ADJ_ESTERROR, esterror);
++      ADJX(VKI_ADJ_STATUS, status);
++      ADJX(VKI_ADJ_TIMECONST|VKI_ADJ_TAI, constant);
++      ADJX(VKI_ADJ_TICK, tick);
++   }
+ #undef ADJX
+ 
+    PRE_MEM_WRITE( "adjtimex(timex)", ARG1, sizeof(struct vki_timex));


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- valgrind.spec	21 Dec 2009 10:57:44 -0000	1.77
+++ valgrind.spec	21 Dec 2009 11:42:57 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -180,7 +180,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Mon Dec 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-11
+* Mon Dec 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-12
 - don't require offset field to be set in adjtimex's
   ADJ_OFFSET_SS_READ mode (#545866)