[commits] r9373 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/unix/sysv/linux/sh/ sysdeps/unix/sysv/linux/bits/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Nov 30 17:32:19 2009
New Revision: 9373

Log:
Import glibc-mainline for 2009-11-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pt-initfini.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Nov 30 17:32:19 2009
@@ -1,3 +1,8 @@
+2009-11-30  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/bits/sched.h: Define SCHED_IDLE and
+	SCHED_RESET_ON_FORK.
+
 2009-11-26  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal): Avoid code

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Mon Nov 30 17:32:19 2009
@@ -1,3 +1,8 @@
+2009-11-27  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sh/pt-initfini.c (_init): Don't call
+	__gmon_start__.
+
 2009-11-27  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/x86_64/cancellation.S: Reload

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pt-initfini.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pt-initfini.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pt-initfini.c Mon Nov 30 17:32:19 2009
@@ -1,5 +1,5 @@
-/* Special .init and .fini section support for SH. NPTL version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+/* Special .init and .fini section support for SH.  NPTL version.
+   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
@@ -62,19 +62,12 @@
 	mov.l	.L24,r1\n\
 	add	r0,r1\n\
 	jsr	@r1\n\
-	 nop\n\
-	mova	.L23,r0\n\
-	mov.l	.L23,r1\n\
-	add	r0,r1\n\
-	jsr	@r1\n\
 	 mov	r15,r14\n\
 	bra	1f\n\
 	 nop\n\
 	.align 2\n\
 .L22:\n\
 	.long	_GLOBAL_OFFSET_TABLE_\n\
-.L23:\n\
-	.long	__gmon_start__@PLT\n\
 .L24:\n\
 	.long	__pthread_initialize_minimal_internal@PLT\n\
 1:\n\
@@ -91,16 +84,6 @@
 	rts	\n\
 	mov.l	@r15+,r12\n\
 	END_INIT\n\
-	.section .text\n\
-	.align 5\n\
-	.weak	__gmon_start__\n\
-	.type	__gmon_start__,@function\n\
-__gmon_start__:\n\
-	mov.l	r14,@-r15\n\
-	mov	r15,r14\n\
-	mov	r14,r15\n\
-	rts	\n\
-	mov.l	@r15+,r14\n\
 	\n\
 /*@_init_EPILOG_ENDS*/\n\
 \n\

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h Mon Nov 30 17:32:19 2009
@@ -27,11 +27,14 @@
 
 
 /* Scheduling algorithms.  */
-#define SCHED_OTHER	0
-#define SCHED_FIFO	1
-#define SCHED_RR	2
+#define SCHED_OTHER		0
+#define SCHED_FIFO		1
+#define SCHED_RR		2
 #ifdef __USE_GNU
-# define SCHED_BATCH	3
+# define SCHED_BATCH		3
+# define SCHED_IDLE		5
+
+# define SCHED_RESET_ON_FORK	0x40000000
 #endif
 
 #ifdef __USE_MISC