Update.

2003-04-18  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/pthread/pthread.h: Don't mark pthread_testcancel with
	__THROW.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d38913303a22e87485e9cf3d5589d799b23dc60e..a456d5c57548c64728b1db17a44e953876824aef 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-18  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel with
+       __THROW.
+
 2003-04-16  Jakub Jelinek  <jakub@redhat.com>
 
        * tst-cancel4.c (do_test): Use %zd instead of %d when printing cnt.

diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 1c59e1ea2ec4a3afbfcb71786efcb84d8d495421..1433fe56f7ffcc3910eff1729b9e5cebc62f40e9 100644 (file)
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -377,8 +377,12 @@ extern int pthread_cancel (pthread_t __th) __THROW;
 
 /* Test for pending cancellation for the current thread and terminate
    the thread as per pthread_exit(PTHREAD_CANCELED) if it has been
-   cancelled.  */
-extern void pthread_testcancel (void) __THROW;
+   cancelled.
+
+   Note that this function is explicitly not marked to not throw an
+   exception in C++ code.  If cancellation is implemented by unwinding
+   this is necessary to have the compiler generate the unwind information.  */
+extern void pthread_testcancel (void);
 
 
 /* Cancellation handling with integration into exception handling.  */