2002-09-17 23:50:03 +00:00
|
|
|
/* Optimized strchr implementation for PowerPC64.
|
2019-01-01 00:11:28 +00:00
|
|
|
Copyright (C) 1997-2019 Free Software Foundation, Inc.
|
2002-09-17 23:50:03 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
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.
|
|
|
|
|
|
|
|
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
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
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
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
2002-09-17 23:50:03 +00:00
|
|
|
|
|
|
|
#include <sysdep.h>
|
|
|
|
|
|
|
|
/* See strlen.s for comments on how this works. */
|
|
|
|
|
|
|
|
/* char * [r3] strchr (const char *s [r3] , int c [r4] ) */
|
|
|
|
|
2017-04-11 17:18:35 +00:00
|
|
|
#ifndef STRCHR
|
|
|
|
# define STRCHR strchr
|
|
|
|
#endif
|
|
|
|
|
PowerPC64 ENTRY_TOCLESS
A number of functions in the sysdeps/powerpc/powerpc64/ tree don't use
or change r2, yet declare a global entry that sets up r2. This patch
fixes that problem, and consolidates the ENTRY and EALIGN macros.
* sysdeps/powerpc/powerpc64/sysdep.h: Formatting.
(NOPS, ENTRY_3): New macros.
(ENTRY): Rewrite.
(ENTRY_TOCLESS): Define.
(EALIGN, EALIGN_W_0, EALIGN_W_1, EALIGN_W_2, EALIGN_W_4, EALIGN_W_5,
EALIGN_W_6, EALIGN_W_7, EALIGN_W_8): Delete.
* sysdeps/powerpc/powerpc64/a2/memcpy.S: Replace EALIGN with ENTRY.
* sysdeps/powerpc/powerpc64/dl-trampoline.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_ceil.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_ceilf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_floor.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_floorf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_rint.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_rintf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_round.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_roundf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_trunc.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_truncf.S: Likewise.
* sysdeps/powerpc/powerpc64/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strstr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strcasestr.S: Likewise.
* sysdeps/powerpc/powerpc64/addmul_1.S: Use ENTRY_TOCLESS.
* sysdeps/powerpc/powerpc64/cell/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_copysign.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_copysignl.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_fabsl.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_llrint.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_llrintf.S: Likewise.
* sysdeps/powerpc/powerpc64/lshift.S: Likewise.
* sysdeps/powerpc/powerpc64/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/mul_1.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S: Likewise.
* sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/add_n.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memmove.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/mempcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memrchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/rawmemchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strcasecmp.S (strcasecmp_l):
Likewise.
* sysdeps/powerpc/powerpc64/power7/strchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strchrnul.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strncpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strnlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strrchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strncpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strnlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strrchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strspn.S: Likewise.
* sysdeps/powerpc/powerpc64/power9/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power9/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/strchr.S: Likewise.
* sysdeps/powerpc/powerpc64/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/ppc-mcount.S: Store LR earlier. Don't
add nop when SHARED.
* sysdeps/powerpc/powerpc64/start.S: Fix comment.
* sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S (ENTRY): Don't
define.
(ENTRY_TOCLESS): Define.
* sysdeps/powerpc/powerpc32/sysdep.h (ENTRY_TOCLESS): Define.
* sysdeps/powerpc/fpu/s_fma.S: Use ENTRY_TOCLESS.
* sysdeps/powerpc/fpu/s_fmaf.S: Likewise.
2017-06-14 01:15:50 +00:00
|
|
|
ENTRY_TOCLESS (STRCHR)
|
2004-10-06 22:09:35 +00:00
|
|
|
CALL_MCOUNT 2
|
2002-09-17 23:50:03 +00:00
|
|
|
|
|
|
|
#define rTMP1 r0
|
|
|
|
#define rRTN r3 /* outgoing result */
|
2013-03-06 00:10:21 +00:00
|
|
|
#define rSTR r8 /* current word pointer */
|
|
|
|
#define rCHR r4 /* byte we're looking for, spread over the whole word */
|
|
|
|
#define rWORD r5 /* the current word */
|
2002-09-17 23:50:03 +00:00
|
|
|
#define rCLZB rCHR /* leading zero byte count */
|
2003-04-04 22:03:25 +00:00
|
|
|
#define rFEFE r6 /* constant 0xfefefefefefefeff (-0x0101010101010101) */
|
|
|
|
#define r7F7F r7 /* constant 0x7f7f7f7f7f7f7f7f */
|
2002-09-17 23:50:03 +00:00
|
|
|
#define rTMP2 r9
|
|
|
|
#define rIGN r10 /* number of bits we should ignore in the first word */
|
|
|
|
#define rMASK r11 /* mask with the bits to ignore set to 0 */
|
|
|
|
#define rTMP3 r12
|
2013-08-17 09:16:05 +00:00
|
|
|
#define rTMP4 rIGN
|
|
|
|
#define rTMP5 rMASK
|
2002-09-17 23:50:03 +00:00
|
|
|
|
2003-04-04 22:03:25 +00:00
|
|
|
dcbt 0,rRTN
|
2013-08-17 09:16:05 +00:00
|
|
|
insrdi rCHR, rCHR, 8, 48
|
2002-09-17 23:50:03 +00:00
|
|
|
li rMASK, -1
|
2013-08-17 09:16:05 +00:00
|
|
|
insrdi rCHR, rCHR, 16, 32
|
2003-04-04 22:03:25 +00:00
|
|
|
rlwinm rIGN, rRTN, 3, 26, 28
|
|
|
|
insrdi rCHR, rCHR, 32, 0
|
2002-09-17 23:50:03 +00:00
|
|
|
lis rFEFE, -0x101
|
|
|
|
lis r7F7F, 0x7f7f
|
2003-04-04 22:03:25 +00:00
|
|
|
clrrdi rSTR, rRTN, 3
|
2002-09-17 23:50:03 +00:00
|
|
|
addi rFEFE, rFEFE, -0x101
|
|
|
|
addi r7F7F, r7F7F, 0x7f7f
|
2003-04-04 22:03:25 +00:00
|
|
|
sldi rTMP1, rFEFE, 32
|
|
|
|
insrdi r7F7F, r7F7F, 32, 0
|
|
|
|
add rFEFE, rFEFE, rTMP1
|
2002-09-17 23:50:03 +00:00
|
|
|
/* Test the first (partial?) word. */
|
2003-04-04 22:03:25 +00:00
|
|
|
ld rWORD, 0(rSTR)
|
2013-08-17 09:16:05 +00:00
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
sld rMASK, rMASK, rIGN
|
|
|
|
#else
|
2003-04-04 22:03:25 +00:00
|
|
|
srd rMASK, rMASK, rIGN
|
2013-08-17 09:16:05 +00:00
|
|
|
#endif
|
2002-09-17 23:50:03 +00:00
|
|
|
orc rWORD, rWORD, rMASK
|
|
|
|
add rTMP1, rFEFE, rWORD
|
|
|
|
nor rTMP2, r7F7F, rWORD
|
2013-08-17 09:16:05 +00:00
|
|
|
and. rTMP4, rTMP1, rTMP2
|
2002-09-17 23:50:03 +00:00
|
|
|
xor rTMP3, rCHR, rWORD
|
|
|
|
orc rTMP3, rTMP3, rMASK
|
|
|
|
b L(loopentry)
|
|
|
|
|
|
|
|
/* The loop. */
|
|
|
|
|
2013-08-17 09:16:05 +00:00
|
|
|
L(loop):
|
|
|
|
ldu rWORD, 8(rSTR)
|
|
|
|
and. rTMP5, rTMP1, rTMP2
|
2002-09-17 23:50:03 +00:00
|
|
|
/* Test for 0. */
|
2013-08-17 09:16:05 +00:00
|
|
|
add rTMP1, rFEFE, rWORD /* x - 0x01010101. */
|
|
|
|
nor rTMP2, r7F7F, rWORD /* ~(x | 0x7f7f7f7f) == ~x & 0x80808080. */
|
2002-09-17 23:50:03 +00:00
|
|
|
bne L(foundit)
|
2013-08-17 09:16:05 +00:00
|
|
|
and. rTMP4, rTMP1, rTMP2 /* (x - 0x01010101) & ~x & 0x80808080. */
|
2002-09-17 23:50:03 +00:00
|
|
|
/* Start test for the bytes we're looking for. */
|
|
|
|
xor rTMP3, rCHR, rWORD
|
|
|
|
L(loopentry):
|
|
|
|
add rTMP1, rFEFE, rTMP3
|
|
|
|
nor rTMP2, r7F7F, rTMP3
|
|
|
|
beq L(loop)
|
2013-08-17 09:16:05 +00:00
|
|
|
|
2002-09-17 23:50:03 +00:00
|
|
|
/* There is a zero byte in the word, but may also be a matching byte (either
|
|
|
|
before or after the zero byte). In fact, we may be looking for a
|
2013-08-17 09:16:05 +00:00
|
|
|
zero byte, in which case we return a match. */
|
|
|
|
and. rTMP5, rTMP1, rTMP2
|
2002-09-17 23:50:03 +00:00
|
|
|
li rRTN, 0
|
|
|
|
beqlr
|
2013-08-17 09:16:05 +00:00
|
|
|
/* At this point:
|
|
|
|
rTMP5 bytes are 0x80 for each match of c, 0 otherwise.
|
|
|
|
rTMP4 bytes are 0x80 for each match of 0, 0 otherwise.
|
|
|
|
But there may be false matches in the next most significant byte from
|
|
|
|
a true match due to carries. This means we need to recalculate the
|
|
|
|
matches using a longer method for big-endian. */
|
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
addi rTMP1, rTMP5, -1
|
|
|
|
andc rTMP1, rTMP1, rTMP5
|
|
|
|
cntlzd rCLZB, rTMP1
|
|
|
|
addi rTMP2, rTMP4, -1
|
|
|
|
andc rTMP2, rTMP2, rTMP4
|
|
|
|
cmpld rTMP1, rTMP2
|
|
|
|
bgtlr
|
|
|
|
subfic rCLZB, rCLZB, 64-7
|
|
|
|
#else
|
|
|
|
/* I think we could reduce this by two instructions by keeping the "nor"
|
|
|
|
results from the loop for reuse here. See strlen.S tail. Similarly
|
|
|
|
one instruction could be pruned from L(foundit). */
|
2002-09-17 23:50:03 +00:00
|
|
|
and rFEFE, r7F7F, rWORD
|
2013-08-17 09:16:05 +00:00
|
|
|
or rTMP5, r7F7F, rWORD
|
2002-09-17 23:50:03 +00:00
|
|
|
and rTMP1, r7F7F, rTMP3
|
2013-08-17 09:16:05 +00:00
|
|
|
or rTMP4, r7F7F, rTMP3
|
2002-09-17 23:50:03 +00:00
|
|
|
add rFEFE, rFEFE, r7F7F
|
|
|
|
add rTMP1, rTMP1, r7F7F
|
2013-08-17 09:16:05 +00:00
|
|
|
nor rWORD, rTMP5, rFEFE
|
|
|
|
nor rTMP2, rTMP4, rTMP1
|
|
|
|
cntlzd rCLZB, rTMP2
|
2003-04-04 22:03:25 +00:00
|
|
|
cmpld rWORD, rTMP2
|
2002-09-17 23:50:03 +00:00
|
|
|
bgtlr
|
2013-08-17 09:16:05 +00:00
|
|
|
#endif
|
2003-04-04 22:03:25 +00:00
|
|
|
srdi rCLZB, rCLZB, 3
|
2002-09-17 23:50:03 +00:00
|
|
|
add rRTN, rSTR, rCLZB
|
|
|
|
blr
|
|
|
|
|
|
|
|
L(foundit):
|
2013-08-17 09:16:05 +00:00
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
addi rTMP1, rTMP5, -1
|
|
|
|
andc rTMP1, rTMP1, rTMP5
|
|
|
|
cntlzd rCLZB, rTMP1
|
|
|
|
subfic rCLZB, rCLZB, 64-7-64
|
|
|
|
sradi rCLZB, rCLZB, 3
|
|
|
|
#else
|
2002-09-17 23:50:03 +00:00
|
|
|
and rTMP1, r7F7F, rTMP3
|
2013-08-17 09:16:05 +00:00
|
|
|
or rTMP4, r7F7F, rTMP3
|
2002-09-17 23:50:03 +00:00
|
|
|
add rTMP1, rTMP1, r7F7F
|
2013-08-17 09:16:05 +00:00
|
|
|
nor rTMP2, rTMP4, rTMP1
|
2003-04-04 22:03:25 +00:00
|
|
|
cntlzd rCLZB, rTMP2
|
|
|
|
subi rSTR, rSTR, 8
|
|
|
|
srdi rCLZB, rCLZB, 3
|
2013-08-17 09:16:05 +00:00
|
|
|
#endif
|
2002-09-17 23:50:03 +00:00
|
|
|
add rRTN, rSTR, rCLZB
|
|
|
|
blr
|
2017-04-11 17:18:35 +00:00
|
|
|
END (STRCHR)
|
2002-09-17 23:50:03 +00:00
|
|
|
|
2013-03-06 00:10:21 +00:00
|
|
|
weak_alias (strchr, index)
|
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 (strchr)
|