diff options
Diffstat (limited to 'lib/libc/arch/arm/string')
-rw-r--r-- | lib/libc/arch/arm/string/_memcpy.S | 6 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/bcopy.S | 6 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/bzero.S | 6 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/ffs.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/memcmp.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/memcpy.S | 6 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/memmove.S | 6 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/memset.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/strcmp.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/arm/string/strncmp.S | 4 |
10 files changed, 25 insertions, 25 deletions
diff --git a/lib/libc/arch/arm/string/_memcpy.S b/lib/libc/arch/arm/string/_memcpy.S index ef2ccc442b9..18c074ea705 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.5 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: _memcpy.S,v 1.6 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: _memcpy.S,v 1.4 2003/04/05 23:08:52 bjh21 Exp $ */ /*- @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" /* * This is one fun bit of code ... @@ -462,4 +462,4 @@ ENTRY(_memcpy) .Lmemcpy_bsrcul1l4: add r1, r1, #1 b .Lmemcpy_bl4 -END(_memcpy) +END_STRONG(_memcpy) diff --git a/lib/libc/arch/arm/string/bcopy.S b/lib/libc/arch/arm/string/bcopy.S index f71b5ce7cbd..c08cb810bd7 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.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: bcopy.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: bcopy.S,v 1.2 2001/07/16 05:50:06 matt Exp $ */ /*- @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" /* bcopy = memcpy/memmove with arguments reversed. */ @@ -39,5 +39,5 @@ ENTRY(bcopy) eor r0, r1, r0 eor r1, r0, r1 eor r0, r1, r0 - b PIC_SYM(_C_LABEL(_memcpy), PLT) + b _HIDDEN(_memcpy) END_WEAK(bcopy) diff --git a/lib/libc/arch/arm/string/bzero.S b/lib/libc/arch/arm/string/bzero.S index 419e2bbdc9d..4fe7e9b7561 100644 --- a/lib/libc/arch/arm/string/bzero.S +++ b/lib/libc/arch/arm/string/bzero.S @@ -1,4 +1,4 @@ -/* $OpenBSD: bzero.S,v 1.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: bzero.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: bzero.S,v 1.2 2001/07/16 05:50:06 matt Exp $ */ /*- @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" ENTRY(bzero) mov r2, r1 mov r1, #0 - b PIC_SYM(_C_LABEL(memset), PLT) + b _HIDDEN(memset) END_WEAK(bzero) diff --git a/lib/libc/arch/arm/string/ffs.S b/lib/libc/arch/arm/string/ffs.S index 7f4b289d860..2091b32b6df 100644 --- a/lib/libc/arch/arm/string/ffs.S +++ b/lib/libc/arch/arm/string/ffs.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.S,v 1.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: ffs.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: ffs.S,v 1.5 2003/04/05 23:08:52 bjh21 Exp $ */ /* * Copyright (c) 2001 Christopher Gilbert @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" /* * ffs - find first set bit, this algorithm isolates the first set diff --git a/lib/libc/arch/arm/string/memcmp.S b/lib/libc/arch/arm/string/memcmp.S index f7c5c966663..cf50451af7d 100644 --- a/lib/libc/arch/arm/string/memcmp.S +++ b/lib/libc/arch/arm/string/memcmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: memcmp.S,v 1.5 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: memcmp.S,v 1.6 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: memcmp.S,v 1.2 2003/04/05 23:08:52 bjh21 Exp $ */ /* @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" ENTRY(memcmp) /* if (len == 0) return 0 */ diff --git a/lib/libc/arch/arm/string/memcpy.S b/lib/libc/arch/arm/string/memcpy.S index 5797c6d6f33..2b2d46004e6 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.5 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: memcpy.S,v 1.6 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: memcpy.S,v 1.3 2003/04/05 23:08:52 bjh21 Exp $ */ /*- @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" /* * XXX @@ -40,6 +40,6 @@ ENTRY(memcpy) stmfd sp!, {r0, lr} - bl PIC_SYM(_C_LABEL(_memcpy), PLT) + bl _HIDDEN(_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 c2f107e3cd8..895c6af5797 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.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: memmove.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: memmove.S,v 1.3 2003/04/05 23:08:52 bjh21 Exp $ */ /*- @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" ENTRY(memmove) stmfd sp!, {r0, lr} - bl PIC_SYM(_C_LABEL(_memcpy), PLT) + bl _HIDDEN(_memcpy) ldmfd sp!, {r0, pc} END_STRONG(memmove) diff --git a/lib/libc/arch/arm/string/memset.S b/lib/libc/arch/arm/string/memset.S index 5ab2f9f3bcd..573e924209d 100644 --- a/lib/libc/arch/arm/string/memset.S +++ b/lib/libc/arch/arm/string/memset.S @@ -1,4 +1,4 @@ -/* $OpenBSD: memset.S,v 1.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: memset.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: memset.S,v 1.3 2003/04/05 23:08:52 bjh21 Exp $ */ /* @@ -33,7 +33,7 @@ * SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" /* * Sets a block of memory to the specified value diff --git a/lib/libc/arch/arm/string/strcmp.S b/lib/libc/arch/arm/string/strcmp.S index 223610d0925..ecc3d2f53d6 100644 --- a/lib/libc/arch/arm/string/strcmp.S +++ b/lib/libc/arch/arm/string/strcmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strcmp.S,v 1.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: strcmp.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: strcmp.S,v 1.3 2003/04/05 23:08:52 bjh21 Exp $ */ /* @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" ENTRY(strcmp) 1: diff --git a/lib/libc/arch/arm/string/strncmp.S b/lib/libc/arch/arm/string/strncmp.S index 1014d5dc4ea..66ad6b7b43f 100644 --- a/lib/libc/arch/arm/string/strncmp.S +++ b/lib/libc/arch/arm/string/strncmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strncmp.S,v 1.5 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: strncmp.S,v 1.6 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: strncmp.S,v 1.2 2003/04/05 23:08:52 bjh21 Exp $ */ /* @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "SYS.h" +#include "DEFS.h" ENTRY(strncmp) /* if (len == 0) return 0 */ |