Update.

2000-11-07  Kazumoto Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/sh/bits/setjmp.h: Move to...
	* sysdeps/sh/sh4/bits/setjmp.h: ...here.
	* sysdeps/sh/sh3/bits/setjmp.h: New file.

4 files changed, 55 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ae5e88494..b3a16199a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-07  Kazumoto Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/sh/bits/setjmp.h: Move to...
+	* sysdeps/sh/sh4/bits/setjmp.h: ...here.
+	* sysdeps/sh/sh3/bits/setjmp.h: New file.
+
 2000-11-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* iconvdata/big5.c: Regenerated after BIG5 charmap change.
diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c
index 40f9db5302..b05d8bf66e 100644
--- a/linuxthreads/cancel.c
+++ b/linuxthreads/cancel.c
@@ -55,6 +55,7 @@ int pthread_cancel(pthread_t thread)
   int dorestart = 0;
   pthread_descr th;
   pthread_extricate_if *pextricate;
+  int already_canceled;
 
   __pthread_lock(&handle->h_lock, NULL);
   if (invalid_handle(handle, thread)) {
@@ -64,14 +65,15 @@ int pthread_cancel(pthread_t thread)
 
   th = handle->h_descr;
 
-  if (th->p_cancelstate == PTHREAD_CANCEL_DISABLE || th->p_canceled) {
-    th->p_canceled = 1;
+  already_canceled = th->p_canceled;
+  th->p_canceled = 1;
+
+  if (th->p_cancelstate == PTHREAD_CANCEL_DISABLE || already_canceled) {
     __pthread_unlock(&handle->h_lock);
     return 0;
   }
 
   pextricate = th->p_extricate;
-  th->p_canceled = 1;
   pid = th->p_pid;
 
   /* If the thread has registered an extrication interface, then
diff --git a/sysdeps/sh/sh3/bits/setjmp.h b/sysdeps/sh/sh3/bits/setjmp.h
new file mode 100644
index 0000000000..782704ddd6
--- /dev/null
+++ b/sysdeps/sh/sh3/bits/setjmp.h
@@ -0,0 +1,44 @@
+/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* Define the machine-dependent type `jmp_buf'.  SH version. */
+
+#ifndef _SETJMP_H
+# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
+#endif
+
+#ifndef _ASM
+typedef struct
+  {
+    /* Callee-saved registers r8 through r15.  */
+    int __regs[8];
+
+    /* Program counter.  */
+    void * __pc;
+
+    /* The global pointer.  */
+    void * __gbr;
+  } __jmp_buf[1];
+#endif
+
+#define JB_SIZE		(4 * 10)
+
+/* Test if longjmp to JMPBUF would unwind the frame
+   containing a local variable at ADDRESS.  */
+#define _JMPBUF_UNWINDS(jmpbuf, address) \
+  ((void *) (address) < &(jmpbuf)[0].__regs[7])
diff --git a/sysdeps/sh/bits/setjmp.h b/sysdeps/sh/sh4/bits/setjmp.h
index d5918f2ad0..d5918f2ad0 100644
--- a/sysdeps/sh/bits/setjmp.h
+++ b/sysdeps/sh/sh4/bits/setjmp.h