Date: Wed, 8 May 2013 09:58:00 -0700 From: David Wolfskill <david@catwhisker.org> To: Larry Rosenman <ler@lerctr.org> Cc: freebsd-current@freebsd.org Subject: Re: openjdk6 broken on current Message-ID: <20130508165800.GS1346@albert.catwhisker.org> In-Reply-To: <b95fe82f-d063-4df4-8060-00fe3be9e545@email.android.com> References: <20130505084925.GZ12114@ithaqua.etoilebsd.net> <1e05f442e819d9eb77b16cee5b47d4c4@webmail.lerctr.org> <CAPJF9w=rMnZ-oY4hC6zrjE3RbnXJ=Lv_N=rOJmuYgK=rWkCODg@mail.gmail.com> <e52278a5-8fd0-4069-acab-c0b58e50de37@email.android.com> <CAPJF9wmFgLrt7rbNnZ7FaatOPewsqgGciT3ZhjO1H-tAR2-PSw@mail.gmail.com> <fa7b7f86a6dd96db540e946f7a2a3f13@webmail.lerctr.org> <CAPJF9w=zj6pO-ChbBqts9Q67Dba3i%2BT-VR7C3TEZNOVtHovY%2BA@mail.gmail.com> <072097222ecf7a0454b6bf3c5a345e7a@webmail.lerctr.org> <Pine.GSO.4.64.1305081248330.8949@sea.ntplx.net> <b95fe82f-d063-4df4-8060-00fe3be9e545@email.android.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Wed, May 08, 2013 at 11:52:24AM -0500, Larry Rosenman wrote:
> ...
> >Did/can you try just backing out r249606?
> ...
> How can I generate a patch to do that?
> ...
(Note that /S4/usr/src is where my "head" sources are on this machine at
present.)
d129(9.1-S)[5] cd /S4/usr/src
d129(9.1-S)[6] svn diff -c -249606
Index: lib/libthr/thread/thr_sig.c
===================================================================
--- lib/libthr/thread/thr_sig.c (revision 249606)
+++ lib/libthr/thread/thr_sig.c (revision 249605)
@@ -732,12 +732,8 @@
{
ucontext_t uc;
- if (ucp == NULL)
- return (EINVAL);
- if (!SIGISMEMBER(uc.uc_sigmask, SIGCANCEL))
- return __sys_setcontext(ucp);
(void) memcpy(&uc, ucp, sizeof(uc));
- SIGDELSET(uc.uc_sigmask, SIGCANCEL);
+ remove_thr_signals(&uc.uc_sigmask);
return __sys_setcontext(&uc);
}
@@ -747,13 +743,7 @@
{
ucontext_t uc;
- if (oucp == NULL || ucp == NULL)
- return (EINVAL);
- if (SIGISMEMBER(ucp->uc_sigmask, SIGCANCEL)) {
- stdout_debug("remove SIGCANCEL\n");
- (void) memcpy(&uc, ucp, sizeof(uc));
- SIGDELSET(uc.uc_sigmask, SIGCANCEL);
- ucp = &uc;
- }
- return __sys_swapcontext(oucp, ucp);
+ (void) memcpy(&uc, ucp, sizeof(uc));
+ remove_thr_signals(&uc.uc_sigmask);
+ return __sys_swapcontext(oucp, &uc);
}
d129(9.1-S)[7]
In practice, I would have saved that to a file, then fed it to "svn patch".
Peace,
david
--
David H. Wolfskill david@catwhisker.org
Taliban: Evil men with guns afraid of truth from a 14-year old girl.
See http://www.catwhisker.org/~david/publickey.gpg for my public key.
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)
iEYEARECAAYFAlGKhBcACgkQmprOCmdXAD2L1wCggAIEMEGuhkdYHoGTqUc5KgFi
lLUAn1TZL6OByxjDF42gDn2RXDrSYMGn
=uGmD
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130508165800.GS1346>