svn commit: r284768 - head/lib/libc/aarch64/gen

[Andrew Turner]

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)