diff options
author | Theo Buehler <tb@cvs.openbsd.org> | 2022-12-04 08:22:14 +0000 |
---|---|---|
committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-12-04 08:22:14 +0000 |
commit | 23bea8efe0fa7d8ee0f6c0bc50b977fe8a85d77c (patch) | |
tree | aeeb329919a4d0d1a10c0594b93f55e54979b407 /lib | |
parent | eaa073a1912f9ac940258baa6f1475adb5a49498 (diff) |
Fix warnings about binding changed to STB_WEAK on i386
Compiling libc on i386 results in compiler warnings for bcmp, bzero, bcopy,
brk, and sbrk. Use ENTRY_NB instead of ENTRY to avoid this.
ok jca millert
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/arch/i386/string/bcmp.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/i386/string/bzero.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/i386/string/memmove.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/i386/sys/brk.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/i386/sys/sbrk.S | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/libc/arch/i386/string/bcmp.S b/lib/libc/arch/i386/string/bcmp.S index 6a9772e0a48..97253d06960 100644 --- a/lib/libc/arch/i386/string/bcmp.S +++ b/lib/libc/arch/i386/string/bcmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: bcmp.S,v 1.5 2017/11/29 05:13:57 guenther Exp $ */ +/* $OpenBSD: bcmp.S,v 1.6 2022/12/04 08:22:13 tb Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. @@ -6,7 +6,7 @@ #include "DEFS.h" -ENTRY(bcmp) +ENTRY_NB(bcmp) pushl %edi pushl %esi movl 12(%esp),%edi diff --git a/lib/libc/arch/i386/string/bzero.S b/lib/libc/arch/i386/string/bzero.S index 75cbf72278b..1e8950042ee 100644 --- a/lib/libc/arch/i386/string/bzero.S +++ b/lib/libc/arch/i386/string/bzero.S @@ -1,4 +1,4 @@ -/* $OpenBSD: bzero.S,v 1.6 2017/11/29 05:13:57 guenther Exp $ */ +/* $OpenBSD: bzero.S,v 1.7 2022/12/04 08:22:13 tb Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. @@ -6,7 +6,7 @@ #include "DEFS.h" -ENTRY(bzero) +ENTRY_NB(bzero) pushl %edi movl 8(%esp),%edi movl 12(%esp),%edx diff --git a/lib/libc/arch/i386/string/memmove.S b/lib/libc/arch/i386/string/memmove.S index 8d124ad76a9..0a4508f099d 100644 --- a/lib/libc/arch/i386/string/memmove.S +++ b/lib/libc/arch/i386/string/memmove.S @@ -1,4 +1,4 @@ -/* $OpenBSD: memmove.S,v 1.7 2017/11/29 05:13:57 guenther Exp $ */ +/* $OpenBSD: memmove.S,v 1.8 2022/12/04 08:22:13 tb Exp $ */ /*- * Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved. @@ -39,7 +39,7 @@ * Emulate bcopy() by swapping the first two arguments, and jumping * into memmove(), which handles overlapping regions. */ -ENTRY(bcopy) +ENTRY_NB(bcopy) pushl %esi pushl %edi movl 12(%esp),%esi diff --git a/lib/libc/arch/i386/sys/brk.S b/lib/libc/arch/i386/sys/brk.S index 6d4fac33828..a360f96b1ee 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.14 2021/10/25 14:38:10 jca Exp $ */ +/* $OpenBSD: brk.S,v 1.15 2022/12/04 08:22:13 tb Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -42,7 +42,7 @@ __minbrk: END(__minbrk) .type __minbrk,@object -ENTRY(brk) +ENTRY_NB(brk) #ifdef __PIC__ movl 4(%esp),%ecx PIC_PROLOGUE diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S index e54e5e202dc..4d2ac8baa46 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.14 2021/10/25 14:38:10 jca Exp $ */ +/* $OpenBSD: sbrk.S,v 1.15 2022/12/04 08:22:13 tb Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -42,7 +42,7 @@ __curbrk: .long _end END(__curbrk) .type __curbrk,@object -ENTRY(sbrk) +ENTRY_NB(sbrk) #ifdef __PIC__ movl 4(%esp),%ecx PIC_PROLOGUE |