Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Nov 2005 20:19:32 +0100
From:      Simon Barner <barner@FreeBSD.org>
To:        ports@FreeBSD.org
Subject:   Tester for valgrind ports needed: i386/7-current
Message-ID:  <20051107191932.GD980@zi025.glhnet.mhn.de>

next in thread | raw e-mail | index | archive | help

--ep0oHQY+/Gbo/zt0
Content-Type: multipart/mixed; boundary="P+33d92oIH25kiaB"
Content-Disposition: inline


--P+33d92oIH25kiaB
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi!

In my effort to fix the pointyhat errors for the valgrind ports, I'd
need the help of somebody running FreeBSD 7-current on i386.

Could you please test if the attached patches against devel/valgrind and
devel/valgrind-snapshot fix the build. Run-time tests are certainly
welcome, too.

TIA,

--=20
Best regards / Viele Gr=FC=DFe,                             barner@FreeBSD.=
org
 Simon Barner                                                barner@gmx.de

--P+33d92oIH25kiaB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="valgrind.diff"
Content-Transfer-Encoding: quoted-printable

Index: valgrind/files/patch-coregrind-vg_proxylwp.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/devel/valgrind/files/patch-coregrind-vg_proxylwp=
=2Ec,v
retrieving revision 1.1
diff -u -r1.1 patch-coregrind-vg_proxylwp.c
--- valgrind/files/patch-coregrind-vg_proxylwp.c	9 Dec 2004 23:08:41 -0000	=
1.1
+++ valgrind/files/patch-coregrind-vg_proxylwp.c	7 Nov 2005 19:14:07 -0000
@@ -1,5 +1,5 @@
---- coregrind/vg_proxylwp.c.orig	Thu Dec  9 20:02:58 2004
-+++ coregrind/vg_proxylwp.c	Thu Dec  9 20:03:16 2004
+--- coregrind/vg_proxylwp.c.orig	Sat Jul 17 13:48:25 2004
++++ coregrind/vg_proxylwp.c	Mon Nov  7 20:06:46 2005
 @@ -30,6 +30,7 @@
 =20
 =20
@@ -8,3 +8,47 @@
 =20
  #ifndef UMTX_CONTESTED
  # if __FreeBSD_version < 502120
