diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2017-10-29 02:21:34 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2017-10-29 02:21:34 +0000 |
| commit | 3a302f22c531cc97fed4a97fb4656989a98484c2 (patch) | |
| tree | 4ff8dcfe16a32576503678eb73b30cec67bc6d2e /lib/libc | |
| parent | bd4471918dfc2a647bc6818cce229d5d48e4b3e7 (diff) | |
Stop exporting _memcpy, an implementation detail of bcopy/memcpy/memmove
ok kettenis@ deraadt@
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/arch/arm/Symbols.list | 1 | ||||
| -rw-r--r-- | lib/libc/arch/arm/string/_memcpy.S | 6 | ||||
| -rw-r--r-- | lib/libc/arch/arm/string/bcopy.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/string/memcpy.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/string/memmove.S | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/lib/libc/arch/arm/Symbols.list b/lib/libc/arch/arm/Symbols.list index 8a19e808333..2c79e9b439e 100644 --- a/lib/libc/arch/arm/Symbols.list +++ b/lib/libc/arch/arm/Symbols.list @@ -42,7 +42,6 @@ _fpsetmask _fpsetround _fpsetsticky _mcount -_memcpy _softfloat_float32_eq _softfloat_float32_le _softfloat_float32_lt diff --git a/lib/libc/arch/arm/string/_memcpy.S b/lib/libc/arch/arm/string/_memcpy.S index 18c074ea705..5c84a750e9c 100644 --- a/lib/libc/arch/arm/string/_memcpy.S +++ b/lib/libc/arch/arm/string/_memcpy.S @@ -1,4 +1,4 @@ -/* $OpenBSD: _memcpy.S,v 1.6 2016/08/06 19:16:09 guenther Exp $ */ +/* $OpenBSD: _memcpy.S,v 1.7 2017/10/29 02:21:33 guenther Exp $ */ /* $NetBSD: _memcpy.S,v 1.4 2003/04/05 23:08:52 bjh21 Exp $ */ /*- @@ -65,6 +65,8 @@ .syntax unified +.hidden _memcpy + ENTRY(_memcpy) /* Determine copy direction */ cmp r1, r0 @@ -462,4 +464,4 @@ ENTRY(_memcpy) .Lmemcpy_bsrcul1l4: add r1, r1, #1 b .Lmemcpy_bl4 -END_STRONG(_memcpy) +END(_memcpy) diff --git a/lib/libc/arch/arm/string/bcopy.S b/lib/libc/arch/arm/string/bcopy.S index c08cb810bd7..88b08cbaa37 100644 --- a/lib/libc/arch/arm/string/bcopy.S +++ b/lib/libc/arch/arm/string/bcopy.S @@ -1,4 +1,4 @@ -/* $OpenBSD: bcopy.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ +/* $OpenBSD: bcopy.S,v 1.6 2017/10/29 02:21:33 guenther Exp $ */ /* $NetBSD: bcopy.S,v 1.2 2001/07/16 05:50:06 matt Exp $ */ /*- @@ -39,5 +39,5 @@ ENTRY(bcopy) eor r0, r1, r0 eor r1, r0, r1 eor r0, r1, r0 - b _HIDDEN(_memcpy) + b _memcpy END_WEAK(bcopy) diff --git a/lib/libc/arch/arm/string/memcpy.S b/lib/libc/arch/arm/string/memcpy.S index 2b2d46004e6..d1f557980a7 100644 --- a/lib/libc/arch/arm/string/memcpy.S +++ b/lib/libc/arch/arm/string/memcpy.S @@ -1,4 +1,4 @@ -/* $OpenBSD: memcpy.S,v 1.6 2016/08/06 19:16:09 guenther Exp $ */ +/* $OpenBSD: memcpy.S,v 1.7 2017/10/29 02:21:33 guenther Exp $ */ /* $NetBSD: memcpy.S,v 1.3 2003/04/05 23:08:52 bjh21 Exp $ */ /*- @@ -40,6 +40,6 @@ ENTRY(memcpy) stmfd sp!, {r0, lr} - bl _HIDDEN(_memcpy) + bl _memcpy ldmfd sp!, {r0, pc} END_STRONG(memcpy) diff --git a/lib/libc/arch/arm/string/memmove.S b/lib/libc/arch/arm/string/memmove.S index 895c6af5797..95eca35bbde 100644 --- a/lib/libc/arch/arm/string/memmove.S +++ b/lib/libc/arch/arm/string/memmove.S @@ -1,4 +1,4 @@ -/* $OpenBSD: memmove.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ +/* $OpenBSD: memmove.S,v 1.6 2017/10/29 02:21:33 guenther Exp $ */ /* $NetBSD: memmove.S,v 1.3 2003/04/05 23:08:52 bjh21 Exp $ */ /*- @@ -34,6 +34,6 @@ ENTRY(memmove) stmfd sp!, {r0, lr} - bl _HIDDEN(_memcpy) + bl _memcpy ldmfd sp!, {r0, pc} END_STRONG(memmove) |