[commits] r14338 - in /fsf/trunk/libc: ChangeLog elf/Makefile sysdeps/unix/sysv/linux/getsysstats.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Jun 27 00:04:22 2011
New Revision: 14338

Log:
Import glibc-mainline for 2011-06-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/Makefile
    fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Jun 27 00:04:22 2011
@@ -1,3 +1,12 @@
+2011-06-23  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Use
+	__gettimeofday instead of gettimeofday.
+
+2011-06-26  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* elf/Makefile (all-built-dso): No need to check linkobj/libc.so.
+
 2011-06-24  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	* sysdeps/i386/i686/multiarch/strcpy-sse2.S (RETURN): Fix a typo.

Modified: fsf/trunk/libc/elf/Makefile
==============================================================================
--- fsf/trunk/libc/elf/Makefile (original)
+++ fsf/trunk/libc/elf/Makefile Mon Jun 27 00:04:22 2011
@@ -973,8 +973,9 @@
 tests: $(objpfx)check-textrel.out $(objpfx)check-execstack.out
 
 all-built-dso = $(common-objpfx)libc.so \
-		$(sort $(wildcard $(common-objpfx)*/lib*.so \
-				  $(common-objpfx)iconvdata/*.so))
+		$(filter-out $(common-objpfx)linkobj/libc.so, \
+			     $(sort $(wildcard $(common-objpfx)*/lib*.so \
+					       $(common-objpfx)iconvdata/*.so)))
 
 $(objpfx)check-textrel.out: $(objpfx)check-textrel $(all-built-dso)
 	$(dir $<)$(notdir $<) $(filter-out $<, $^) > $@

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c Mon Jun 27 00:04:22 2011
@@ -147,7 +147,7 @@
   INTERNAL_VSYSCALL (clock_gettime, err, 2, CLOCK_REALTIME, &ts);
 #else
   struct timeval ts;
-  gettimeofday (&ts, NULL);
+  __gettimeofday (&ts, NULL);
 #endif
   time_t prev = timestamp;
   atomic_read_barrier ();