[commits] r13335 - in /fsf/trunk/libc: ChangeLog Versions.def sysdeps/unix/sysv/linux/Versions

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Apr  1 00:03:35 2011
New Revision: 13335

Log:
Import glibc-mainline for 2011-04-01

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Versions.def
    fsf/trunk/libc/sysdeps/unix/sysv/linux/Versions

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Apr  1 00:03:35 2011
@@ -5,6 +5,9 @@
 	* sysdeps/unix/sysv/linux/sys/timex.h: Move struct timex definition
 	to...
 	* sysdeps/unix/sysv/linux/bits/timex.h: ...here.  New file.
+	* Versions.def: Add GLIBC_2.14.
+	* sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime):
+	Export.
 
 2011-03-22  Ulrich Drepper  <drepper@xxxxxxxxx>
 

Modified: fsf/trunk/libc/Versions.def
==============================================================================
--- fsf/trunk/libc/Versions.def (original)
+++ fsf/trunk/libc/Versions.def Fri Apr  1 00:03:35 2011
@@ -30,6 +30,7 @@
   GLIBC_2.11
   GLIBC_2.12
   GLIBC_2.13
+  GLIBC_2.14
 %ifdef USE_IN_LIBIO
   HURD_CTHREADS_0.3
 %endif

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/Versions
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/Versions (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/Versions Fri Apr  1 00:03:35 2011
@@ -154,6 +154,9 @@
 
     fanotify_init; fanotify_mark;
   }
+  GLIBC_2.14 {
+    clock_adjtime;
+  }
   GLIBC_PRIVATE {
     # functions used in other libraries
     __syscall_rt_sigqueueinfo;