Update.

2003-06-27  Ulrich Drepper  <drepper@redhat.com>

	* rt/Makefile (CFLAGS-librt-cancellation.c): Define.

diff --git a/ChangeLog b/ChangeLog
index 9e1d50addff250ed4493c8c363d348cb2843025b..8275df1f69dd5cd4596cf7500cd9ea5552370369 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-27  Ulrich Drepper  <drepper@redhat.com>
+
+       * rt/Makefile (CFLAGS-librt-cancellation.c): Define.
+
 2003-06-26  Roland McGrath  <roland@frob.com>
 
        * sysdeps/mach/configure.in: Barf rather than define NO_CREATION_TIME.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 21157bca0d8e2788986e5b5b6232d011bd66340a..65cf4efb59a1226d1396e99e5dda9acfcbeb94ba 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-27  Ulrich Drepper  <drepper@redhat.com>
+
+       * tst-cancel4.c (tf_msgrcv): Strengthen test against valid
+       premature returns a bit more.
+
 2003-06-26  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/pthread/librt-cancellation.c: Move __pthread_unwind

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index 2eba326fa3d6a81a8322ee5514c87205734103db..f09be4403d929878bfcb92a358c4ca287adc484f 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -334,8 +334,9 @@ versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait,
 
        .type   __condvar_tw_cleanup3, @function
 __condvar_tw_cleanup3:
-       leal    wakeup_seq(%edx), %ebx # XXX Is this correct?  %edx preserved?
+       movl    40(%esp), %ebx
 .LSbl5:
+       jmp     __condvar_tw_cleanup
        .size   __condvar_tw_cleanup3, .-__condvar_tw_cleanup3
        .type   __condvar_tw_cleanup2, @function
 __condvar_tw_cleanup2:

diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index 8b0b735ada1a7cbb1ad270ac9591d6615d77b42a..a8142d97688028a62eb2b3888353d1307630527a 100644 (file)
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -1891,6 +1891,8 @@ tf_msgrcv (void *arg)
        }
     }
 
+  ssize_t s;
+
   pthread_cleanup_push (cl, NULL);
 
   struct
@@ -1906,13 +1908,13 @@ tf_msgrcv (void *arg)
   do
     {
       errno = 0;
-      msgrcv (tempmsg, (struct msgbuf *) &m, 10, randnr, 0);
+      s = msgrcv (tempmsg, (struct msgbuf *) &m, 10, randnr, 0);
     }
-  while (errno == EIDRM);
+  while (errno == EIDRM || errno == EINTR);
 
   pthread_cleanup_pop (0);
 
-  printf ("%s: msgrcv returned\n", __FUNCTION__);
+  printf ("%s: msgrcv returned %zd with errno = %m\n", __FUNCTION__, s);
 
   exit (1);
 }

diff --git a/rt/Makefile b/rt/Makefile
index b99949240a553e475b131a2a839ef2e5f0087176..9f49a02e0cd800b744337e5cc2770718e0cd6489 100644 (file)
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -51,6 +51,7 @@ include ../Rules
 
 CFLAGS-aio_suspend.c = -fexceptions
 CFLAGS-clock_nanosleep.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-librt-cancellation.c = -fasynchronous-unwind-tables
 
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
 # This ensures they will load libc.so for needed symbols if loaded by