diff options
| author |   kettenis <kettenis@openbsd.org> | 2016-09-10 20:39:22 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2016-09-10 20:39:22 +0000 |
| commit | 29a0f34dbfbd761da5b30de934feede946a47ca0 (patch) | |
| tree | 1b24c672b02328e2fb4dc290cd5a08bb0fa0c14d /lib/libc | |
| parent | Convert function definitions from K&R to standard-style (diff) | |
| download | wireguard-openbsd-29a0f34dbfbd761da5b30de934feede946a47ca0.tar.xz wireguard-openbsd-29a0f34dbfbd761da5b30de934feede946a47ca0.zip | |
Clang ignores a .weak directive before a function is actually defined. So
move it from before ENTRY() to after END(). Keeps brk(2) and sbrk(2) weak
when comping libc with clang.
ok guenther@
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/arch/amd64/sys/brk.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/amd64/sys/sbrk.S | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/arch/amd64/sys/brk.S b/lib/libc/arch/amd64/sys/brk.S index 26fb2893b58..80635b8b6a1 100644 --- a/lib/libc/arch/amd64/sys/brk.S +++ b/lib/libc/arch/amd64/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.8 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: brk.S,v 1.9 2016/09/10 20:39:22 kettenis Exp $ */ /* $NetBSD: brk.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */ /*- @@ -49,7 +49,6 @@ __minbrk: .type __minbrk,@object .text - .weak brk ENTRY(brk) cmpq %rdi,__minbrk(%rip) jb 1f @@ -64,3 +63,4 @@ ENTRY(brk) SET_ERRNO ret END(brk) + .weak brk diff --git a/lib/libc/arch/amd64/sys/sbrk.S b/lib/libc/arch/amd64/sys/sbrk.S index 05d289b03b9..a9884f3b80e 100644 --- a/lib/libc/arch/amd64/sys/sbrk.S +++ b/lib/libc/arch/amd64/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.8 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: sbrk.S,v 1.9 2016/09/10 20:39:22 kettenis Exp $ */ /* $NetBSD: sbrk.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $ */ /*- @@ -53,7 +53,6 @@ __curbrk: .quad _end .type __curbrk,@object .text - .weak sbrk ENTRY(sbrk) movq __curbrk(%rip),%rax movslq %edi,%rsi @@ -68,3 +67,4 @@ ENTRY(sbrk) SET_ERRNO ret END(sbrk) + .weak sbrk |