svn commit: r493761 - in head/devel/valgrind: . files

[Roman Bogorodskiy]

Author: novel
Date: Sun Feb 24 13:56:44 2019
New Revision: 493761
URL: https://svnweb.freebsd.org/changeset/ports/493761

Log:
  devel/valgrind: add missing field to stat64 struct and fix debug logging
  
   - Add missing st_birthtim field to vki_stat64 struct [2]
   - Fix debug logging (valgrind -v -v -v -d -d -d),
     based on upstream commits:
      * https://sourceware.org/git/?p=valgrind.git;a=commit;h=6b92194ac
      * https://sourceware.org/git/?p=valgrind.git;a=commit;h=f06f0f718
   - Bump PORTREVISION
  
  PR:		234759 [1]
  Submitted by:	novel [1]
  Submitted by:	markj [2]
  Approved by:	maintainer timeout

Added:
  head/devel/valgrind/files/patch-coregrind-m_debuglog.c   (contents, props changed)
Modified:
  head/devel/valgrind/Makefile
  head/devel/valgrind/files/extra-patch-ino64

Modified: head/devel/valgrind/Makefile
==============================================================================
--- head/devel/valgrind/Makefile	Sun Feb 24 13:43:29 2019	(r493760)
+++ head/devel/valgrind/Makefile	Sun Feb 24 13:56:44 2019	(r493761)
@@ -4,7 +4,7 @@
 PORTNAME=	valgrind
 PORTVERSION=	3.10.1.20160113
 DISTVERSIONPREFIX=	freebsd-
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \

Modified: head/devel/valgrind/files/extra-patch-ino64
==============================================================================
--- head/devel/valgrind/files/extra-patch-ino64	Sun Feb 24 13:43:29 2019	(r493760)
+++ head/devel/valgrind/files/extra-patch-ino64	Sun Feb 24 13:56:44 2019	(r493761)
@@ -5,10 +5,10 @@ Subject: [PATCH v2] ino64 support
 
 ---
  coregrind/m_syswrap/priv_syswrap-freebsd.h |  4 ++
- coregrind/m_syswrap/syswrap-freebsd.c      | 65 ++++++++++++++++++++++++++++++
- include/vki/vki-freebsd.h                  | 56 +++++++++++++++++++++++++
+ coregrind/m_syswrap/syswrap-freebsd.c      | 65 ++++++++++++++++++++++
+ include/vki/vki-freebsd.h                  | 54 ++++++++++++++++++
  include/vki/vki-scnums-freebsd.h           |  4 ++
- 4 files changed, 129 insertions(+)
+ 4 files changed, 127 insertions(+)
 
 diff --git a/coregrind/m_syswrap/priv_syswrap-freebsd.h b/coregrind/m_syswrap/priv_syswrap-freebsd.h
 index 63d122f..715ad48 100644
@@ -54,7 +54,7 @@ index bf6b1f1..978e98e 100644
 +PRE(sys_fstat64)
 +{
 +   PRINT("sys_fstat64 ( %ld, %#lx )", ARG1, ARG2);
-+   PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat *, buf);
++   PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat64 *, buf);
 +   PRE_MEM_WRITE( "fstat(buf)", ARG2, sizeof(struct vki_stat64) );
 +}
 +
@@ -148,10 +148,10 @@ index bf6b1f1..978e98e 100644
  
  };
 diff --git a/include/vki/vki-freebsd.h b/include/vki/vki-freebsd.h
-index aee453e..f20833a 100644
+index aee453e..318a207 100644
 --- a/include/vki/vki-freebsd.h
 +++ b/include/vki/vki-freebsd.h
-@@ -367,6 +367,38 @@ struct vki_stat {
+@@ -367,6 +367,36 @@ struct vki_stat {
  	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
  };
  
@@ -177,20 +177,18 @@ index aee453e..f20833a 100644
 +	vki_time_t	st_ctime;
 +	long		st_ctime_nsec;
 +#endif
++	struct vki_timespec	st_birthtim;
 +	vki_off_t	st_size;
 +	vki_blkcnt_t	st_blocks;
 +	vki_blksize_t	st_blksize;
 +	vki_fflags_t	st_flags;
 +	vki_uint64_t	st_gen;
 +	vki_int64_t	st_spare[10];
-+//	struct vki_timespec	st_birthtimespec;
-+//	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
-+//	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
 +};
  
  //----------------------------------------------------------------------
  // From linux-2.6.8.1/include/linux/sched.h
-@@ -941,6 +973,30 @@ struct vki_statfs {
+@@ -941,6 +971,30 @@ struct vki_statfs {
  	char		f_mntonname[VKI_MNAMELEN];
  };
  

Added: head/devel/valgrind/files/patch-coregrind-m_debuglog.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/valgrind/files/patch-coregrind-m_debuglog.c	Sun Feb 24 13:56:44 2019	(r493761)
@@ -0,0 +1,13 @@
+--- coregrind/m_debuglog.c.orig	2019-01-08 21:35:12.953178000 +0400
++++ coregrind/m_debuglog.c	2019-01-08 21:36:10.940827000 +0400
+@@ -482,8 +482,8 @@
+       "popq  %%r15\n"           /* restore r15 */
+       "addq  $256, %%rsp\n"     /* restore stack ptr */
+       : /*wr*/
+-      : /*rd*/    "g" (block)
+-      : /*trash*/ "rax", "rdi", "rsi", "rdx", "memory", "cc"
++      : /*rd*/    "r" (block)
++      : /*trash*/ "rax", "rdi", "rsi", "rdx", "memory", "cc", "rcx", "r11"
+    );
+    if (block[0] < 0) 
+       block[0] = -1;