* io/fts.c: Make sure fts_cur is always valid after return from

	fts_read.
	Patch by Miloslav Trmac <mitr@redhat.com>.

diff --git a/ChangeLog b/ChangeLog
index 4e9daba..ee074a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-10  Ulrich Drepper  <drepper@redhat.com>
+
+       * io/fts.c: Make sure fts_cur is always valid after return from
+       fts_read.
+       Patch by Miloslav Trmac <mitr@redhat.com>.
+
 2006-10-27  Richard Sandiford  <richard@codesourcery.com>
 
        * elf/elf.h (R_MIPS_GLOB_DAT): Define.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 631e20d..66f5ff6 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-10  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c:
+       Adjust include path for pthread_barrier_wait.c move.
+
 2006-12-21  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/pthread_kill.c (pthread_kill): Make sure
@@ -71,7 +76,7 @@
        * sysdeps/pthread/pthread_getcpuclockid.c: Move to...
        * pthread_getcpuclockid.c: ...here.
 
-       * init.c: USE_TLS support is now default.
+       * init.c: USE_TLS support is now always enabled.
        * tst-tls5.h: Likewise.
        * sysdeps/alpha/tls.h: Likewise.
        * sysdeps/i386/tls.h: Likewise.

diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c
index 7613863..55d20eb 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c
@@ -1 +1 @@
-#include "../../../../../../pthread/pthread_barrier_wait.c"
+#include "../../../../../../../pthread_barrier_wait.c"