openjdk6 broken on current

[David Wolfskill]

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 at 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20130508/67a3e67b/attachment.sig>