summaryrefslogtreecommitdiffstats
path: root/lib/libc
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2015-06-24 16:15:32 +0000
committerandrew <andrew@FreeBSD.org>2015-06-24 16:15:32 +0000
commit3d046cb0843dfda152ec10213a66bfb4f4824d2a (patch)
tree524b829aa386333be89a43220b21bdc0eb0d7304 /lib/libc
parent85b48dfe259aa35cdcae31a99c6ee5a77c356b11 (diff)
downloadFreeBSD-src-3d046cb0843dfda152ec10213a66bfb4f4824d2a.zip
FreeBSD-src-3d046cb0843dfda152ec10213a66bfb4f4824d2a.tar.gz
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
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/aarch64/gen/_setjmp.S2
-rw-r--r--lib/libc/aarch64/gen/setjmp.S2
-rw-r--r--lib/libc/aarch64/gen/sigsetjmp.S2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/aarch64/gen/_setjmp.S b/lib/libc/aarch64/gen/_setjmp.S
index 504423b..ae00195 100644
--- a/lib/libc/aarch64/gen/_setjmp.S
+++ b/lib/libc/aarch64/gen/_setjmp.S
@@ -59,8 +59,8 @@ ENTRY(_setjmp)
/* Return value */
mov x0, #0
ret
-.Lmagic:
.align 3
+.Lmagic:
.quad _JB_MAGIC__SETJMP
END(_setjmp)
diff --git a/lib/libc/aarch64/gen/setjmp.S b/lib/libc/aarch64/gen/setjmp.S
index 790ed73..a30ed6a 100644
--- a/lib/libc/aarch64/gen/setjmp.S
+++ b/lib/libc/aarch64/gen/setjmp.S
@@ -69,8 +69,8 @@ ENTRY(setjmp)
/* Return value */
mov x0, #0
ret
-.Lmagic:
.align 3
+.Lmagic:
.quad _JB_MAGIC_SETJMP
END(setjmp)
diff --git a/lib/libc/aarch64/gen/sigsetjmp.S b/lib/libc/aarch64/gen/sigsetjmp.S
index 8a13c9f..be49f53 100644
--- a/lib/libc/aarch64/gen/sigsetjmp.S
+++ b/lib/libc/aarch64/gen/sigsetjmp.S
@@ -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)
OpenPOWER on IntegriCloud