From owner-svn-src-all@FreeBSD.ORG  Sat Jun  6 10:28:39 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 303E7E5D;
 Sat,  6 Jun 2015 10:28:39 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DED915A5;
 Sat,  6 Jun 2015 10:28:39 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t56AScoL051017;
 Sat, 6 Jun 2015 10:28:38 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t56AScQ0051016;
 Sat, 6 Jun 2015 10:28:38 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201506061028.t56AScQ0051016@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 6 Jun 2015 10:28:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284053 - head/lib/libc/aarch64/gen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jun 2015 10:28:39 -0000

Author: andrew
Date: Sat Jun  6 10:28:38 2015
New Revision: 284053
URL: https://svnweb.freebsd.org/changeset/base/284053

Log:
  Set the correct register when calling sigprocmask in longjmp.
  
  Submitted by:	Patrick Wildt <patrick@bitrig.org>
  Obtained from:	drahn@bitrig.org

Modified:
  head/lib/libc/aarch64/gen/setjmp.S

Modified: head/lib/libc/aarch64/gen/setjmp.S
==============================================================================
--- head/lib/libc/aarch64/gen/setjmp.S	Sat Jun  6 09:28:40 2015	(r284052)
+++ head/lib/libc/aarch64/gen/setjmp.S	Sat Jun  6 10:28:38 2015	(r284053)
@@ -80,7 +80,7 @@ ENTRY(longjmp)
 	str	x1, [sp, #16]
 
 	/* Restore the signal mask */
-	mov	x1, #0				/* oset */
+	mov	x2, #0				/* oset */
 	add	x1, x0, #(_JB_SIGMASK * 8)	/* set */
 	mov	x0, #3				/* SIG_BLOCK */
 	bl	sigprocmask