From owner-freebsd-current@FreeBSD.ORG Wed May 8 16:58:08 2013 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0727BBB2 for ; Wed, 8 May 2013 16:58:08 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (m209-73.dsl.rawbw.com [198.144.209.73]) by mx1.freebsd.org (Postfix) with ESMTP id C4DE3F46 for ; Wed, 8 May 2013 16:58:07 +0000 (UTC) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.14.7/8.14.7) with ESMTP id r48Gw0a8031196; Wed, 8 May 2013 09:58:00 -0700 (PDT) (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.14.7/8.14.7/Submit) id r48Gw0c3031195; Wed, 8 May 2013 09:58:00 -0700 (PDT) (envelope-from david) Date: Wed, 8 May 2013 09:58:00 -0700 From: David Wolfskill To: Larry Rosenman Subject: Re: openjdk6 broken on current Message-ID: <20130508165800.GS1346@albert.catwhisker.org> References: <20130505084925.GZ12114@ithaqua.etoilebsd.net> <1e05f442e819d9eb77b16cee5b47d4c4@webmail.lerctr.org> <072097222ecf7a0454b6bf3c5a345e7a@webmail.lerctr.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7JtmyEQckRKrnqj+" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 May 2013 16:58:08 -0000 --7JtmyEQckRKrnqj+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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?=20 > ... (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 =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 --- lib/libthr/thread/thr_sig.c (revision 249606) +++ lib/libthr/thread/thr_sig.c (revision 249605) @@ -732,12 +732,8 @@ { ucontext_t uc; =20 - if (ucp =3D=3D 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); } =20 @@ -747,13 +743,7 @@ { ucontext_t uc; =20 - if (oucp =3D=3D NULL || ucp =3D=3D NULL) - return (EINVAL); - if (SIGISMEMBER(ucp->uc_sigmask, SIGCANCEL)) { - stdout_debug("remove SIGCANCEL\n"); =20 - (void) memcpy(&uc, ucp, sizeof(uc)); - SIGDELSET(uc.uc_sigmask, SIGCANCEL); - ucp =3D &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]=20 In practice, I would have saved that to a file, then fed it to "svn patch". Peace, david --=20 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. --7JtmyEQckRKrnqj+ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlGKhBcACgkQmprOCmdXAD2L1wCggAIEMEGuhkdYHoGTqUc5KgFi lLUAn1TZL6OByxjDF42gDn2RXDrSYMGn =uGmD -----END PGP SIGNATURE----- --7JtmyEQckRKrnqj+--