[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.

diff --git a/ChangeLog b/ChangeLog
index 70a0ff5..cc62391 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+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.
+
 2005-05-25  Dwayne Grant McConnell  <dgm69@us.ibm.com>
 
        * gmon/gmon.c: Add space inf weak_alias use.

diff --git a/configure b/configure
index cb86530..fb69f40 100755 (executable)
--- a/configure
+++ b/configure
@@ -1924,7 +1924,6 @@ fi
 test -n "$base_machine" || case "$machine" in
 a29k | am29000)        base_machine=a29k machine=a29k ;;
 alpha*)                base_machine=alpha machine=alpha/$machine ;;
-arm*)          base_machine=arm machine=arm/arm32/$machine ;;
 c3[012])       base_machine=cx0 machine=cx0/c30 ;;
 c4[04])                base_machine=cx0 machine=cx0/c40 ;;
 hppa*64*)      base_machine=hppa machine=hppa/hppa64 ;;
@@ -1980,7 +1979,6 @@ sparc64)
                base_machine=sparc machine=sparc/sparc64 ;;
 sparc64b)
                base_machine=sparc machine=sparc/sparc64/sparcv9b ;;
-thumb*)                base_machine=thumb machine=arm/thumb/$machine ;;
 *)             base_machine=$machine ;;
 esac
 

diff --git a/locale/Makefile b/locale/Makefile
index b493c1c..2f2d2ba 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -100,7 +100,6 @@ locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
 CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
 CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
 CFLAGS-charmap-dir.c = -Wno-write-strings
-CFLAGS-loadlocale.c = $(fno-unit-at-a-time)
 
 # This makes sure -DNOT_IN_libc is passed for all these modules.
 cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \

diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
index a2415b9..6dfe6a6 100644 (file)
--- 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 e0c0606..be2cf4d 100644 (file)
--- 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 ce4a5da..c4a9b77 100644 (file)
--- 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