diff options
| author | Greg McGary <greg@mcgary.org> | 2000-07-17 22:36:16 +0000 |
|---|---|---|
| committer | Greg McGary <greg@mcgary.org> | 2000-07-17 22:36:16 +0000 |
| commit | abf7063390f46bd484d00c6a2d103a52cf058bd6 (patch) | |
| tree | fc3612b3b585b249f591e451c1252b2bf697a30e /sysdeps/sparc | |
| parent | 916c1395e160f7a4ea2c3f736982a5975c44b5af (diff) | |
| download | glibc-abf7063390f46bd484d00c6a2d103a52cf058bd6.tar glibc-abf7063390f46bd484d00c6a2d103a52cf058bd6.tar.gz glibc-abf7063390f46bd484d00c6a2d103a52cf058bd6.tar.bz2 glibc-abf7063390f46bd484d00c6a2d103a52cf058bd6.zip | |
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
Diffstat (limited to 'sysdeps/sparc')
| -rw-r--r-- | sysdeps/sparc/sparc32/memchr.S | 8 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/memchr.S | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sysdeps/sparc/sparc32/memchr.S b/sysdeps/sparc/sparc32/memchr.S index 270216e6d8..b770af1575 100644 --- a/sysdeps/sparc/sparc32/memchr.S +++ b/sysdeps/sparc/sparc32/memchr.S @@ -1,7 +1,7 @@ /* memchr (str, ch, n) -- Return pointer to first occurrence of CH in STR less than N. For SPARC v7. - Copyright (C) 1996,1999 Free Software Foundation, Inc. + Copyright (C) 1996,1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jj@ultra.linux.cz> and David S. Miller <davem@caip.rutgers.edu>. @@ -67,7 +67,7 @@ 1: retl sub %o0, 1, %o0 -ENTRY(memchr) +ENTRY(__memchr) andcc %o1, 0xff, %o1 sll %o1, 8, %g7 andcc %o0, 3, %g0 @@ -140,4 +140,6 @@ ENTRY(memchr) sub %o0, 3, %o0 4: retl sub %o0, 4, %o0 -END(memchr) +END(__memchr) + +weak_alias (__memchr, memchr) diff --git a/sysdeps/sparc/sparc64/memchr.S b/sysdeps/sparc/sparc64/memchr.S index 1662f60d88..36446b6259 100644 --- a/sysdeps/sparc/sparc64/memchr.S +++ b/sysdeps/sparc/sparc64/memchr.S @@ -1,7 +1,7 @@ /* memchr (str, ch, n) -- Return pointer to first occurrence of CH in STR less than N. For SPARC v9. - Copyright (C) 1998,1999 Free Software Foundation, Inc. + Copyright (C) 1998,1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jan Vondrak <jvon4518@ss1000.ms.mff.cuni.cz> and Jakub Jelinek <jj@ultra.linux.cz>. @@ -57,7 +57,7 @@ .text .align 32 -ENTRY(memchr) +ENTRY(__memchr) and %o1, 0xff, %o1 /* IEU0 Group */ #ifdef USE_BPR brz,pn %o2, 12f /* CTI+IEU1 */ @@ -256,4 +256,6 @@ ENTRY(memchr) 23: retl /* CTI+IEU1 Group */ add %o0, -1, %o0 /* IEU0 */ -END(memchr) +END(__memchr) + +weak_alias (__memchr, memchr) |