* Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index df63d6b..2fa486a 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-21  Roland McGrath  <roland@redhat.com>
+
+       * Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).
+
 2004-07-02  Roland McGrath  <roland@redhat.com>
 
        * configure: Don't exit.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 44af273..b24fde1 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-21  Roland McGrath  <roland@redhat.com>
+
+       * Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).
+
+2004-07-19  Roland McGrath  <roland@redhat.com>
+
+       * tst-cancel4.c (tf_waitid): Use WEXITED flag bit if available.
+
 2004-07-02  Roland McGrath  <roland@redhat.com>
 
        * configure: Don't exit.

diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index 87000fa..8dc8aec 100644 (file)
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -673,8 +673,11 @@ tf_waitid (void *arg)
   int s;
   pthread_cleanup_push (cl, NULL);
 
+#ifndef WEXITED
+# define WEXITED 0
+#endif
   siginfo_t si;
-  s = waitid (P_PID, pid, &si, 0);
+  s = waitid (P_PID, pid, &si, WEXITED);
 
   pthread_cleanup_pop (0);