[commits] r6082 - in /fsf/trunk/libc: ./ stdlib/ sysdeps/unix/sysv/linux/alpha/bits/ sysdeps/unix/sysv/linux/bits/ sysdeps/unix/sysv/l...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu May  1 00:04:54 2008
New Revision: 6082

Log:
Import glibc-mainline for 2008-05-01

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/stdlib/tst-setcontext.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu May  1 00:04:54 2008
@@ -1,3 +1,14 @@
+2008-04-30  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/bits/resource.h: Define RUSAGE_THREAD and
+	RUSAGE_LWP.
+	* sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/resource.h: Likewise.
+
+2008-04-30  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* stdlib/tst-setcontext.c: Include unistd.h.
+
 2008-04-25  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c (semctl):

Modified: fsf/trunk/libc/stdlib/tst-setcontext.c
==============================================================================
--- fsf/trunk/libc/stdlib/tst-setcontext.c (original)
+++ fsf/trunk/libc/stdlib/tst-setcontext.c Thu May  1 00:04:54 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001,2002,2004,2006 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2002,2004,2006,2007,2008 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
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ucontext.h>
+#include <unistd.h>
 
 static ucontext_t ctx[3];
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h Thu May  1 00:04:54 2008
@@ -158,8 +158,16 @@
 #define RUSAGE_SELF RUSAGE_SELF
 
   /* All of its terminated child processes.  */
-  RUSAGE_CHILDREN = -1
+  RUSAGE_CHILDREN = -1,
 #define RUSAGE_CHILDREN RUSAGE_CHILDREN
+
+#ifdef __USE_GNU
+  /* The calling thread.  */
+  RUSAGE_THREAD = 1
+# define RUSAGE_THREAD RUSAGE_THREAD
+  /* Name for the same functionality on Solaris.  */
+# define RUSAGE_LWP RUSAGE_THREAD
+#endif
 };
 
 #define __need_timeval

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h Thu May  1 00:04:54 2008
@@ -158,8 +158,16 @@
 #define RUSAGE_SELF RUSAGE_SELF
 
   /* All of its terminated child processes.  */
-  RUSAGE_CHILDREN = -1
+  RUSAGE_CHILDREN = -1,
 #define RUSAGE_CHILDREN RUSAGE_CHILDREN
+
+#ifdef __USE_GNU
+  /* The calling thread.  */
+  RUSAGE_THREAD = 1
+# define RUSAGE_THREAD RUSAGE_THREAD
+  /* Name for the same functionality on Solaris.  */
+# define RUSAGE_LWP RUSAGE_THREAD
+#endif
 };
 
 #define __need_timeval

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h Thu May  1 00:04:54 2008
@@ -174,8 +174,16 @@
 #define RUSAGE_SELF RUSAGE_SELF
 
   /* All of its terminated child processes.  */
-  RUSAGE_CHILDREN = -1
+  RUSAGE_CHILDREN = -1,
 #define RUSAGE_CHILDREN RUSAGE_CHILDREN
+
+#ifdef __USE_GNU
+  /* The calling thread.  */
+  RUSAGE_THREAD = 1
+# define RUSAGE_THREAD RUSAGE_THREAD
+  /* Name for the same functionality on Solaris.  */
+# define RUSAGE_LWP RUSAGE_THREAD
+#endif
 };
 
 #define __need_timeval