diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-09-24 23:03:42 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-09-24 23:03:42 +0000 |
commit | 650425ceb40e840b2123b6c8cc65389589f41218 (patch) | |
tree | 70ff83fbe8f34a7829b4a0b511d2cb02ccbcbf2a /sysdeps/i386 | |
parent | 2604afb1b2d9acc3c70b1214285f996200bf0358 (diff) | |
download | glibc-650425ceb40e840b2123b6c8cc65389589f41218.zip glibc-650425ceb40e840b2123b6c8cc65389589f41218.tar.gz glibc-650425ceb40e840b2123b6c8cc65389589f41218.tar.bz2 |
Update.cvs/libc-ud-970924
1997-09-25 00:23 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-profile.c: Correct implementation.
* io/ftwtest-sh: Don't depend on TMPDIR == /tmp.
* locale/setlocale.c: Rewrite a bit for more clarity.
* math/Makefile (libm-calls): Add w_exp2.
* math/math_private.h: Add prototypes for __ieee754_exp2{,f,l}.
* sysdeps/libm-i387/s_exp2.S: Change name to __ieee754_exp2.
* sysdeps/libm-i387/s_exp2f.S: Likewise.
* sysdeps/libm-i387/s_exp2l.S: Likewise.
* sysdeps/libm-ieee754/k_standard.c: Add error cases for exp2.
* string/bits/string2.h (__strcpy_small): Optimize.
(__stpcpy_small): Likewise.
(strncpy): Use variable for dest argument since it's used more than
once.
(strncat): Likewise.
(strcmp): Add optimization for this function.
* sysdeps/i386/i486/string.h (strlen): Correctly use __builtin_strlen.
(__strcpy_small): Optimize.
(__stpcpy_small): Likewise.
(__stpcpy_c): Correctly use __mempcpy_* macros.
(__mempcpy_by2, __mempcpy_by4, __mempcpy_byn): Return pointer to
byte following last copied.
(strncat): Use variable for dest argument since it's used more than
once.
(strcmp): Add optimization for this function.
* sysdeps/i386/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Use
.text and .previous to select correct section.
1997-09-23 19:56 Philip Blundell <Philip.Blundell@pobox.com>
* configure.in: Add `--disable-versioning' option to suppress the
use of symbol versions even if binutils claims to support it.
1997-09-24 20:10 Philip Blundell <Philip.Blundell@pobox.com>
* csu/Makefile (before-compile): Don't try to build abi-tags.h if
not using ELF.
1997-09-21 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/sofini.c [HAVE_DWARF2_UNWIND_INFO]: Supply termination for
the frame unwind info section.
* elf/soinit.c [HAVE_DWARF2_UNWIND_INFO]: Register and unregister
the frame unwind info.
* config.h.in (HAVE_DWARF2_UNWIND_INFO): Add #undef.
* configure.in: Check whether gcc supports DWARF2 unwind info.
* libc.map: Export frame handling tables.
1997-09-10 06:56 Geoff Keating <geoffk@ozemail.com.au>
* sysdeps/unix/sysv/linux/powerpc/bits/kernel_termios.h:
Use the size of the kernel's termios structure for ioctls.
* sysdeps/powerpc/dl-machine.h: Prepare for library profiling.
* sysdeps/powerpc/bits/mathinline.h: Add slightly slower versions
of the C9X FP comparison macros. Delete 'fabs' and 'sqrt' inline
routines, because gcc has them as internals.
* sysdeps/powerpc/Makefile (pic-ccflags): Define this instead of
CFLAGS-.os.
* sysdeps/powerpc/bzero.S: New file.
* sysdeps/powerpc/strcat.c: New file.
* sysdeps/powerpc/strcpy.S: New file.
* sysdeps/powerpc/stpcpy.S: New file.
* math/Makefile: Add atest_exp2, test-reduce.
* math/atest_exp2.c: New file.
* math/test-reduce.c: New file.
* sysdeps/libm-ieee754/Dist: New file.
* sysdeps/libm-ieee754/s_exp2.c: New file.
* sysdeps/libm-ieee754/s_exp2f.c: New file.
* sysdeps/libm-ieee754/t_exp2.h: New file.
* sysdeps/libm-ieee754/t_exp2f.h: New file.
* math/libm-test.c (exp2_test): Add some more tests.
* Rules: Use empty.os instead of empty.o, since it gets linked into
libc.so...
* configure.in: Add --disable-static to disable building .a files.
* config.make.in: Substitute the new variable.
* Makeconfig: Don't build .o files if not building .a files.
* elf/dl-runtime.c (fixup): Factor out call to elf_machine_relplt.
(profile_fixup): Likewise.
1997-09-23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/globtest.c (main): Change to directory passed as first
argument.
* posix/globtest.sh: Don't cd before running the program, instead
pass testdir as argument, so that $common_objpfx remains valid.
1997-09-23 18:01 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nis_call.c (__do_niscall2): Fix multiple Server support.
* nis/nis_findserver.c: Save latest working sockaddr_in.
1997-09-17 22:07 Zack Weinberg <zack@rabi.phys.columbia.edu>
* configure.in: Automatically determine whether as and ld are the
GNU versions.
(options): --with-gnu-{as,ld,binutils} replaced by
single option --with-binutils=PATH specifying a -B option to gcc.
* aclocal.m4: Two new macros defined, LIBC_PROG_FOO_GNU and
LIBC_PROG_BINUTILS.
* configure.in: Allow the user to force configuration for
unsupported platforms with an undocumented option.
1997-09-22 16:55 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* sunrpc/get_myaddr.c (get_myaddress): Avoid loopback interfaces,
return loopback address only if there is no other interface.
* nis/Makefile: Add nis_callback libnsl-routines.
* nis/nis_add.c: Use new __do_niscall* interface.
* nis/nis_cache.c: Likewise.
* nis/nis_checkpoint.c: Likewise.
* nis/nis_lookup.c: Likewise.
* nis/nis_mkdir.c: Likewise.
* nis/nis_modify.c: Likewise.
* nis/nis_ping.c: Likewise.
* nis/nis_remove.c: Likewise.
* nis/nis_rmdir.c: Likewise.
* nis/nis_server.c: Likewise.
* nis/nis_util.c: Likewise.
* nis/rpcsvc/nis.h: Make C++ safe.
* nis/nss_nisplus/nisplus-publickey.c (getsecretkey): Fix use
of variables.
* nis/nis_findserv.c: Make thread safe.
* nis/nis_call.c: Add support for callback, Fix use of variables.
* nis/nis_table.c: Add support for callback, FOLLOW_PATH and
ALL_RESULTS.
* nis/nis_callback.c: New, callback functions.
* nis/nis_intern.h: Add callback declarations.
1997-09-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h: Fix logic in preprocessor directive.
(__strsep_1c, __strsep_g): Don't declare __retval as pointing to
const, to save a cast and a possible warning.
1997-09-22 04:12 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/i486/atomicity.h (exchange_and_add): Really address
memory in xadd not %1.
1997-09-21 13:56 Ulrich Drepper <drepper@cygnus.com>
* manual/maint.texi (Supported Configurations): Add SPARC64 to
list of supported platforms.
Diffstat (limited to 'sysdeps/i386')
-rw-r--r-- | sysdeps/i386/dl-machine.h | 4 | ||||
-rw-r--r-- | sysdeps/i386/i486/atomicity.h | 2 | ||||
-rw-r--r-- | sysdeps/i386/i486/bits/string.h | 145 |
3 files changed, 100 insertions, 51 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index f9913cf..041643e 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -121,6 +121,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) and then redirect to the address it returns. */ #ifndef PROF # define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ + .text .globl _dl_runtime_resolve .type _dl_runtime_resolve, @function .align 16 @@ -153,9 +154,11 @@ _dl_runtime_profile: xchgl %eax, (%esp) # Get %eax contents end store function address. ret $8 # Jump to function address. .size _dl_runtime_profile, .-_dl_runtime_profile + .previous "); #else # define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ + .text .globl _dl_runtime_resolve .globl _dl_runtime_profile .type _dl_runtime_resolve, @function @@ -179,6 +182,7 @@ _dl_runtime_profile: ret $8 # Jump to function address. .size _dl_runtime_resolve, .-_dl_runtime_resolve .size _dl_runtime_profile, .-_dl_runtime_profile + .previous "); #endif /* The PLT uses Elf32_Rel relocs. */ diff --git a/sysdeps/i386/i486/atomicity.h b/sysdeps/i386/i486/atomicity.h index 7157bc3..da4137a 100644 --- a/sysdeps/i386/i486/atomicity.h +++ b/sysdeps/i386/i486/atomicity.h @@ -28,7 +28,7 @@ __attribute__ ((unused)) exchange_and_add (volatile uint32_t *mem, int val) { register int result; - __asm__ __volatile__ ("lock; xaddl %0,%1" + __asm__ __volatile__ ("lock; xaddl %0,%2" : "=r" (result) : "0" (val), "m" (*mem) : "memory"); return result; } diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h index 10915ce..28ca383 100644 --- a/sysdeps/i386/i486/bits/string.h +++ b/sysdeps/i386/i486/bits/string.h @@ -344,7 +344,7 @@ memchr (__const void *__s, int __c, size_t __n) #define _HAVE_STRING_ARCH_strlen 1 #define strlen(str) \ (__extension__ (__builtin_constant_p (str) \ - ? sizeof (str) - 1 \ + ? __builtin_strlen (str) \ : __strlen_g (str))) __STRING_INLINE size_t __strlen_g (__const char *__str) @@ -374,52 +374,51 @@ __strlen_g (__const char *__str) : __strcpy_g (dest, src))) # define __strcpy_small(dest, src, srclen) \ - (__extension__ ({ char *__retval = (dest); \ - char *__cp = __retval; \ + (__extension__ ({ unsigned char *__dest = (unsigned char *) (dest); \ switch (srclen) \ { \ case 1: \ - *((unsigned char *) __cp) = '\0'; \ + *__dest = '\0'; \ break; \ case 2: \ - *((__uint16_t *) __cp) = \ + *((__uint16_t *) __dest) = \ __STRING_SMALL_GET16 (src, 0); \ break; \ case 3: \ - *((__uint16_t *) __cp)++ = \ + *((__uint16_t *) __dest) = \ __STRING_SMALL_GET16 (src, 0); \ - *((unsigned char *) __cp) = '\0'; \ + *(__dest + 2) = '\0'; \ break; \ case 4: \ - *((__uint32_t *) __cp) = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ break; \ case 5: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - *((unsigned char *) __cp) = '\0'; \ + *(__dest + 4) = '\0'; \ break; \ case 6: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - *((__uint16_t *) __cp) = \ + *((__uint16_t *) (__dest + 4)) = \ __STRING_SMALL_GET16 (src, 4); \ break; \ case 7: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - *((__uint16_t *) __cp)++ = \ + *((__uint16_t *) (__dest + 4)) = \ __STRING_SMALL_GET16 (src, 4); \ - *((unsigned char *) __cp) = '\0'; \ + *(__dest + 6) = '\0'; \ break; \ case 8: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - *((__uint32_t *) __cp) = \ + *((__uint32_t *) (__dest + 4)) = \ __STRING_SMALL_GET32 (src, 4); \ break; \ } \ - __retval; })) + (char *) __dest; })) __STRING_INLINE char * __strcpy_g (char *__dest, __const char *__src) @@ -453,64 +452,65 @@ __strcpy_g (char *__dest, __const char *__src) : __stpcpy_g (dest, src))) # define __stpcpy_c(dest, src, srclen) \ ((srclen) % 4 == 0 \ - ? __mempcpy_by4 (dest, src, srclen) \ + ? __mempcpy_by4 (dest, src, srclen) - 1 \ : ((srclen) % 2 == 0 \ - ? __mempcpy_by2 (dest, src, srclen) \ - : __mempcpy_byn (dest, src, srclen))) + ? __mempcpy_by2 (dest, src, srclen) - 1 \ + : __mempcpy_byn (dest, src, srclen) - 1)) /* In glibc itself we use this symbol for namespace reasons. */ # define stpcpy(dest, src) __stpcpy (dest, src) # define __stpcpy_small(dest, src, srclen) \ - (__extension__ ({ char *__cp = (dest); \ + (__extension__ ({ unsigned char *__dest = (unsigned char *) (dest); \ switch (srclen) \ { \ case 1: \ - *((unsigned char *) __cp) = '\0'; \ + *__dest = '\0'; \ break; \ case 2: \ - *((__uint16_t *) __cp) = \ + *((__uint16_t *) __dest) = \ __STRING_SMALL_GET16 (src, 0); \ - ++__cp; \ + ++__dest; \ break; \ case 3: \ - *((__uint16_t *) __cp)++ = \ + *((__uint16_t *) __dest)++ = \ __STRING_SMALL_GET16 (src, 0); \ - *((unsigned char *) __cp) = '\0'; \ + *__dest = '\0'; \ break; \ case 4: \ - *((__uint32_t *) __cp) = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - __cp += 3; \ + __dest += 3; \ break; \ case 5: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest)++ = \ __STRING_SMALL_GET32 (src, 0); \ - *((unsigned char *) __cp) = '\0'; \ + *__dest = '\0'; \ break; \ case 6: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - *((__uint16_t *) __cp) = \ + *((__uint16_t *) (__dest + 4)) = \ __STRING_SMALL_GET16 (src, 4); \ - ++__cp; \ + __dest += 5; \ break; \ case 7: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - *((__uint16_t *) __cp)++ = \ + *((__uint16_t *) (__dest + 4)) = \ __STRING_SMALL_GET16 (src, 4); \ - *((unsigned char *) __cp) = '\0'; \ + __dest += 6; \ + *__dest = '\0'; \ break; \ case 8: \ - *((__uint32_t *) __cp)++ = \ + *((__uint32_t *) __dest) = \ __STRING_SMALL_GET32 (src, 0); \ - *((__uint32_t *) __cp) = \ + *((__uint32_t *) (__dest + 4)) = \ __STRING_SMALL_GET32 (src, 4); \ - __cp += 3; \ + __dest += 7; \ break; \ } \ - __cp; })) + (char *) __dest; })) __STRING_INLINE char * __mempcpy_by4 (char *__dest, __const char *__src, size_t __srclen) @@ -528,7 +528,7 @@ __mempcpy_by4 (char *__dest, __const char *__src, size_t __srclen) : "=r" (__dummy1), "=r" (__tmp), "=r" (__src), "=r" (__dummy2) : "1" (__tmp), "2" (__src), "3" (__srclen / 4) : "memory", "cc"); - return __tmp - 1; + return __tmp; } __STRING_INLINE char * @@ -552,7 +552,7 @@ __mempcpy_by2 (char *__dest, __const char *__src, size_t __srclen) : "=q" (__dummy1), "=r" (__tmp), "=r" (__src), "=r" (__dummy2) : "1" (__tmp), "2" (__src), "3" (__srclen / 2) : "memory", "cc"); - return __tmp + 1; + return __tmp + 2; } __STRING_INLINE char * @@ -573,7 +573,7 @@ __mempcpy_byn (char *__dest, __const char *__src, size_t __srclen) : "=D" (__tmp) : "c" (__srclen), "0" (__tmp),"S" (__src) : "cx", "di", "si", "memory", "cc"); - return __tmp - 1; + return __tmp; } __STRING_INLINE char * @@ -760,11 +760,12 @@ __strcat_g (char *__dest, __const char *__src) /* Append no more than N characters from SRC onto DEST. */ #define _HAVE_STRING_ARCH_strncat 1 #define strncat(dest, src, n) \ - (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n) \ - ? (strlen (src) < ((size_t) (n)) \ - ? strcat (dest, src) \ - : (memcpy (strchr (dest, '\0'), src, n), dest)) \ - : __strncat_g (dest, src, n))) + (__extension__ ({ char *__dest = (dest); \ + __builtin_constant_p (src) && __builtin_constant_p (n) \ + ? (strlen (src) < ((size_t) (n)) \ + ? strcat (__dest, src) \ + : (memcpy (strchr (__dest, '\0'), src, n), __dest)) \ + : __strncat_g (__dest, src, n); })) __STRING_INLINE char * __strncat_g (char *__dest, __const char __src[], size_t __n) @@ -797,8 +798,52 @@ __strncat_g (char *__dest, __const char __src[], size_t __n) /* Compare S1 and S2. */ #define _HAVE_STRING_ARCH_strcmp 1 +#define strcmp(s1, s2) \ + (__extension__ (__builtin_constant_p (s1) && __builtin_constant_p (s2) \ + && (sizeof (s1)[0] != 1 || strlen (s1) >= 4) \ + && (sizeof (s2)[0] != 1 || strlen (s2) >= 4) \ + ? memcmp (s1, s2, (strlen (s1) < strlen (s2) \ + ? strlen (s1) : strlen (s2)) + 1) \ + : (__builtin_constant_p (s1) && sizeof (s1)[0] == 1 \ + && sizeof (s2)[0] == 1 && strlen (s1) < 4 \ + ? __strcmp_cg (s1, s2, strlen (s1)) \ + : (__builtin_constant_p (s2) && sizeof (s1)[0] == 1 \ + && sizeof (s2)[0] == 1 && strlen (s2) < 4 \ + ? __strcmp_gc (s1, s2, strlen (s2)) \ + : __strcmp_gg (s1, s2))))) + +#define __strcmp_cg(s1, s2, l1) \ + (__extension__ ({ __const unsigned char *__s2 = (unsigned char *) (s2); \ + register int __result = (unsigned char) (s1)[0] - __s2[0];\ + if (l1 > 0 && __result == 0) \ + { \ + __result = (unsigned char) (s1)[1] - __s2[1]; \ + if (l1 > 1 && __result == 0) \ + { \ + __result = (unsigned char) (s1)[2] - __s2[2]; \ + if (l1 > 2 && __result == 0) \ + __result = (unsigned char) (s1)[3] - __s2[3]; \ + } \ + } \ + __result; })) + +#define __strcmp_gc(s1, s2, l2) \ + (__extension__ ({ __const unsigned char *__s1 = (unsigned char *) (s1); \ + register int __result = __s1[0] - (unsigned char) (s2)[0];\ + if (l2 > 0 && __result == 0) \ + { \ + __result = __s1[1] - (unsigned char) (s2)[1]; \ + if (l2 > 1 && __result == 0) \ + { \ + __result = __s1[2] - (unsigned char) (s2)[2]; \ + if (l2 > 2 && __result == 0) \ + __result = __s1[3] - (unsigned char) (s2)[3]; \ + } \ + } \ + __result; })) + __STRING_INLINE int -strcmp (__const char *__s1, __const char *__s2) +__strcmp_gg (__const char *__s1, __const char *__s2) { register int __res; __asm__ __volatile__ |