Update.

2000-06-12  Ulrich Drepper  <drepper@redhat.com>

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

3 files changed, 6 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 01d112c126..13d0bd8d2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/sh/sh3/bits/setjmp.h: Removed.
+	* sysdeps/sh/sh4/bits/setjmp.h: Moved to...
+	* sysdeps/sh/bits/setjmp.h: ...here.  New file.
+
 2000-06-12  Kazumoto Kojima  <kkojima@rr.iij4u.or.jp>
 	    Yutaka Niibe  <gniibe@chroot.org>
 
diff --git a/sysdeps/sh/sh4/bits/setjmp.h b/sysdeps/sh/bits/setjmp.h
index d5918f2ad0..d5918f2ad0 100644
--- a/sysdeps/sh/sh4/bits/setjmp.h
+++ b/sysdeps/sh/bits/setjmp.h
diff --git a/sysdeps/sh/sh3/bits/setjmp.h b/sysdeps/sh/sh3/bits/setjmp.h
deleted file mode 100644
index d2c4a420cd..0000000000
--- a/sysdeps/sh/sh3/bits/setjmp.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 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])