diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-23 11:25:09 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-23 11:25:09 +0000 |
| commit | 22b5df016abc8b1f06796b07d8f35d3ead9634de (patch) | |
| tree | f334cf8bfde432ca26cf5fd8429a0ed43cf8b105 /libc/string | |
| parent | 49f2fcb08b6a1b80d77cbd56aecbb447d97a154d (diff) | |
| download | uClibc-alpine-22b5df016abc8b1f06796b07d8f35d3ead9634de.tar.bz2 uClibc-alpine-22b5df016abc8b1f06796b07d8f35d3ead9634de.tar.xz | |
ldso/ldso/mips/*: non-pic support from trunk
libc/string/*: small fixes sync from trunk
test/regex/tst-regex2.c: small fixes sync from trunk
libc/misc/time/time.c: optimization from trunk:
text data bss dec hex filename
- 854 24 0 878 36e libc/misc/time/_time_localtime_tzi.os
+ 818 16 0 834 342 libc/misc/time/_time_localtime_tzi.os
Diffstat (limited to 'libc/string')
| -rw-r--r-- | libc/string/generic/memchr.c | 4 | ||||
| -rw-r--r-- | libc/string/generic/mempcpy.c | 3 | ||||
| -rw-r--r-- | libc/string/sparc/sparc64/memchr.S | 2 | ||||
| -rw-r--r-- | libc/string/stpcpy.c | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/libc/string/generic/memchr.c b/libc/string/generic/memchr.c index 8ea3f539a..d5cd0005e 100644 --- a/libc/string/generic/memchr.c +++ b/libc/string/generic/memchr.c @@ -25,14 +25,12 @@ #include <stdlib.h> #include <limits.h> -/* Experimentally off - libc_hidden_proto(memchr) */ -/* libc_hidden_proto(abort) */ - #include "memcopy.h" #define LONG_MAX_32_BITS 2147483647 /* Search no more than N bytes of S for C. */ +#undef memchr void *memchr (const void * s, int c_in, size_t n) { const unsigned char *char_ptr; diff --git a/libc/string/generic/mempcpy.c b/libc/string/generic/mempcpy.c index 0fcdb665c..d7fa79ef5 100644 --- a/libc/string/generic/mempcpy.c +++ b/libc/string/generic/mempcpy.c @@ -9,12 +9,11 @@ #ifdef __USE_GNU -#undef mempcpy +# undef mempcpy void *mempcpy (void *dstpp, const void *srcpp, size_t len) { memcpy(dstpp, srcpp, len); return (void *)(((char *)dstpp) + len); } libc_hidden_weak(mempcpy) - #endif diff --git a/libc/string/sparc/sparc64/memchr.S b/libc/string/sparc/sparc64/memchr.S index 6096cc218..f44850b08 100644 --- a/libc/string/sparc/sparc64/memchr.S +++ b/libc/string/sparc/sparc64/memchr.S @@ -256,6 +256,4 @@ ENTRY(memchr) END(memchr) libc_hidden_def(memchr) -#if !__BOUNDED_POINTERS__ weak_alias(memchr,__ubp_memchr) -#endif diff --git a/libc/string/stpcpy.c b/libc/string/stpcpy.c index 8a487584e..58ace8fc7 100644 --- a/libc/string/stpcpy.c +++ b/libc/string/stpcpy.c @@ -10,7 +10,7 @@ #ifdef WANT_WIDE # define Wstpcpy wcpcpy #else -/* Experimentally off - libc_hidden_proto(stpcpy) */ +# undef stpcpy # define Wstpcpy stpcpy #endif |