+@@ -595,7 +596,7 @@
+    Int ret =3D 1000;
+    static const vki_kstack_t ss =3D { .ss_flags =3D VKI_SS_DISABLE };
+=20
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+    VG_(do_syscall)(__NR__umtx_lock, &px->mutex);
+    px->mutex.u_owner |=3D UMTX_CONTESTED;
+    VG_(do_syscall)(__NR_thr_self, &px->lwp);
+@@ -942,7 +943,7 @@
+=20
+    px->exitcode =3D ret;
+=20
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+    ret =3D VG_(do_syscall)(__NR__umtx_unlock, &px->mutex);
+    if (use_rfork)
+       VG_(do_syscall)(__NR_exit, 0);
+@@ -1097,14 +1098,14 @@
+       extern Int VG_(rfork_thread)(Int, void*, void*, void*);
+       ret =3D VG_(rfork_thread)(VKI_RFPROC | VKI_RFMEM | VKI_RFSIGSHARE
+ 			      | VKI_RFTHREAD
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ 			      | VKI_RFNOWAIT
+ #endif
+ 			      ,
+ 			      LWP_stack(proxy), proxylwp, proxy);
+       VG_(do_signal_routing) =3D True;
+    } else {
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+       vki_ucontext_t ctx;
+       extern void makecontext(vki_ucontext_t*, ...);
+=20
+@@ -1168,7 +1169,7 @@
+       }
+    }
+ #endif
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+    if (block) {
+        if(proxy->lwp !=3D 0)
+ 	   VG_(do_syscall)(__NR__umtx_lock, &proxy->mutex);
Index: valgrind/files/patch-coregrind_vg_unistd.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: valgrind/files/patch-coregrind_vg_unistd.h
diff -N valgrind/files/patch-coregrind_vg_unistd.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ valgrind/files/patch-coregrind_vg_unistd.h	7 Nov 2005 19:14:07 -0000
@@ -0,0 +1,29 @@
+--- coregrind/vg_unistd.h.orig	Mon Nov  7 20:07:03 2005
++++ coregrind/vg_unistd.h	Mon Nov  7 20:07:28 2005
+@@ -630,7 +630,7 @@
+ #define	__NR_uuidgen	392
+ #define	__NR_sendfile	393
+ #define	__NR_mac_syscall	394
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ #define	__NR_getfsstat	395
+ #define	__NR_statfs	396
+ #define	__NR_fstatfs	397
+@@ -652,7 +652,7 @@
+ #define	__NR_extattr_get_link	413
+ #define	__NR_extattr_delete_link	414
+ #define	__NR___mac_execve	415
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ #define	__NR_sigaction	416
+ #define	__NR_sigreturn	417
+ #endif
+@@ -665,7 +665,7 @@
+ #define	__NR___acl_delete_link	427
+ #define	__NR___acl_aclcheck_link	428
+ #define	__NR_sigwait	429
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ #define	__NR_thr_create	430
+ #define	__NR_thr_exit	431
+ #define	__NR_thr_self	432

--P+33d92oIH25kiaB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="valgrind-snapshot.diff"
Content-Transfer-Encoding: quoted-printable

Index: valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/devel/valgrind-snapshot/files/patch-coregrind-vg=
_proxylwp.c,v
retrieving revision 1.1
diff -u -r1.1 patch-coregrind-vg_proxylwp.c
--- valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c	9 Dec 2004 23:08:=
41 -0000	1.1
+++ valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c	7 Nov 2005 18:35:=
51 -0000
@@ -1,5 +1,5 @@
---- coregrind/vg_proxylwp.c.orig	Thu Dec  9 20:02:58 2004
-+++ coregrind/vg_proxylwp.c	Thu Dec  9 20:03:16 2004
+--- coregrind/vg_proxylwp.c.orig	Sat Jul 17 13:46:01 2004
++++ coregrind/vg_proxylwp.c	Mon Nov  7 19:33:19 2005
 @@ -30,6 +30,7 @@
 =20
 =20
@@ -8,3 +8,47 @@
 =20
  #ifndef UMTX_CONTESTED
  # if __FreeBSD_version < 502120
+@@ -595,7 +596,7 @@
+    Int ret =3D 1000;
+    static const vki_kstack_t ss =3D { .ss_flags =3D VKI_SS_DISABLE };
+=20
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+    VG_(do_syscall)(__NR__umtx_lock, &px->mutex);
+    px->mutex.u_owner |=3D UMTX_CONTESTED;
+    VG_(do_syscall)(__NR_thr_self, &px->lwp);
+@@ -943,7 +944,7 @@
+=20
+    px->exitcode =3D ret;
+=20
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+    ret =3D VG_(do_syscall)(__NR__umtx_unlock, &px->mutex);
+    if (use_rfork)
+       VG_(do_syscall)(__NR_exit, 0);
+@@ -1098,14 +1099,14 @@
+       extern Int VG_(rfork_thread)(Int, void*, void*, void*);
+       ret =3D VG_(rfork_thread)(VKI_RFPROC | VKI_RFMEM | VKI_RFSIGSHARE
+ 			      | VKI_RFTHREAD
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ 			      | VKI_RFNOWAIT
+ #endif
+ 			      ,
+ 			      LWP_stack(proxy), proxylwp, proxy);
+       VG_(do_signal_routing) =3D True;
+    } else {
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+       vki_ucontext_t ctx;
+       extern void makecontext(vki_ucontext_t*, ...);
+=20
+@@ -1169,7 +1170,7 @@
+       }
+    }
+ #endif
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+    if (block) {
+        if(proxy->lwp !=3D 0)
+ 	   VG_(do_syscall)(__NR__umtx_lock, &proxy->mutex);
Index: valgrind-snapshot/files/patch-coregrind_vg_unistd.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: valgrind-snapshot/files/patch-coregrind_vg_unistd.h
diff -N valgrind-snapshot/files/patch-coregrind_vg_unistd.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ valgrind-snapshot/files/patch-coregrind_vg_unistd.h	7 Nov 2005 18:35:51=
 -0000
@@ -0,0 +1,29 @@
+--- coregrind/vg_unistd.h.orig	Mon Nov  7 19:31:31 2005
++++ coregrind/vg_unistd.h	Mon Nov  7 19:32:05 2005
+@@ -630,7 +630,7 @@
+ #define	__NR_uuidgen	392
+ #define	__NR_sendfile	393
+ #define	__NR_mac_syscall	394
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ #define	__NR_getfsstat	395
+ #define	__NR_statfs	396
+ #define	__NR_fstatfs	397
+@@ -652,7 +652,7 @@
+ #define	__NR_extattr_get_link	413
+ #define	__NR_extattr_delete_link	414
+ #define	__NR___mac_execve	415
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ #define	__NR_sigaction	416
+ #define	__NR_sigreturn	417
+ #endif
+@@ -665,7 +665,7 @@
+ #define	__NR___acl_delete_link	427
+ #define	__NR___acl_aclcheck_link	428
+ #define	__NR_sigwait	429
+-#if __FreeBSD__ =3D=3D 5
++#if __FreeBSD__ >=3D 5
+ #define	__NR_thr_create	430
+ #define	__NR_thr_exit	431
+ #define	__NR_thr_self	432

--P+33d92oIH25kiaB--

--ep0oHQY+/Gbo/zt0
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQFDb6jECkn+/eutqCoRAjhLAKCWnazJy5hGHOggytMSQ2aqigqrtACfZaAx
ejrCwYSo3J9MeyWcZFZft2A=
=DKzH
-----END PGP SIGNATURE-----

--ep0oHQY+/Gbo/zt0--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051107191932.GD980>