diff options
| author |   deraadt <deraadt@openbsd.org> | 2017-08-19 18:24:06 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2017-08-19 18:24:06 +0000 |
| commit | f4882b558943284fa7fd7e3684b04b93801b3f8e (patch) | |
| tree | 81fc2df0f5310063d80cd10eceaa7734cda9bc6f /lib/libc | |
| parent | Put _map table into .rodata instead of .text (diff) | |
| download | wireguard-openbsd-f4882b558943284fa7fd7e3684b04b93801b3f8e.tar.xz wireguard-openbsd-f4882b558943284fa7fd7e3684b04b93801b3f8e.zip | |
Don't need .text before ENTRY(), also minor spacing cleanups
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/arch/amd64/sys/brk.S | 5 | ||||
| -rw-r--r-- | lib/libc/arch/amd64/sys/sbrk.S | 8 | ||||
| -rw-r--r-- | lib/libc/arch/i386/sys/brk.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/i386/sys/sbrk.S | 4 |
4 files changed, 8 insertions, 13 deletions
diff --git a/lib/libc/arch/amd64/sys/brk.S b/lib/libc/arch/amd64/sys/brk.S index 80635b8b6a1..ce69679e389 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.9 2016/09/10 20:39:22 kettenis Exp $ */ +/* $OpenBSD: brk.S,v 1.10 2017/08/19 18:24:06 deraadt Exp $ */ /* $NetBSD: brk.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */ /*- @@ -47,8 +47,8 @@ __minbrk: .quad _end END(__minbrk) .type __minbrk,@object - .text + .weak brk ENTRY(brk) cmpq %rdi,__minbrk(%rip) jb 1f @@ -63,4 +63,3 @@ 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 a9884f3b80e..8d7d68909b2 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.9 2016/09/10 20:39:22 kettenis Exp $ */ +/* $OpenBSD: sbrk.S,v 1.10 2017/08/19 18:24:06 deraadt Exp $ */ /* $NetBSD: sbrk.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $ */ /*- @@ -48,11 +48,12 @@ .hidden __curbrk .data -__curbrk: .quad _end +__curbrk: + .quad _end END(__curbrk) .type __curbrk,@object - .text + .weak sbrk ENTRY(sbrk) movq __curbrk(%rip),%rax movslq %edi,%rsi @@ -67,4 +68,3 @@ ENTRY(sbrk) SET_ERRNO ret END(sbrk) - .weak sbrk diff --git a/lib/libc/arch/i386/sys/brk.S b/lib/libc/arch/i386/sys/brk.S index 05afec06b11..82cb591b661 100644 --- a/lib/libc/arch/i386/sys/brk.S +++ b/lib/libc/arch/i386/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.12 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: brk.S,v 1.13 2017/08/19 18:24:06 deraadt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -41,10 +41,8 @@ __minbrk: .long _end END(__minbrk) .type __minbrk,@object - .text .weak brk - ENTRY(brk) #ifdef __PIC__ movl 4(%esp),%ecx diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S index a22cb1f895d..a89dd1f3682 100644 --- a/lib/libc/arch/i386/sys/sbrk.S +++ b/lib/libc/arch/i386/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.12 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: sbrk.S,v 1.13 2017/08/19 18:24:06 deraadt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -41,10 +41,8 @@ __curbrk: .long _end END(__curbrk) .type __curbrk,@object - .text .weak sbrk - ENTRY(sbrk) #ifdef __PIC__ movl 4(%esp),%ecx |