diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-03-19 21:04:10 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-03-19 21:04:10 +0000 |
| commit | 8f8ebbc438fcb4b22fba8beb3ef3d1aa59d9d7bf (patch) | |
| tree | b7091affa76bbaf47e78a59dfc72b2102554eaf9 /sysdeps/i386 | |
| parent | f5c3480e830e94e0e51a0bdb1053944daed8bc58 (diff) | |
| download | glibc-8f8ebbc438fcb4b22fba8beb3ef3d1aa59d9d7bf.tar.gz glibc-8f8ebbc438fcb4b22fba8beb3ef3d1aa59d9d7bf.tar.xz glibc-8f8ebbc438fcb4b22fba8beb3ef3d1aa59d9d7bf.zip | |
Updated to fedora-glibc-20050319T1907 cvs/fedora-glibc-2_3_4-15
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/Makefile | 2 | ||||
| -rwxr-xr-x | sysdeps/i386/configure | 3 | ||||
| -rw-r--r-- | sysdeps/i386/configure.in | 3 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 2 | ||||
| -rw-r--r-- | sysdeps/i386/i486/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/i386/i686/hp-timing.h | 24 |
6 files changed, 19 insertions, 19 deletions
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile index ece94f3610..ddd3d04e07 100644 --- a/sysdeps/i386/Makefile +++ b/sysdeps/i386/Makefile @@ -8,7 +8,7 @@ long-double-fcts = yes ifeq ($(subdir),csu) # On i686 we must avoid generating the trampoline functions generated # to get the GOT pointer. -CFLAGS-initfini.s += -march=i386 -mcpu=i386 +CFLAGS-initfini.s += -march=i386 -mtune=i386 endif ifeq ($(subdir),gmon) diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index d1d4dc15a7..ecba16645b 100755 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -52,3 +52,6 @@ if test $libc_cv_cpp_asm_debuginfo = yes; then _ACEOF fi + +# Tell top-level configure to try -mtune=i386. +libc_mtune_example=i386 diff --git a/sysdeps/i386/configure.in b/sysdeps/i386/configure.in index 028e1ae8e1..93b62b671c 100644 --- a/sysdeps/i386/configure.in +++ b/sysdeps/i386/configure.in @@ -33,3 +33,6 @@ rm -f conftest*])AC_SUBST(libc_cv_cpp_asm_debuginfo) if test $libc_cv_cpp_asm_debuginfo = yes; then AC_DEFINE(HAVE_CPP_ASM_DEBUGINFO) fi + +# Tell top-level configure to try -mtune=i386. +libc_mtune_example=i386 diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 367a4fb1a8..df3edf5460 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -301,7 +301,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, /* The i386 never uses Elf32_Rela relocations for the dynamic linker. Prelinked libraries may use Elf32_Rela though. */ -#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP) +#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP #ifdef RESOLVE_MAP diff --git a/sysdeps/i386/i486/Makefile b/sysdeps/i386/i486/Makefile deleted file mode 100644 index 930731a166..0000000000 --- a/sysdeps/i386/i486/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Temporary workaround for GCC4 PR debug/19345 -ifeq ($(subdir),string) -CFLAGS-string-inlines.c += -g0 -endif diff --git a/sysdeps/i386/i686/hp-timing.h b/sysdeps/i386/i686/hp-timing.h index a5906835f7..b924869649 100644 --- a/sysdeps/i386/i686/hp-timing.h +++ b/sysdeps/i386/i686/hp-timing.h @@ -1,5 +1,5 @@ /* High precision, low overhead timing functions. i686 version. - Copyright (C) 1998, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -119,26 +119,24 @@ typedef unsigned long long int hp_timing_t; /* We have to jump through hoops to get this correctly implemented. */ #define HP_TIMING_ACCUM(Sum, Diff) \ do { \ - char __not_done; \ + int __not_done; \ hp_timing_t __oldval = (Sum); \ hp_timing_t __diff = (Diff) - GLRO(dl_hp_timing_overhead); \ do \ { \ hp_timing_t __newval = __oldval + __diff; \ int __temp0, __temp1; \ - __asm__ __volatile__ ("xchgl %4, %%ebx\n\t" \ + __asm__ __volatile__ ("xchgl %0, %%ebx\n\t" \ "lock; cmpxchg8b %1\n\t" \ - "sete %0\n\t" \ - "movl %4, %%ebx" \ - : "=q" (__not_done), "=m" (Sum), \ - "=A" (__oldval), "=c" (__temp0), \ - "=SD" (__temp1) \ - : "1" (Sum), "2" (__oldval), \ - "3" (__newval >> 32), \ - "4" (__newval & 0xffffffff) \ - : "memory"); \ + "sete %%bl\n\t" \ + "xchgl %0, %%ebx" \ + : "=SD" (__not_done), "=m" (Sum), \ + "=A" (__oldval), "=c" (__temp0) \ + : "m" (Sum), "2" (__oldval), \ + "3" ((unsigned int) (__newval >> 32)), \ + "0" ((unsigned int) __newval)); \ } \ - while (__not_done); \ + while ((unsigned char) __not_done); \ } while (0) /* No threads, no extra work. */ |