Make brk() and sbrk() weak again as intended.

ok jca@

diff --git a/lib/libc/arch/amd64/sys/brk.S b/lib/libc/arch/amd64/sys/brk.S
index ce69679..1733b0b 100644 (file)
--- 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.10 2017/08/19 18:24:06 deraadt Exp $        */
+/*     $OpenBSD: brk.S,v 1.11 2021/10/25 14:19:51 kettenis Exp $       */
 /*     $NetBSD: brk.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $     */
 
 /*-
@@ -48,7 +48,6 @@ __minbrk:
        END(__minbrk)
        .type   __minbrk,@object
 
-       .weak   brk
 ENTRY(brk)
        cmpq    %rdi,__minbrk(%rip)
        jb      1f
@@ -63,3 +62,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 8d7d689..5726753 100644 (file)
--- 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.10 2017/08/19 18:24:06 deraadt Exp $       */
+/*     $OpenBSD: sbrk.S,v 1.11 2021/10/25 14:19:51 kettenis Exp $      */
 /*     $NetBSD: sbrk.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $    */
 
 /*-
@@ -53,7 +53,6 @@ __curbrk:
        END(__curbrk)
        .type   __curbrk,@object
 
-       .weak   sbrk
 ENTRY(sbrk)
        movq    __curbrk(%rip),%rax
        movslq  %edi,%rsi
@@ -68,3 +67,4 @@ ENTRY(sbrk)
        SET_ERRNO
        ret
 END(sbrk)
+       .weak   sbrk