diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-05-26 19:08:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-05-26 19:08:49 +0000 |
| commit | 7427c5defa19d8bc4c8a14690c5b3fa4653a1d2c (patch) | |
| tree | 724adbde2ee8cab830bdea2e1d710a4c50d7522d /sysdeps | |
| parent | 2f77e764038cfaa05953c56a309d878c1c00e732 (diff) | |
| download | glibc-7427c5defa19d8bc4c8a14690c5b3fa4653a1d2c.tar.gz glibc-7427c5defa19d8bc4c8a14690c5b3fa4653a1d2c.tar.xz glibc-7427c5defa19d8bc4c8a14690c5b3fa4653a1d2c.zip | |
[BZ #954]
2005-05-26 Andreas Schwab <schwab@suse.de> * locale/Makefile (CFLAGS-loadlocale.c): Don't define. 2005-05-26 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (O_DIRECT): Fix value. Reported by Colin Gibbs <colin@gibbsonline.net>. [BZ #954] 2005-05-17 Alan Modra <amodra@bigpond.net.au> * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp): Corrent _dl_hwcap access in PIC && !SHARED case. * sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: Likewise.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S | 2 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/fpu/setjmp-common.S | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/fcntl.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S index a2415b9542..6dfe6a67d5 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S @@ -41,7 +41,7 @@ ENTRY (BP_SYM (__longjmp)) mtlr r6 lwz r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5) # else - lwz r5,_rtld_global_ro@got(r5) + lwz r5,_dl_hwcap@got(r5) mtlr r6 lwz r5,0(r5) # endif diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S index e0c0606da4..be2cf4d69d 100644 --- a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S @@ -74,20 +74,20 @@ ENTRY (BP_SYM (__sigsetjmp)) stw r31,((JB_GPRS+17)*4)(3) stfd fp31,((JB_FPRS+17*2)*4)(3) #ifndef __NO_VMX__ -#ifdef PIC +# ifdef PIC mflr r6 bl _GLOBAL_OFFSET_TABLE_@local-4 mflr r5 -#ifdef SHARED +# ifdef SHARED lwz r5,_rtld_global_ro@got(r5) mtlr r6 lwz r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5) -#else - lwz r5,_rtld_global_ro@got(r5) +# else + lwz r5,_dl_hwcap@got(r5) mtlr r6 lwz r5,0(r5) -#endif -#else +# endif +# else lis r5,_dl_hwcap@ha lwz r5,_dl_hwcap@l(r5) #endif diff --git a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h index ce4a5da37f..c4a9b77e2e 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 1995-1999, 2000, 2004 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -44,9 +44,9 @@ #define O_ASYNC 020000 /* fcntl, for BSD compatibility */ #ifdef __USE_GNU -# define O_DIRECT 040000 /* Direct disk access. */ # define O_DIRECTORY 0100000 /* Must be a directory. */ # define O_NOFOLLOW 0200000 /* Do not follow links. */ +# define O_DIRECT 02000000 /* Direct disk access. */ # define O_NOATIME 04000000 /* Do not set atime. */ #endif |