[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r9288 - in /branches/eglibc-2_11: libc/ libc/sysdeps/unix/sysv/linux/i386/bits/ libc/sysdeps/unix/sysv/linux/ia64/bits/ libc...



Author: joseph
Date: Tue Nov 17 13:37:12 2009
New Revision: 9288

Log:
Merge changes between r9234 and r9287 from /fsf/glibc-2_11-branch.

Added:
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/bits/socket.h
      - copied unchanged from r9281, fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/hppa/bits/socket.h
Removed:
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c
Modified:
    branches/eglibc-2_11/libc/ChangeLog
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
    branches/eglibc-2_11/ports/ChangeLog.arm
    branches/eglibc-2_11/ports/ChangeLog.hppa
    branches/eglibc-2_11/ports/ChangeLog.m68k
    branches/eglibc-2_11/ports/ChangeLog.mips
    branches/eglibc-2_11/ports/sysdeps/hppa/dl-fptr.h
    branches/eglibc-2_11/ports/sysdeps/hppa/elf/start.S
    branches/eglibc-2_11/ports/sysdeps/m68k/libgcc_s.h
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/Versions
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
    branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h

Modified: branches/eglibc-2_11/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_11/libc/ChangeLog (original)
+++ branches/eglibc-2_11/libc/ChangeLog Tue Nov 17 13:37:12 2009
@@ -1,3 +1,14 @@
+2009-11-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Update F_SETOWN_EX and
+	F_GETOWN_EX definitions according to corrected kernel definitions.
+	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
+
 2009-11-10  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* resolv/mapv4v6hostent.h (map_v4v6_hostent): Return non-zero if

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -92,8 +92,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -88,8 +88,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -85,15 +85,15 @@
 #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
 
 #if defined __USE_BSD || defined __USE_UNIX98
-# define F_SETOWN	8	/* Get owner (process receiving of SIGIO).  */
-# define F_GETOWN	9	/* Set owner (process receiving of SIGIO).  */
+# define F_SETOWN	8	/* Get owner (process receiving SIGIO).  */
+# define F_GETOWN	9	/* Set owner (process receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -107,8 +107,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -85,15 +85,15 @@
 #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
 
 #if defined __USE_BSD || defined __USE_UNIX98
-# define F_SETOWN	8	/* Get owner (process receiving of SIGIO).  */
-# define F_GETOWN	9	/* Set owner (process receiving of SIGIO).  */
+# define F_SETOWN	8	/* Get owner (process receiving SIGIO).  */
+# define F_GETOWN	9	/* Set owner (process receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving of SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving of SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -99,8 +99,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_GETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_SETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Set owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Get owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -99,15 +99,15 @@
 #endif
 
 #if defined __USE_BSD || defined __USE_UNIX98
-# define F_SETOWN	8	/* Get owner (process receiving of SIGIO).  */
-# define F_GETOWN	9	/* Set owner (process receiving of SIGIO).  */
+# define F_SETOWN	8	/* Get owner (process receiving SIGIO).  */
+# define F_GETOWN	9	/* Set owner (process receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_11/ports/ChangeLog.arm Tue Nov 17 13:37:12 2009
@@ -1,3 +1,8 @@
+2009-11-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/bits/fcntl.h (F_SETOWN_EX,
+	F_GETOWN_EX): Update values.
+
 2009-11-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/bits/fcntl.h (fallocate): Fix types

Modified: branches/eglibc-2_11/ports/ChangeLog.hppa
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.hppa (original)
+++ branches/eglibc-2_11/ports/ChangeLog.hppa Tue Nov 17 13:37:12 2009
@@ -1,3 +1,55 @@
+2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	[BZ #6676]
+
+	* sysdeps/unix/sysv/linux/hppa/socket.h: Move from here...
+	* sysdeps/unix/sysv/linux/hppa/bits/socket.h: ... to here.
+
+2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/Versions (libc): Add 
+	fallocate64@@GLIBC_2.11.
+	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
+	[__USE_GNU]: Define F_GETOWN_EX, and F_SETOWN_EX.
+	[!__USE_FILE_OFFSET64]: Define fallocate.
+	[__USE_FILE_OFFSET64 && __REDIRECT]: Define __REDIRECT.
+	[__USE_FILE_OFFSET64 && !__REDIRECT]: Define fallocate as
+	fallocate64.
+	[__USE_LARGEFILE64]: define fallocate64. 	
+
+2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/hppa/dl-fptr.h: Update copyright year.
+	Reduce ELF_MACHINE_BOOT_FPTR_TABLE_LEN to 64.
+	Implement ELF_MACHINE_LOAD_ADDRESS using PC relative loads.
+
+2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h:
+	Remove FUTEX_WAITERS, FUTEX_OWNER_DIED, and FUTEX_TID_MASK.
+
+2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+	    Aurelian Jarno  <aurelien@xxxxxxxxxxx>
+
+	[BZ #10527]
+
+	* sysdeps/unix/sysv/linux/hppa/socket.h: New file.
+
+2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	[BZ #6676]
+
+	* sysdeps/hppa/elf/start.S: Use R_PARISC_DLTIND* relocations
+	to support -fPIE.
+
+2009-11-08  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	[BZ #10920]
+
+	* sysdeps/hppa/libgcc_s.h: New file.
+	* sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c: Remove.
+	* sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c: Remove.
+
 2009-09-08  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
  
 	sysdeps/unix/sysv/linux/hppa/

Modified: branches/eglibc-2_11/ports/ChangeLog.m68k
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.m68k (original)
+++ branches/eglibc-2_11/ports/ChangeLog.m68k Tue Nov 17 13:37:12 2009
@@ -1,3 +1,13 @@
+2009-11-15  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/m68k/libgcc_s.h: New file.
+
+2009-11-14  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h (F_SETOWN_EX)
+	(F_GETOWN_EX, F_OWNER_TID, F_OWNER_PID, F_OWNER_GID, f_owner_ex):
+	Define.
+
 2009-11-07  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h (fallocate): Fix types

Modified: branches/eglibc-2_11/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_11/ports/ChangeLog.mips Tue Nov 17 13:37:12 2009
@@ -1,3 +1,8 @@
+2009-11-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (F_SETOWN_EX,
+	F_GETOWN_EX): Update values.
+
 2009-11-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (fallocate): Fix types

Modified: branches/eglibc-2_11/ports/sysdeps/hppa/dl-fptr.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/hppa/dl-fptr.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/hppa/dl-fptr.h Tue Nov 17 13:37:12 2009
@@ -1,5 +1,5 @@
 /* Function descriptors.  HPPA version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009 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
@@ -22,14 +22,16 @@
 
 #include <sysdeps/generic/dl-fptr.h>
 
-/* There are currently 20 dynamic symbols in ld.so.
+/* There are currently 33 dynamic symbols in ld.so.
    ELF_MACHINE_BOOT_FPTR_TABLE_LEN needs to be at least that big.  */
-#define ELF_MACHINE_BOOT_FPTR_TABLE_LEN	200
+#define ELF_MACHINE_BOOT_FPTR_TABLE_LEN 64	
 
-#define ELF_MACHINE_LOAD_ADDRESS(var, symbol)		\
-  asm ("	addil LT%%" #symbol ", %%r19\n"		\
-       "	ldw RT%%" #symbol "(%%sr0,%%r1), %0\n"	\
-      : "=&r" (var));
-
+#define ELF_MACHINE_LOAD_ADDRESS(var, symbol) \
+  asm (								\
+"	b,l	1f,%0\n"					\
+"	depi	0,31,2,%0\n"					\
+"1:	addil	L'" #symbol " - ($PIC_pcrel$0 - 8),%0\n"	\
+"	ldo	R'" #symbol " - ($PIC_pcrel$0 - 12)(%%r1),%0\n"	\
+   : "=&r" (var) : : "r1");
 
 #endif /* !dl_hppa_fptr_h */

Modified: branches/eglibc-2_11/ports/sysdeps/hppa/elf/start.S
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/hppa/elf/start.S (original)
+++ branches/eglibc-2_11/ports/sysdeps/hppa/elf/start.S Tue Nov 17 13:37:12 2009
@@ -1,5 +1,5 @@
 /* ELF startup code for HPPA.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009 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
@@ -96,16 +96,16 @@
 
 #if SHARED
 	/* load main (1st argument) */
-	addil	LR'.Lpmain, %r19
-	ldw	RR'.Lpmain(%r1), %r26
+	addil	LT'.Lpmain, %r19
+	ldw	RT'.Lpmain(%r1), %r26
 	ldw	0(%r26),%r26
 	/* void (*init) (void) (4th argument) */
-	addil	LR'.Lp__libc_csu_init, %r19
-	ldw	RR'.Lp__libc_csu_init(%r1), %r23
+	addil	LT'.Lp__libc_csu_init, %r19
+	ldw	RT'.Lp__libc_csu_init(%r1), %r23
 	ldw	0(%r23), %r23
 	/* void (*fini) (void) (5th argument) */
-	addil	LR'.Lp__libc_csu_fini, %r19
-	ldw	RR'.Lp__libc_csu_fini(%r1), %r22
+	addil	LT'.Lp__libc_csu_fini, %r19
+	ldw	RT'.Lp__libc_csu_fini(%r1), %r22
 	ldw	0(%r22), %r22
 #else
 	/* load main (1st argument) */

Modified: branches/eglibc-2_11/ports/sysdeps/m68k/libgcc_s.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/m68k/libgcc_s.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/m68k/libgcc_s.h Tue Nov 17 13:37:12 2009
@@ -1,2 +1,2 @@
-/* Name of libgcc_s library provided by gcc.  */
+/* Name of libgcc_s library provided by gcc, m68k version.  */
 #define LIBGCC_S_SO "libgcc_s.so.2"

Modified: branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -92,8 +92,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU

Modified: branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/Versions
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/Versions (original)
+++ branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/Versions Tue Nov 17 13:37:12 2009
@@ -20,6 +20,9 @@
     #errlist-compat	256
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
   }
+  GLIBC_2.11 {
+    fallocate64;
+  }
 }
 librt {
   GLIBC_2.3 {

Modified: branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -89,6 +89,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	13	/* Set number of signal to be sent.  */
 # define F_GETSIG	14	/* Get number of signal to be sent.  */
+# define F_GETOWN_EX	15
+# define F_SETOWN_EX	16
 #endif
 
 #ifdef __USE_GNU
@@ -220,7 +222,24 @@
 /* In-kernel implementation of tee for pipe buffers.  */
 extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 		    unsigned int __flags);
-    
+
+/* Reserve storage for the data of the file associated with FD.  */
+# ifndef __USE_FILE_OFFSET64
+extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
+# else
+#  ifdef __REDIRECT
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
+		       fallocate64);
+#  else
+#   define fallocate fallocate64
+#  endif
+# endif
+# ifdef __USE_LARGEFILE64
+extern int fallocate64 (int __fd, int __mode, __off64_t __offset,
+			__off64_t __len);
+# endif
+
 #endif
     
 __END_DECLS

Modified: branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h Tue Nov 17 13:37:12 2009
@@ -47,11 +47,6 @@
 #define FUTEX_CLOCK_REALTIME	256
 
 #define FUTEX_BITSET_MATCH_ANY	0xffffffff
-
-/* Bits used in robust mutex implementation.  */
-#define FUTEX_WAITERS		0x80000000
-#define FUTEX_OWNER_DIED	0x40000000
-#define FUTEX_TID_MASK		0x3fffffff
 
 /* Values for 'private' parameter of locking macros.  Yes, the
    definition seems to be backwards.  But it is not.  The bit will be

Modified: branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -1,5 +1,5 @@
 /* O_*, F_*, FD_* bit values for Linux.
-   Copyright (C) 2000, 2004, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2008, 2009 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
@@ -91,6 +91,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU
@@ -162,6 +164,23 @@
     __off64_t l_start;	/* Offset where the lock begins.  */
     __off64_t l_len;	/* Size of the locked area; zero means until EOF.  */
     __pid_t l_pid;	/* Process holding the lock.  */
+  };
+#endif
+
+#ifdef __USE_GNU
+/* Owner types.  */
+enum __pid_type
+  {
+    F_OWNER_TID = 0,	/* Kernel thread.  */
+    F_OWNER_PID,	/* Process.  */
+    F_OWNER_GID		/* Process group.  */
+  };
+
+/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+struct f_owner_ex
+  {
+    enum __pid_type type;	/* Owner type of ID.  */
+    __pid_t pid;		/* ID of owner.  */
   };
 #endif
 

Modified: branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h Tue Nov 17 13:37:12 2009
@@ -94,8 +94,8 @@
 #ifdef __USE_GNU
 # define F_SETSIG	10	/* Set number of signal to be sent.  */
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+# define F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
+# define F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
 #endif
 
 #ifdef __USE_GNU