aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-12-12 08:06:15 +0000
committerUlrich Drepper <drepper@redhat.com>2007-12-12 08:06:15 +0000
commit189dce4f6ac2aff61fa15caea77b32deb2aa98e0 (patch)
tree42a4390c8ad0e42ed23b4c8bb36434b04cbb1fed /nptl
parentcbf5760e629a71c4c7d66f4fbd7e47914e947879 (diff)
downloadglibc-189dce4f6ac2aff61fa15caea77b32deb2aa98e0.zip
glibc-189dce4f6ac2aff61fa15caea77b32deb2aa98e0.tar.gz
glibc-189dce4f6ac2aff61fa15caea77b32deb2aa98e0.tar.bz2
[BZ #5465]
2007-12-12 Ulrich Drepper <drepper@redhat.com> [BZ #5465] * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S [!SHARED] (__pthread_cond_timedwait): Don't use VDSO.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S2
2 files changed, 8 insertions, 0 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c882028..5cb4fee 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-12 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #5465]
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S [!SHARED]
+ (__pthread_cond_timedwait): Don't use VDSO.
+
2007-12-07 Ulrich Drepper <drepper@redhat.com>
[BZ #5455]
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index d730a7e..a85bdd1 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -134,12 +134,14 @@ __pthread_cond_timedwait:
/* Only clocks 0 and 1 are allowed so far. Both are handled in the
kernel. */
leaq 24(%rsp), %rsi
+#ifdef SHARED
movq __vdso_clock_gettime@GOTPCREL(%rip), %rax
movq (%rax), %rax
PTR_DEMANGLE (%rax)
jz 26f
call *%rax
jmp 27f
+#endif
26: movl $__NR_clock_gettime, %eax
syscall
27: