2002-08-31 19:45:33 +02:00
|
|
|
/* strchr (str, ch) -- Return pointer to first occurrence of CH in STR.
|
|
|
|
For AMD x86-64.
|
2004-12-22 21:10:10 +01:00
|
|
|
Copyright (C) 2002 Free Software Foundation, Inc.
|
2002-08-31 19:45:33 +02: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
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA. */
|
|
|
|
|
|
|
|
#include <sysdep.h>
|
|
|
|
#include "asm-syntax.h"
|
|
|
|
#include "bp-sym.h"
|
|
|
|
#include "bp-asm.h"
|
|
|
|
|
|
|
|
|
|
|
|
.text
|
|
|
|
ENTRY (BP_SYM (strchr))
|
|
|
|
|
|
|
|
/* Before we start with the main loop we process single bytes
|
|
|
|
until the source pointer is aligned. This has two reasons:
|
|
|
|
1. aligned 64-bit memory access is faster
|
|
|
|
and (more important)
|
|
|
|
2. we process in the main loop 64 bit in one step although
|
|
|
|
we don't know the end of the string. But accessing at
|
|
|
|
8-byte alignment guarantees that we never access illegal
|
|
|
|
memory if this would not also be done by the trivial
|
|
|
|
implementation (this is because all processor inherent
|
2002-11-12 22:43:26 +01:00
|
|
|
boundaries are multiples of 8). */
|
2002-08-31 19:45:33 +02:00
|
|
|
|
2002-11-12 22:43:26 +01:00
|
|
|
movq %rdi, %rdx
|
|
|
|
andl $7, %edx /* Mask alignment bits */
|
2002-08-31 19:45:33 +02:00
|
|
|
movq %rdi, %rax /* duplicate destination. */
|
|
|
|
jz 1f /* aligned => start loop */
|
2002-11-12 22:43:26 +01:00
|
|
|
neg %edx
|
|
|
|
addl $8, %edx /* Align to 8 bytes. */
|
2002-08-31 19:45:33 +02:00
|
|
|
|
|
|
|
/* Search the first bytes directly. */
|
|
|
|
0: movb (%rax), %cl /* load byte */
|
|
|
|
cmpb %cl,%sil /* compare byte. */
|
|
|
|
je 6f /* target found */
|
|
|
|
testb %cl,%cl /* is byte NUL? */
|
|
|
|
je 7f /* yes => return NULL */
|
|
|
|
incq %rax /* increment pointer */
|
2002-11-12 22:43:26 +01:00
|
|
|
decl %edx
|
2002-08-31 19:45:33 +02:00
|
|
|
jnz 0b
|
|
|
|
|
|
|
|
|
|
|
|
1:
|
|
|
|
/* At the moment %rsi contains C. What we need for the
|
|
|
|
algorithm is C in all bytes of the register. Avoid
|
|
|
|
operations on 16 bit words because these require an
|
|
|
|
prefix byte (and one more cycle). */
|
|
|
|
/* Populate 8 bit data to full 64-bit. */
|
|
|
|
movabs $0x0101010101010101,%r9
|
|
|
|
movzbl %sil,%edx
|
|
|
|
imul %rdx,%r9
|
|
|
|
|
|
|
|
movq $0xfefefefefefefeff, %r8 /* Save magic. */
|
|
|
|
|
|
|
|
/* We exit the loop if adding MAGIC_BITS to LONGWORD fails to
|
|
|
|
change any of the hole bits of LONGWORD.
|
|
|
|
|
|
|
|
1) Is this safe? Will it catch all the zero bytes?
|
|
|
|
Suppose there is a byte with all zeros. Any carry bits
|
|
|
|
propagating from its left will fall into the hole at its
|
|
|
|
least significant bit and stop. Since there will be no
|
|
|
|
carry from its most significant bit, the LSB of the
|
|
|
|
byte to the left will be unchanged, and the zero will be
|
|
|
|
detected.
|
|
|
|
|
|
|
|
2) Is this worthwhile? Will it ignore everything except
|
|
|
|
zero bytes? Suppose every byte of QUARDWORD has a bit set
|
|
|
|
somewhere. There will be a carry into bit 8. If bit 8
|
|
|
|
is set, this will carry into bit 16. If bit 8 is clear,
|
|
|
|
one of bits 9-15 must be set, so there will be a carry
|
|
|
|
into bit 16. Similarly, there will be a carry into bit
|
|
|
|
24 tec.. If one of bits 54-63 is set, there will be a carry
|
|
|
|
into bit 64 (=carry flag), so all of the hole bits will
|
|
|
|
be changed.
|
|
|
|
|
|
|
|
3) But wait! Aren't we looking for C, not zero?
|
|
|
|
Good point. So what we do is XOR LONGWORD with a longword,
|
|
|
|
each of whose bytes is C. This turns each byte that is C
|
|
|
|
into a zero. */
|
|
|
|
|
|
|
|
.p2align 4
|
|
|
|
4:
|
|
|
|
/* Main Loop is unrolled 4 times. */
|
|
|
|
/* First unroll. */
|
|
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
xorq %r9, %rcx /* XOR with qword c|...|c => bytes of str == c
|
|
|
|
are now 0 */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found c => return pointer */
|
|
|
|
|
|
|
|
/* The quadword we looked at does not contain the value we're looking
|
|
|
|
for. Let's search now whether we have reached the end of the
|
|
|
|
string. */
|
|
|
|
xorq %r9, %rcx /* restore original dword without reload */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 7f /* highest byte is NUL => return NULL */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jnz 7f /* found NUL => return NULL */
|
|
|
|
|
|
|
|
/* Second unroll. */
|
|
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
xorq %r9, %rcx /* XOR with qword c|...|c => bytes of str == c
|
|
|
|
are now 0 */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found c => return pointer */
|
|
|
|
|
|
|
|
/* The quadword we looked at does not contain the value we're looking
|
|
|
|
for. Let's search now whether we have reached the end of the
|
|
|
|
string. */
|
|
|
|
xorq %r9, %rcx /* restore original dword without reload */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 7f /* highest byte is NUL => return NULL */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jnz 7f /* found NUL => return NULL */
|
|
|
|
/* Third unroll. */
|
|
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
xorq %r9, %rcx /* XOR with qword c|...|c => bytes of str == c
|
|
|
|
are now 0 */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found c => return pointer */
|
|
|
|
|
|
|
|
/* The quadword we looked at does not contain the value we're looking
|
|
|
|
for. Let's search now whether we have reached the end of the
|
|
|
|
string. */
|
|
|
|
xorq %r9, %rcx /* restore original dword without reload */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 7f /* highest byte is NUL => return NULL */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jnz 7f /* found NUL => return NULL */
|
|
|
|
/* Fourth unroll. */
|
|
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
xorq %r9, %rcx /* XOR with qword c|...|c => bytes of str == c
|
|
|
|
are now 0 */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found c => return pointer */
|
|
|
|
|
|
|
|
/* The quadword we looked at does not contain the value we're looking
|
|
|
|
for. Let's search now whether we have reached the end of the
|
|
|
|
string. */
|
|
|
|
xorq %r9, %rcx /* restore original dword without reload */
|
|
|
|
movq %r8, %rdx /* magic value */
|
|
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
|
|
carry bits reported for each byte which
|
|
|
|
is *not* 0 */
|
|
|
|
jnc 7f /* highest byte is NUL => return NULL */
|
|
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
|
|
the addition will not result in 0. */
|
|
|
|
jz 4b /* no NUL found => restart loop */
|
|
|
|
|
|
|
|
|
|
|
|
7: /* Return NULL. */
|
2004-12-22 21:10:10 +01:00
|
|
|
xorq %rax, %rax
|
2002-08-31 19:45:33 +02:00
|
|
|
retq
|
|
|
|
|
|
|
|
|
|
|
|
/* We now scan for the byte in which the character was matched.
|
|
|
|
But we have to take care of the case that a NUL char is
|
|
|
|
found before this in the dword. Note that we XORed %rcx
|
|
|
|
with the byte we're looking for, therefore the tests below look
|
|
|
|
reversed. */
|
|
|
|
|
|
|
|
|
|
|
|
.p2align 4 /* Align, it's a jump target. */
|
|
|
|
3: movq %r9,%rdx /* move to %rdx so that we can access bytes */
|
|
|
|
subq $8,%rax /* correct pointer increment. */
|
|
|
|
testb %cl, %cl /* is first byte C? */
|
|
|
|
jz 6f /* yes => return pointer */
|
|
|
|
cmpb %dl, %cl /* is first byte NUL? */
|
|
|
|
je 7b /* yes => return NULL */
|
|
|
|
incq %rax /* increment pointer */
|
|
|
|
|
|
|
|
testb %ch, %ch /* is second byte C? */
|
|
|
|
jz 6f /* yes => return pointer */
|
|
|
|
cmpb %dl, %ch /* is second byte NUL? */
|
|
|
|
je 7b /* yes => return NULL? */
|
|
|
|
incq %rax /* increment pointer */
|
|
|
|
|
|
|
|
shrq $16, %rcx /* make upper bytes accessible */
|
|
|
|
testb %cl, %cl /* is third byte C? */
|
|
|
|
jz 6f /* yes => return pointer */
|
|
|
|
cmpb %dl, %cl /* is third byte NUL? */
|
|
|
|
je 7b /* yes => return NULL */
|
|
|
|
incq %rax /* increment pointer */
|
|
|
|
|
|
|
|
testb %ch, %ch /* is fourth byte C? */
|
|
|
|
jz 6f /* yes => return pointer */
|
|
|
|
cmpb %dl, %ch /* is fourth byte NUL? */
|
|
|
|
je 7b /* yes => return NULL? */
|
|
|
|
incq %rax /* increment pointer */
|
|
|
|
|
|
|
|
shrq $16, %rcx /* make upper bytes accessible */
|
|
|
|
testb %cl, %cl /* is fifth byte C? */
|
|
|
|
jz 6f /* yes => return pointer */
|
|
|
|
cmpb %dl, %cl /* is fifth byte NUL? */
|
|
|
|
je 7b /* yes => return NULL */
|
|
|
|
incq %rax /* increment pointer */
|
|
|
|
|
|
|
|
testb %ch, %ch /* is sixth byte C? */
|
|
|
|
jz 6f /* yes => return pointer */
|
|
|
|
cmpb %dl, %ch /* is sixth byte NUL? */
|
|
|
|
je 7b /* yes => return NULL? */
|
|
|
|
incq %rax /* increment pointer */
|
|
|
|
|
|
|
|
shrq $16, %rcx /* make upper bytes accessible */
|
|
|
|
testb %cl, %cl /* is seventh byte C? */
|
|
|
|
jz 6f /* yes => return pointer */
|
|
|
|
cmpb %dl, %cl /* is seventh byte NUL? */
|
|
|
|
je 7b /* yes => return NULL */
|
|
|
|
|
|
|
|
/* It must be in the eigth byte and it cannot be NUL. */
|
|
|
|
incq %rax
|
|
|
|
|
|
|
|
6:
|
|
|
|
nop
|
|
|
|
retq
|
|
|
|
END (BP_SYM (strchr))
|
|
|
|
|
|
|
|
weak_alias (BP_SYM (strchr), BP_SYM (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-30 00:49:58 +02:00
|
|
|
libc_hidden_builtin_def (strchr)
|