1999-03-29 13:25:15 +00:00
|
|
|
/* memchr (str, ch, n) -- Return pointer to first occurrence of CH in STR less
|
|
|
|
than N.
|
|
|
|
For SPARC v9.
|
2020-01-01 00:14:33 +00:00
|
|
|
Copyright (C) 1998-2020 Free Software Foundation, Inc.
|
1999-03-29 13:25:15 +00:00
|
|
|
This file is part of the GNU C Library.
|
2019-08-23 20:07:38 +00:00
|
|
|
Contributed by Jan Vondrák <jvon4518@ss1000.ms.mff.cuni.cz> and
|
1999-03-29 13:25:15 +00:00
|
|
|
Jakub Jelinek <jj@ultra.linux.cz>.
|
|
|
|
This version is developed using the same algorithm as the fast C
|
|
|
|
version which carries the following introduction:
|
|
|
|
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
|
|
|
|
with help from Dan Sahlin (dan@sics.se) and
|
|
|
|
commentary by Jim Blandy (jimb@ai.mit.edu);
|
|
|
|
adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
|
|
|
|
and implemented by Roland McGrath (roland@ai.mit.edu).
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1999-03-29 13:25:15 +00:00
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1999-03-29 13:25:15 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1999-03-29 13:25:15 +00:00
|
|
|
|
|
|
|
#include <sysdep.h>
|
|
|
|
#include <asm/asi.h>
|
|
|
|
#ifndef XCC
|
|
|
|
#define XCC xcc
|
|
|
|
#define USE_BPR
|
1999-07-27 04:43:32 +00:00
|
|
|
.register %g2, #scratch
|
|
|
|
.register %g3, #scratch
|
1999-03-29 13:25:15 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Normally, this uses
|
|
|
|
((xword - 0x0101010101010101) & 0x8080808080808080) test
|
|
|
|
to find out if any byte in xword could be zero. This is fast, but
|
|
|
|
also gives false alarm for any byte in range 0x81-0xff. It does
|
|
|
|
not matter for correctness, as if this test tells us there could
|
|
|
|
be some zero byte, we check it byte by byte, but if bytes with
|
|
|
|
high bits set are common in the strings, then this will give poor
|
|
|
|
performance. You can #define EIGHTBIT_NOT_RARE and the algorithm
|
|
|
|
will use one tick slower, but more precise test
|
|
|
|
((xword - 0x0101010101010101) & (~xword) & 0x8080808080808080),
|
|
|
|
which does not give any false alarms (but if some bits are set,
|
|
|
|
one cannot assume from it which bytes are zero and which are not).
|
|
|
|
It is yet to be measured, what is the correct default for glibc
|
|
|
|
in these days for an average user.
|
|
|
|
*/
|
|
|
|
|
|
|
|
.text
|
|
|
|
.align 32
|
* 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.
2000-07-17 22:36:16 +00:00
|
|
|
ENTRY(__memchr)
|
1999-05-18 10:00:20 +00:00
|
|
|
and %o1, 0xff, %o1 /* IEU0 Group */
|
1999-03-29 13:25:15 +00:00
|
|
|
#ifdef USE_BPR
|
|
|
|
brz,pn %o2, 12f /* CTI+IEU1 */
|
|
|
|
#else
|
|
|
|
tst %o2 /* IEU1 */
|
|
|
|
be,pn %XCC, 12f /* CTI */
|
|
|
|
#endif
|
1999-05-18 10:00:20 +00:00
|
|
|
sll %o1, 8, %g3 /* IEU0 Group */
|
2015-04-17 02:40:31 +00:00
|
|
|
addcc %o0, %o2, %o2 /* IEU1 */
|
|
|
|
movcs %XCC, -1, %o2 /* IEU0 Group */
|
1999-03-29 13:25:15 +00:00
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
sethi %hi(0x01010101), %g1 /* IEU0 Group */
|
|
|
|
or %g3, %o1, %g3 /* IEU1 */
|
1999-03-29 13:25:15 +00:00
|
|
|
ldub [%o0], %o3 /* Load */
|
|
|
|
sllx %g3, 16, %g5 /* IEU0 Group */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
or %g1, %lo(0x01010101), %g1 /* IEU1 */
|
1999-03-29 13:25:15 +00:00
|
|
|
sllx %g1, 32, %g2 /* IEU0 Group */
|
|
|
|
or %g3, %g5, %g3 /* IEU1 */
|
|
|
|
sllx %g3, 32, %g5 /* IEU0 Group */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
cmp %o3, %o1 /* IEU1 */
|
1999-03-29 13:25:15 +00:00
|
|
|
be,pn %xcc, 13f /* CTI */
|
|
|
|
or %g1, %g2, %g1 /* IEU0 Group */
|
|
|
|
andcc %o0, 7, %g0 /* IEU1 */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
bne,a,pn %icc, 21f /* CTI */
|
1999-03-29 13:25:15 +00:00
|
|
|
add %o0, 1, %o0 /* IEU0 Group */
|
|
|
|
ldx [%o0], %o3 /* Load Group */
|
|
|
|
sllx %g1, 7, %g2 /* IEU0 */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
or %g3, %g5, %g3 /* IEU1 */
|
1999-03-29 13:25:15 +00:00
|
|
|
1: add %o0, 8, %o0 /* IEU0 Group */
|
|
|
|
xor %o3, %g3, %o4 /* IEU1 */
|
|
|
|
/* %g1 = 0101010101010101 *
|
|
|
|
* %g2 = 8080088080808080 *
|
|
|
|
* %g3 = c c c c c c c c *
|
|
|
|
* %o3 = value *
|
|
|
|
* %o4 = value XOR c */
|
|
|
|
2: cmp %o0, %o2 /* IEU1 Group */
|
|
|
|
|
2010-02-20 21:42:07 +00:00
|
|
|
bgu,pn %XCC, 11f /* CTI */
|
1999-03-29 13:25:15 +00:00
|
|
|
ldxa [%o0] ASI_PNF, %o3 /* Load */
|
|
|
|
sub %o4, %g1, %o5 /* IEU0 Group */
|
|
|
|
add %o0, 8, %o0 /* IEU1 */
|
|
|
|
#ifdef EIGHTBIT_NOT_RARE
|
|
|
|
andn %o5, %o4, %o5 /* IEU0 Group */
|
|
|
|
#endif
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
andcc %o5, %g2, %g0 /* IEU1 Group */
|
1999-03-29 13:25:15 +00:00
|
|
|
be,a,pt %xcc, 2b /* CTI */
|
|
|
|
xor %o3, %g3, %o4 /* IEU0 */
|
|
|
|
srlx %o4, 56, %g5 /* IEU0 */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
1999-03-29 13:25:15 +00:00
|
|
|
be,pn %icc, 3f /* CTI */
|
|
|
|
srlx %o4, 48, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
be,pn %icc, 4f /* CTI */
|
1999-03-29 13:25:15 +00:00
|
|
|
srlx %o4, 40, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 5f /* CTI */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
srlx %o4, 32, %g5 /* IEU0 */
|
1999-03-29 13:25:15 +00:00
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 6f /* CTI */
|
|
|
|
srlx %o4, 24, %g5 /* IEU0 */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
1999-03-29 13:25:15 +00:00
|
|
|
be,pn %icc, 7f /* CTI */
|
|
|
|
srlx %o4, 16, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
be,pn %icc, 8f /* CTI */
|
1999-03-29 13:25:15 +00:00
|
|
|
srlx %o4, 8, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 9f /* CTI */
|
|
|
|
|
1999-05-18 10:00:20 +00:00
|
|
|
andcc %o4, 0xff, %g0 /* IEU1 Group */
|
1999-03-29 13:25:15 +00:00
|
|
|
bne,pt %icc, 2b /* CTI */
|
|
|
|
xor %o3, %g3, %o4 /* IEU0 */
|
|
|
|
retl /* CTI+IEU1 Group */
|
1999-05-18 10:00:20 +00:00
|
|
|
|
1999-03-29 13:25:15 +00:00
|
|
|
add %o0, -9, %o0 /* IEU0 */
|
|
|
|
|
|
|
|
.align 16
|
|
|
|
3: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -16, %o0 /* IEU0 */
|
|
|
|
4: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -15, %o0 /* IEU0 */
|
|
|
|
|
|
|
|
5: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -14, %o0 /* IEU0 */
|
|
|
|
6: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -13, %o0 /* IEU0 */
|
|
|
|
|
|
|
|
7: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -12, %o0 /* IEU0 */
|
|
|
|
8: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -11, %o0 /* IEU0 */
|
|
|
|
|
|
|
|
9: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -10, %o0 /* IEU0 */
|
|
|
|
11: sub %o4, %g1, %o5 /* IEU0 Group */
|
|
|
|
sub %o0, 8, %o0 /* IEU1 */
|
|
|
|
|
|
|
|
andcc %o5, %g2, %g0 /* IEU1 Group */
|
|
|
|
be,pt %xcc, 12f /* CTI */
|
|
|
|
sub %o2, %o0, %o2 /* IEU0 */
|
|
|
|
tst %o2 /* IEU1 Group */
|
|
|
|
|
|
|
|
be,pn %XCC, 12f /* CTI */
|
|
|
|
srlx %o4, 56, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 13f /* CTI */
|
|
|
|
|
|
|
|
cmp %o2, 1 /* IEU0 */
|
|
|
|
be,pn %XCC, 12f /* CTI Group */
|
|
|
|
srlx %o4, 48, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
|
|
|
|
be,pn %icc, 14f /* CTI */
|
|
|
|
cmp %o2, 2 /* IEU1 Group */
|
|
|
|
be,pn %XCC, 12f /* CTI */
|
|
|
|
srlx %o4, 40, %g5 /* IEU0 */
|
|
|
|
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 15f /* CTI */
|
|
|
|
cmp %o2, 3 /* IEU1 Group */
|
|
|
|
be,pn %XCC, 12f /* CTI */
|
|
|
|
|
|
|
|
srlx %o4, 32, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 16f /* CTI */
|
|
|
|
cmp %o2, 4 /* IEU1 Group */
|
|
|
|
|
|
|
|
be,pn %XCC, 12f /* CTI */
|
|
|
|
srlx %o4, 24, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 17f /* CTI */
|
|
|
|
|
|
|
|
cmp %o2, 5 /* IEU1 Group */
|
|
|
|
be,pn %XCC, 12f /* CTI */
|
|
|
|
srlx %o4, 16, %g5 /* IEU0 */
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
|
|
|
|
be,pn %icc, 18f /* CTI */
|
|
|
|
cmp %o2, 6 /* IEU1 Group */
|
|
|
|
be,pn %XCC, 12f /* CTI */
|
|
|
|
srlx %o4, 8, %g5 /* IEU0 */
|
|
|
|
|
|
|
|
andcc %g5, 0xff, %g0 /* IEU1 Group */
|
|
|
|
be,pn %icc, 19f /* CTI */
|
|
|
|
nop /* IEU0 */
|
|
|
|
12: retl /* CTI+IEU1 Group */
|
|
|
|
|
|
|
|
clr %o0 /* IEU0 */
|
|
|
|
nop /* Stub */
|
|
|
|
13: retl /* CTI+IEU1 Group */
|
|
|
|
nop /* IEU0 */
|
|
|
|
|
|
|
|
14: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, 1, %o0 /* IEU0 */
|
|
|
|
15: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, 2, %o0 /* IEU0 */
|
|
|
|
|
|
|
|
16: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, 3, %o0 /* IEU0 */
|
|
|
|
17: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, 4, %o0 /* IEU0 */
|
|
|
|
|
|
|
|
18: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, 5, %o0 /* IEU0 */
|
|
|
|
19: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, 6, %o0 /* IEU0 */
|
|
|
|
|
|
|
|
21: cmp %o0, %o2 /* IEU1 */
|
|
|
|
be,pn %XCC, 12b /* CTI */
|
|
|
|
sllx %g1, 7, %g2 /* IEU0 Group */
|
|
|
|
ldub [%o0], %o3 /* Load */
|
|
|
|
|
|
|
|
or %g3, %g5, %g3 /* IEU1 */
|
|
|
|
22: andcc %o0, 7, %g0 /* IEU1 Group */
|
|
|
|
be,a,pn %icc, 1b /* CTI */
|
|
|
|
ldx [%o0], %o3 /* Load */
|
|
|
|
|
|
|
|
cmp %o3, %o1 /* IEU1 Group */
|
|
|
|
be,pn %xcc, 23f /* CTI */
|
|
|
|
add %o0, 1, %o0 /* IEU0 */
|
|
|
|
cmp %o0, %o2 /* IEU1 Group */
|
|
|
|
|
|
|
|
bne,a,pt %XCC, 22b /* CTI */
|
|
|
|
ldub [%o0], %o3 /* Load */
|
|
|
|
retl /* CTI+IEU1 Group */
|
|
|
|
clr %o0 /* IEU0 */
|
|
|
|
|
|
|
|
23: retl /* CTI+IEU1 Group */
|
|
|
|
add %o0, -1, %o0 /* IEU0 */
|
* 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.
2000-07-17 22:36:16 +00:00
|
|
|
END(__memchr)
|
|
|
|
|
|
|
|
weak_alias (__memchr, memchr)
|
Update.
* sysdeps/i386/fpu/ftestexcept.c: Also check SSE status word.
* include/signal.h: Use libc_hidden_proto for sigaddset and sigdelset.
* signal/sigaddset.c: Add libc_hidden_def.
* signal/sigdelset.c: Likewise.
2003-04-29 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/i486/string-inlines.c (__memcpy_g, __strchr_g): Move
to the end of the file.
* configure.in: Change __oline__ to $LINENO.
(HAVE_BUILTIN_REDIRECTION): New check.
* config.h.in (HAVE_BUILTIN_REDIRECTION): Add.
* include/libc-symbols.h (libc_hidden_builtin_proto,
libc_hidden_builtin_def, libc_hidden_builtin_weak,
libc_hidden_builtin_ver): Define.
* include/string.h (memchr, memcpy, memmove, memset, strcat, strchr,
strcmp, strcpy, strcspn, strlen, strncmp, strncpy, strpbrk, strrchr,
strspn, strstr): Add libc_hidden_builtin_proto.
* intl/plural.y: Include string.h.
* sysdeps/alpha/alphaev6/memchr.S (memchr): Add
libc_hidden_builtin_def.
* sysdeps/alpha/alphaev6/memcpy.S (memcpy): Likewise.
* sysdeps/alpha/alphaev6/memset.S (memset): Likewise.
* sysdeps/alpha/alphaev67/strcat.S (strcat): Likewise.
* sysdeps/alpha/alphaev67/strchr.S (strchr): Likewise.
* sysdeps/alpha/alphaev67/strlen.S (strlen): Likewise.
* sysdeps/alpha/alphaev67/strrchr.S (strrchr): Likewise.
* sysdeps/alpha/memchr.S (memchr): Likewise.
* sysdeps/alpha/memset.S (memset): Likewise.
* sysdeps/alpha/strcat.S (strcat): Likewise.
* sysdeps/alpha/strchr.S (strchr): Likewise.
* sysdeps/alpha/strcmp.S (strcmp): Likewise.
* sysdeps/alpha/strcpy.S (strcpy): Likewise.
* sysdeps/alpha/strlen.S (strlen): Likewise.
* sysdeps/alpha/strncmp.S (strncmp): Likewise.
* sysdeps/alpha/strncpy.S (strncpy): Likewise.
* sysdeps/alpha/strrchr.S (strrchr): Likewise.
* sysdeps/arm/memset.S (memset): Likewise.
* sysdeps/arm/strlen.S (strlen): Likewise.
* sysdeps/generic/memchr.c (memchr): Likewise.
* sysdeps/generic/memcpy.c (memcpy): Likewise.
* sysdeps/generic/memmove.c (memmove): Likewise.
* sysdeps/generic/memset.c (memset): Likewise.
* sysdeps/generic/strcat.c (strcat): Likewise.
* sysdeps/generic/strchr.c (strchr): Likewise.
* sysdeps/generic/strcmp.c (strcmp): Likewise.
* sysdeps/generic/strcpy.c (strcpy): Likewise.
* sysdeps/generic/strcspn.c (strcspn): Likewise.
* sysdeps/generic/strlen.c (strlen): Likewise.
* sysdeps/generic/strncmp.c (strncmp): Likewise.
* sysdeps/generic/strncpy.c (strncpy): Likewise.
* sysdeps/generic/strpbrk.c (strpbrk): Likewise.
* sysdeps/generic/strrchr.c (strrchr): Likewise.
* sysdeps/generic/strspn.c (strspn): Likewise.
* sysdeps/generic/strstr.c (strstr): Likewise.
* sysdeps/i386/i486/strcat.S (strcat): Likewise.
* sysdeps/i386/i486/strlen.S (strlen): Likewise.
* sysdeps/i386/i586/memcpy.S (memcpy): Likewise.
* sysdeps/i386/i586/memset.S (memset): Likewise.
* sysdeps/i386/i586/strchr.S (strchr): Likewise.
* sysdeps/i386/i586/strcpy.S (strcpy): Likewise.
* sysdeps/i386/i586/strlen.S (strlen): Likewise.
* sysdeps/i386/i686/memcpy.S (memcpy): Likewise.
* sysdeps/i386/i686/memmove.S (memmove): Likewise.
* sysdeps/i386/i686/memset.S (memset): Likewise.
* sysdeps/i386/i686/strcmp.S (strcmp): Likewise.
* sysdeps/i386/memchr.S (memchr): Likewise.
* sysdeps/i386/memset.c (memset): Likewise.
* sysdeps/i386/strchr.S (strchr): Likewise.
* sysdeps/i386/strcspn.S (strcspn): Likewise.
* sysdeps/i386/strlen.c (strlen): Likewise.
* sysdeps/i386/strpbrk.S (strpbrk): Likewise.
* sysdeps/i386/strrchr.S (strrchr): Likewise.
* sysdeps/i386/strspn.S (strspn): Likewise.
* sysdeps/ia64/memchr.S (memchr): Likewise.
* sysdeps/ia64/memcpy.S (memcpy): Likewise.
* sysdeps/ia64/memmove.S (memmove): Likewise.
* sysdeps/ia64/memset.S (memset): Likewise.
* sysdeps/ia64/strcat.S (strcat): Likewise.
* sysdeps/ia64/strchr.S (strchr): Likewise.
* sysdeps/ia64/strcmp.S (strcmp): Likewise.
* sysdeps/ia64/strcpy.S (strcpy): Likewise.
* sysdeps/ia64/strlen.S (strlen): Likewise.
* sysdeps/ia64/strncmp.S (strncmp): Likewise.
* sysdeps/ia64/strncpy.S (strncpy): Likewise.
* sysdeps/m68k/memchr.S (memchr): Likewise.
* sysdeps/m68k/strchr.S (strchr): Likewise.
* sysdeps/mips/mips64/memcpy.S (memcpy): Likewise.
* sysdeps/mips/mips64/memset.S (memset): Likewise.
* sysdeps/mips/memcpy.S (memcpy): Likewise.
* sysdeps/mips/memset.S (memset): Likewise.
* sysdeps/powerpc/powerpc32/memset.S (memset): Likewise.
* sysdeps/powerpc/powerpc32/strchr.S (strchr): Likewise.
* sysdeps/powerpc/powerpc32/strcmp.S (strcmp): Likewise.
* sysdeps/powerpc/powerpc32/strcpy.S (strcpy): Likewise.
* sysdeps/powerpc/powerpc32/strlen.S (strlen): Likewise.
* sysdeps/powerpc/powerpc64/memcpy.S (memcpy): Likewise.
* sysdeps/powerpc/powerpc64/memset.S (memset): Likewise.
* sysdeps/powerpc/powerpc64/strchr.S (strchr): Likewise.
* sysdeps/powerpc/powerpc64/strcmp.S (strcmp): Likewise.
* sysdeps/powerpc/powerpc64/strcpy.S (strcpy): Likewise.
* sysdeps/powerpc/powerpc64/strlen.S (strlen): Likewise.
* sysdeps/powerpc/strcat.c (strcat): Likewise.
* sysdeps/sparc/sparc32/memchr.S (memchr): Likewise.
* sysdeps/sparc/sparc32/memcpy.S (memcpy): Likewise.
* sysdeps/sparc/sparc32/memset.S (memset): Likewise.
* sysdeps/sparc/sparc32/strcat.S (strcat): Likewise.
* sysdeps/sparc/sparc32/strchr.S (strchr, strrchr): Likewise.
* sysdeps/sparc/sparc32/strcmp.S (strcmp): Likewise.
* sysdeps/sparc/sparc32/strcpy.S (strcpy): Likewise.
* sysdeps/sparc/sparc32/strlen.S (strlen): Likewise.
* sysdeps/sparc/sparc64/sparcv9b/memcpy.S (memcpy, memmove): Likewise.
* sysdeps/sparc/sparc64/memchr.S (memchr): Likewise.
* sysdeps/sparc/sparc64/memcpy.S (memcpy, memmove): Likewise.
* sysdeps/sparc/sparc64/memset.S (memset): Likewise.
* sysdeps/sparc/sparc64/strcat.S (strcat): Likewise.
* sysdeps/sparc/sparc64/strchr.S (strchr, strrchr): Likewise.
* sysdeps/sparc/sparc64/strcmp.S (strcmp): Likewise.
* sysdeps/sparc/sparc64/strcpy.S (strcpy): Likewise.
* sysdeps/sparc/sparc64/strcspn.S (strcspn): Likewise.
* sysdeps/sparc/sparc64/strlen.S (strlen): Likewise.
* sysdeps/sparc/sparc64/strncmp.S (strncmp): Likewise.
* sysdeps/sparc/sparc64/strncpy.S (strncpy): Likewise.
* sysdeps/sparc/sparc64/strpbrk.S (strpbrk): Likewise.
* sysdeps/sparc/sparc64/strspn.S (strspn): Likewise.
* sysdeps/sh/memcpy.S (memcpy): Likewise.
* sysdeps/sh/memset.S (memset): Likewise.
* sysdeps/sh/strlen.S (strlen): Likewise.
* sysdeps/s390/s390-32/memchr.S (memchr): Likewise.
* sysdeps/s390/s390-32/memcpy.S (memcpy): Likewise.
* sysdeps/s390/s390-32/memset.S (memset): Likewise.
* sysdeps/s390/s390-32/strcmp.S (strcmp): Likewise.
* sysdeps/s390/s390-32/strcpy.S (strcpy): Likewise.
* sysdeps/s390/s390-32/strncpy.S (strncpy): Likewise.
* sysdeps/s390/s390-64/memchr.S (memchr): Likewise.
* sysdeps/s390/s390-64/memcpy.S (memcpy): Likewise.
* sysdeps/s390/s390-64/memset.S (memset): Likewise.
* sysdeps/s390/s390-64/strcmp.S (strcmp): Likewise.
* sysdeps/s390/s390-64/strcpy.S (strcpy): Likewise.
* sysdeps/s390/s390-64/strncpy.S (strncpy): Likewise.
* sysdeps/x86_64/memcpy.S (memcpy): Likewise.
* sysdeps/x86_64/memset.S (memset): Likewise.
* sysdeps/x86_64/strcat.S (strcat): Likewise.
* sysdeps/x86_64/strchr.S (strchr): Likewise.
* sysdeps/x86_64/strcmp.S (strcmp): Likewise.
* sysdeps/x86_64/strcpy.S (strcpy): Likewise.
* sysdeps/x86_64/strcspn.S (strcspn): Likewise.
* sysdeps/x86_64/strlen.S (strlen): Likewise.
* sysdeps/x86_64/strspn.S (strspn): Likewise.
* string/string-inlines.c: Move...
* sysdeps/generic/string-inlines.c: ...here.
(__memcpy_g, __strchr_g): Remove.
(__NO_INLINE__): Define before including <string.h>,
undefine after. Include bits/string.h and bits/string2.h.
* sysdeps/i386/i486/string-inlines.c: New file.
* sysdeps/i386/string-inlines.c: New file.
* sysdeps/i386/i486/Versions: Remove.
All GLIBC_2.1.1 symbols moved...
* sysdeps/i386/Versions (libc): ...here.
2003-04-29 Ulrich Drepper <drepper@redhat.com>
2003-04-29 22:49:58 +00:00
|
|
|
libc_hidden_builtin_def (memchr)
|