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

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.

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.

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>
 

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: