aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-12-12 08:07:33 +0000
committerUlrich Drepper <drepper@redhat.com>2007-12-12 08:07:33 +0000
commit58d1179512a439514003b25b59eff7486a03fe0c (patch)
tree9e0bcd8850a082f18cc3883ecc59ccdbcf7e990c /nptl
parent189dce4f6ac2aff61fa15caea77b32deb2aa98e0 (diff)
downloadglibc-58d1179512a439514003b25b59eff7486a03fe0c.tar
glibc-58d1179512a439514003b25b59eff7486a03fe0c.tar.gz
glibc-58d1179512a439514003b25b59eff7486a03fe0c.tar.bz2
glibc-58d1179512a439514003b25b59eff7486a03fe0c.zip
[BZ #5463, BZ #5464]cvs/fedora-glibc-20071212T1051
* iconvdata/hp-thai8.c: New file. * iconvdata/Makefile: Add rules for hp-thai8.c. * iconvdata/tst-tables.sh: Add entry for HP-THAI8. * iconvdata/gconv-modules: Likewise. [BZ #5464] * iconvdata/hp-greek8.c: New file. * iconvdata/Makefile: Add rules for hp-greek8.c. * iconvdata/tst-tables.sh: Add entry for HP-GREEK8. * iconvdata/gconv-modules: Likewise. [BZ #5463] * iconvdata/hp-turkish8.c: New file. * iconvdata/Makefile: Add rules for hp-turkish8.c. * iconvdata/tst-tables.sh: Add entry for HP-TURKISH8. * iconvdata/gconv-modules: Likewise.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S4
2 files changed, 3 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5cb4fee88c..4741cfc278 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -3,6 +3,7 @@
[BZ #5465]
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S [!SHARED]
(__pthread_cond_timedwait): Don't use VDSO.
+ Patch by Michal Januszewski.
2007-12-07 Ulrich Drepper <drepper@redhat.com>
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 a85bdd160b..20bc59db9c 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,14 +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
+# ifdef SHARED
movq __vdso_clock_gettime@GOTPCREL(%rip), %rax
movq (%rax), %rax
PTR_DEMANGLE (%rax)
jz 26f
call *%rax
jmp 27f
-#endif
+# endif
26: movl $__NR_clock_gettime, %eax
syscall
27: