From owner-svn-src-all@freebsd.org Wed Jun 24 16:15:34 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1673C916970; Wed, 24 Jun 2015 16:15:34 +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 072791A50; Wed, 24 Jun 2015 16:15:34 +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 t5OGFXA0034628; Wed, 24 Jun 2015 16:15:33 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OGFXTp034625; Wed, 24 Jun 2015 16:15:33 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506241615.t5OGFXTp034625@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 24 Jun 2015 16:15:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284768 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 16:15:34 -0000 Author: andrew Date: Wed Jun 24 16:15:32 2015 New Revision: 284768 URL: https://svnweb.freebsd.org/changeset/base/284768 Log: Set the alignment of the setjmp magic values correctly. The alignment needs to be before the lavel, otherwise an extra word may be added between the label and the data. Obtained from: ABT Systems Ltd Sponsored by: The FReeBSD Foundation Modified: head/lib/libc/aarch64/gen/_setjmp.S head/lib/libc/aarch64/gen/setjmp.S head/lib/libc/aarch64/gen/sigsetjmp.S Modified: head/lib/libc/aarch64/gen/_setjmp.S ============================================================================== --- head/lib/libc/aarch64/gen/_setjmp.S Wed Jun 24 15:53:52 2015 (r284767) +++ head/lib/libc/aarch64/gen/_setjmp.S Wed Jun 24 16:15:32 2015 (r284768) @@ -59,8 +59,8 @@ ENTRY(_setjmp) /* Return value */ mov x0, #0 ret -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC__SETJMP END(_setjmp) Modified: head/lib/libc/aarch64/gen/setjmp.S ============================================================================== --- head/lib/libc/aarch64/gen/setjmp.S Wed Jun 24 15:53:52 2015 (r284767) +++ head/lib/libc/aarch64/gen/setjmp.S Wed Jun 24 16:15:32 2015 (r284768) @@ -69,8 +69,8 @@ ENTRY(setjmp) /* Return value */ mov x0, #0 ret -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC_SETJMP END(setjmp) Modified: head/lib/libc/aarch64/gen/sigsetjmp.S ============================================================================== --- head/lib/libc/aarch64/gen/sigsetjmp.S Wed Jun 24 15:53:52 2015 (r284767) +++ head/lib/libc/aarch64/gen/sigsetjmp.S Wed Jun 24 16:15:32 2015 (r284768) @@ -47,7 +47,7 @@ ENTRY(siglongjmp) cmp x2, x3 b.eq _C_LABEL(_longjmp) b _C_LABEL(longjmp) -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC__SETJMP END(siglongjmp)