[BZ #5463, BZ #5464]

* 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.

diff --git a/ChangeLog b/ChangeLog
index c575591e754ee471086cbde58a9eaebfbb27834b..05780cdd3ac0baf9c43fb61bcafbd62d68283e61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2007-12-11  Ulrich Drepper  <drepper@redhat.com>
 
+       * 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.
+
        * malloc/arena.c (grow_heap): Split out code to shrink heap into...
        (shrink_heap): ... this new function.
        (heap_trim): Call shrink_heap instead of grow_heap.

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7101dbf588c22981cff1af0f1b71705ae50e6a58..5a3e8c86e041255f0912ad55927a115e41867d41 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-11  Ulrich Drepper  <drepper@redhat.com>
+
+       * charmsp/HP-THAI8: New file.
+
+       [BZ #5464]
+       * charmaps/HP-GREEK8: New file.
+
+       [BZ #5463]
+       * charmaps/HP-TURKISH8: New file.
+
 2007-12-10  Ulrich Drepper  <drepper@redhat.com>
 
        * charmaps/UTF-8: Add Unicode 5.1 entries.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5cb4fee88c8ad189fcea2ee5730a94a5ea522bb9..4741cfc27894e69869fd64009d5686f45b192c2f 100644 (file)
--- 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 a85bdd160bdc8e55bea6fa54c3baf6be19aad2a1..20bc59db9c80989cfbf6a0d710f90d2834edbe82 100644 (file)
--- 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: