[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r3219 - in /fsf/trunk/libc: ./ csu/ nptl/ nptl/sysdeps/unix/sysv/linux/x86_64/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/li...
- To: commits@xxxxxxxxxx
- Subject: [commits] r3219 - in /fsf/trunk/libc: ./ csu/ nptl/ nptl/sysdeps/unix/sysv/linux/x86_64/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/li...
- From: eglibc@xxxxxxxxxx
- Date: Tue, 21 Aug 2007 07:03:01 -0000
Author: eglibc
Date: Tue Aug 21 00:03:00 2007
New Revision: 3219
Log:
Import glibc-mainline for 2007-08-21
Added:
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/init-first.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c
Removed:
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/libc-start.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/csu/libc-start.c
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/init-first.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Aug 21 00:03:00 2007
@@ -1,3 +1,13 @@
+2007-08-20 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * csu/libc-start.c: Don't handle VDSO_SETUP here.
+ * sysdeps/unix/sysv/linux/init-first.c: Handle it here instead.
+ * sysdeps/unix/sysv/linux/x86_64/libc-start.c: Renamed to...
+ * sysdeps/unix/sysv/linux/x86_64/init-first.c: ...this. New file.
+ * sysdeps/unix/sysv/linux/powerpc/libc-start.c: Move VDSO_SETUP code
+ to...
+ * sysdeps/unix/sysv/linux/x86_64/init-first.c: ...here. New file.
+
2007-08-18 Ulrich Drepper <drepper@xxxxxxxxxx>
* po/nl.po: Update from translation team.
Modified: fsf/trunk/libc/csu/libc-start.c
==============================================================================
--- fsf/trunk/libc/csu/libc-start.c (original)
+++ fsf/trunk/libc/csu/libc-start.c Tue Aug 21 00:03:00 2007
@@ -148,10 +148,6 @@
# endif
#endif
-#ifdef VDSO_SETUP
- VDSO_SETUP ();
-#endif
-
/* Register the destructor of the dynamic linker if there is any. */
if (__builtin_expect (rtld_fini != NULL, 1))
__cxa_atexit ((void (*) (void *)) rtld_fini, NULL, NULL);
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Tue Aug 21 00:03:00 2007
@@ -1,3 +1,8 @@
+2007-08-20 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+ (__pthread_cond_timedwait): Use clock_gettime from VDSO if possible.
+
2007-08-16 Jakub Jelinek <jakub@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/alpha/lowlevellock.h
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S Tue Aug 21 00:03:00 2007
@@ -134,8 +134,15 @@
/* Only clocks 0 and 1 are allowed so far. Both are handled in the
kernel. */
leaq 24(%rsp), %rsi
- movl $__NR_clock_gettime, %eax
+ movq __vdso_clock_gettime@GOTPCREL(%rip), %rax
+ movq (%rax), %rax
+ PTR_DEMANGLE (%rax)
+ jz 26f
+ call *%rax
+ jmp 27f
+26: movl $__NR_clock_gettime, %eax
syscall
+27:
# ifndef __ASSUME_POSIX_TIMERS
cmpq $-ENOSYS, %rax
je 19f
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/init-first.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/init-first.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/init-first.c Tue Aug 21 00:03:00 2007
@@ -1,5 +1,5 @@
/* Initialization code run first thing by the ELF startup code. Linux version.
- Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995-2004, 2005, 2007 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
@@ -82,6 +82,10 @@
_dl_non_dynamic_init ();
#endif
+#ifdef VDSO_SETUP
+ VDSO_SETUP ();
+#endif
+
__init_misc (argc, argv, envp);
#ifdef USE_NONOPTION_FLAGS
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/init-first.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/init-first.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/init-first.c Tue Aug 21 00:03:00 2007
@@ -1,0 +1,49 @@
+/* Copyright (C) 2007 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifdef SHARED
+# include <dl-vdso.h>
+# undef __gettimeofday
+# undef __clock_gettime
+# undef __clock_getres
+# include <bits/libc-vdso.h>
+
+void *__vdso_gettimeofday attribute_hidden;
+void *__vdso_clock_gettime;
+void *__vdso_clock_getres;
+void *__vdso_get_tbfreq;
+
+
+static inline void
+_libc_vdso_platform_setup (void)
+{
+ PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565);
+
+ __vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday", &linux2615);
+
+ __vdso_clock_gettime = _dl_vdso_vsym ("__kernel_clock_gettime", &linux2615);
+
+ __vdso_clock_getres = _dl_vdso_vsym ("__kernel_clock_getres", &linux2615);
+
+ __vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq", &linux2615);
+}
+
+# define VDSO_SETUP _libc_vdso_platform_setup
+#endif
+
+#include "../init-first.c"
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c Tue Aug 21 00:03:00 2007
@@ -23,37 +23,6 @@
#include <sysdep.h>
#include <bp-start.h>
#include <bp-sym.h>
-
-
-#ifdef SHARED
-# include <sys/time.h>
-# include <dl-vdso.h>
-# undef __gettimeofday
-# undef __clock_gettime
-# undef __clock_getres
-# include <bits/libc-vdso.h>
-
-void *__vdso_gettimeofday attribute_hidden;
-void *__vdso_clock_gettime;
-void *__vdso_clock_getres;
-void *__vdso_get_tbfreq;
-
-static inline void
-_libc_vdso_platform_setup (void)
-{
- PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565);
-
- __vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday", &linux2615);
-
- __vdso_clock_gettime = _dl_vdso_vsym ("__kernel_clock_gettime", &linux2615);
-
- __vdso_clock_getres = _dl_vdso_vsym ("__kernel_clock_getres", &linux2615);
-
- __vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq", &linux2615);
-}
-
-# define VDSO_SETUP _libc_vdso_platform_setup
-#endif
int __cache_line_size attribute_hidden;
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c Tue Aug 21 00:03:00 2007
@@ -1,0 +1,49 @@
+/* Copyright (C) 2007 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifdef SHARED
+# include <dl-vdso.h>
+# include <bits/libc-vdso.h>
+
+int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
+
+int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
+
+
+static inline void
+_libc_vdso_platform_setup (void)
+{
+ PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
+
+ void *p = _dl_vdso_vsym ("gettimeofday", &linux26);
+ /* If the vDSO is not available we fall back on the old vsyscall. */
+#define VSYSCALL_ADDR_vgettimeofday 0xffffffffff600000ul
+ if (p == NULL)
+ p = (void *) VSYSCALL_ADDR_vgettimeofday;
+ PTR_MANGLE (p);
+ __vdso_gettimeofday = p;
+
+ p = _dl_vdso_vsym ("clock_gettime", &linux26);
+ PTR_MANGLE (p);
+ __vdso_clock_gettime = p;
+}
+
+# define VDSO_SETUP _libc_vdso_platform_setup
+#endif
+
+#include "../init-first.c"