Update.

2003-11-21  Jakub Jelinek  <jakub@redhat.com>

	* Makefile (distribute): Add tst-cleanup4aux.c.

	* tst-cond12.c (prepare): Add prototype.  Move after test-skeleton.c
	include.

	* tst-cond12.c (do_test): If USE_COND_SIGNAL is defined, use
	pthread_cond_signal.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5c9dfa828225b38fb8819e301cedb4661f7386a9..88ba084a306b057743c8566c2347f797dc8162f7 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,15 @@
+2003-11-21  Jakub Jelinek  <jakub@redhat.com>
+
+       * Makefile (distribute): Add tst-cleanup4aux.c.
+
+       * tst-cond12.c (prepare): Add prototype.  Move after test-skeleton.c
+       include.
+
 2003-11-21  Ulrich Drepper  <drepper@redhat.com>
 
+       * tst-cond12.c (do_test): If USE_COND_SIGNAL is defined, use
+       pthread_cond_signal.
+
        * sysdeps/pthread/pthread_cond_wait.c (__pthread_cond_wait): Don't
        store mutex address if the current value is ~0l.
        * sysdeps/pthread/pthread_cond_timedwait.c

diff --git a/nptl/Makefile b/nptl/Makefile
index 913d8b114f3bcd240e2513712890eeb8c6764bda..138ff4723c34072a9eb08a4a974fe01e5b208150 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -234,7 +234,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 \
        tst-context1 \
        tst-sched1
 
-distribute = eintr.c
+distribute = eintr.c tst-cleanup4aux.c
 
 gen-as-const-headers = pthread-errnos.sym
 

diff --git a/nptl/tst-cond12.c b/nptl/tst-cond12.c
index 256c8a9b9e3d332e6917c70417c2941c5bcbf295..769e6b1c928ba52403fcdc4523fdb59c17f27a3a 100644 (file)
--- a/nptl/tst-cond12.c
+++ b/nptl/tst-cond12.c
@@ -152,12 +152,21 @@ do_test (void)
 
       p->var = 0;
 
+#ifndef USE_COND_SIGNAL
       if (pthread_cond_broadcast (&p->c) != 0)
        {
          puts ("child: cond_broadcast failed");
          kill (getppid (), SIGKILL);
          exit (1);
        }
+#else
+      if (pthread_cond_signal (&p->c) != 0)
+       {
+         puts ("child: cond_signal failed");
+         kill (getppid (), SIGKILL);
+         exit (1);
+       }
+#endif
 
       if (pthread_mutex_unlock (&p->m) != 0)
        {