diff options
| author |   kettenis <kettenis@openbsd.org> | 2017-11-21 19:08:36 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2017-11-21 19:08:36 +0000 |
| commit | 71334cb4e6ede90049c422230bbc55cc6ceae515 (patch) | |
| tree | e97c4d333f80e14fdd4579fd663e4a920e4f83ea /lib/libc | |
| parent | Initialize *histbase to NULL to fix a bus error in emacs editing mode (diff) | |
| download | wireguard-openbsd-71334cb4e6ede90049c422230bbc55cc6ceae515.tar.xz wireguard-openbsd-71334cb4e6ede90049c422230bbc55cc6ceae515.zip | |
Avoid .align 0. Clang's integrated assembler actually honors this directive
and the resulting byte-alignment triggers unaligned access.
ok patrick@, deraadt@
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/arch/arm/sys/Ovfork.S | 5 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/brk.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/sbrk.S | 6 |
3 files changed, 6 insertions, 9 deletions
diff --git a/lib/libc/arch/arm/sys/Ovfork.S b/lib/libc/arch/arm/sys/Ovfork.S index 396a1e82faf..f35934a306c 100644 --- a/lib/libc/arch/arm/sys/Ovfork.S +++ b/lib/libc/arch/arm/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.7 2016/08/06 19:16:09 guenther Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.8 2017/11/21 19:08:36 kettenis Exp $ */ /* $NetBSD: Ovfork.S,v 1.6 2003/08/07 16:42:03 agc Exp $ */ /*- @@ -34,9 +34,6 @@ #include "SYS.h" - .text - .align 0 - SYSENTRY_HIDDEN(vfork) mov r2, r14 SYSTRAP(vfork) diff --git a/lib/libc/arch/arm/sys/brk.S b/lib/libc/arch/arm/sys/brk.S index f88bc6b97f5..c2f2650d9e2 100644 --- a/lib/libc/arch/arm/sys/brk.S +++ b/lib/libc/arch/arm/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.9 2016/08/06 19:16:09 guenther Exp $ */ +/* $OpenBSD: brk.S,v 1.10 2017/11/21 19:08:36 kettenis Exp $ */ /* $NetBSD: brk.S,v 1.7 2003/12/26 11:23:44 martin Exp $ */ /*- @@ -38,7 +38,7 @@ .globl __curbrk .data - .align 0 + .align 2 .type __minbrk,#object __minbrk: .word _C_LABEL(_end) diff --git a/lib/libc/arch/arm/sys/sbrk.S b/lib/libc/arch/arm/sys/sbrk.S index 9a66b791660..eba1f4c44c4 100644 --- a/lib/libc/arch/arm/sys/sbrk.S +++ b/lib/libc/arch/arm/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.9 2016/08/06 19:16:09 guenther Exp $ */ +/* $OpenBSD: sbrk.S,v 1.10 2017/11/21 19:08:36 kettenis Exp $ */ /* $NetBSD: sbrk.S,v 1.7 2003/08/07 16:42:05 agc Exp $ */ /*- @@ -37,7 +37,7 @@ .globl _C_LABEL(_end) .data - .align 0 + .align 2 .globl __curbrk .type __curbrk,#object .hidden __curbrk @@ -77,7 +77,7 @@ ENTRY(sbrk) /* Return old curbrk value */ mov r15, r14 - .align 0 + .align 2 #ifdef __PIC__ .Lgot: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8) |