Attachment 200924 Details for Bug 234759 – Proposed fix

[patch] Proposed fix

valgrind_fixes_20190108.diff (text/plain), 3.39 KB, created by Roman Bogorodskiy on 2019-01-08 17:56:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2019-01-08 17:56:36 UTC

Size: 3.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 489646)
>+++ Makefile	(working copy)
>@@ -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=/ \
>Index: files/extra-patch-ino64
>===================================================================
>--- files/extra-patch-ino64	(revision 489646)
>+++ files/extra-patch-ino64	(working copy)
>@@ -5,10 +5,10 @@
> 
> ---
>  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
>@@ -148,10 +148,10 @@
>  
>  };
> 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,6 +177,7 @@
> +	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;
>@@ -183,14 +184,11 @@
> +	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];
>  };
>  
>Index: files/patch-coregrind-m_debuglog.c
>===================================================================
>--- files/patch-coregrind-m_debuglog.c	(nonexistent)
>+++ files/patch-coregrind-m_debuglog.c	(working copy)
>@@ -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;
>
>Property changes on: files/patch-coregrind-m_debuglog.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 234759: 200923 | 200924 | 200925