* sysdeps/m68k/setjmp.c: Also define setjmp and _setjmp if

BSD_SETJMP or BSD__SETJMP is defined, resp. 
* sysdeps/m68k/bsd-setjmp.c: Inline setjmp code instead of making 
a tail call to __sigsetjmp that would require extending the 
caller's frame. 
* sysdeps/m68k/bsd-_setjmp.c: Likewise. 
* sysdeps/m68k/bsd-setjmp.S: Deleted. 
* sysdeps/m68k/bsd-_setjmp.S: Deleted.

1 files changed, 14 insertions, 2 deletions

diff --git a/sysdeps/m68k/setjmp.c b/sysdeps/m68k/setjmp.c
index 04568623f9..80672ad4db 100644
--- a/sysdeps/m68k/setjmp.c
+++ b/sysdeps/m68k/setjmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1994, 1997, 2001 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
@@ -20,7 +20,15 @@
 
 /* Save the current program position in ENV and return 0.  */
 int
+#if defined BSD_SETJMP
+# undef setjmp
+setjmp (jmp_buf env)
+#elif defined BSD__SETJMP
+# undef _setjmp
+_setjmp (jmp_buf env)
+#else
 __sigsetjmp (jmp_buf env, int savemask)
+#endif
 {
   /* Save data registers D1 through D7.  */
   asm volatile ("movem%.l %/d1-%/d7, %0"
@@ -39,12 +47,16 @@ __sigsetjmp (jmp_buf env, int savemask)
   /* Save caller's SP, not our own.  */
   env[0].__jmpbuf[0].__sp = (void *) &env;
 
-#if	defined(__HAVE_68881__) || defined(__HAVE_FPU__)
+#if defined __HAVE_68881__ || defined __HAVE_FPU__
   /* Save floating-point (68881) registers FP0 through FP7.  */
   asm volatile ("fmovem%.x %/fp0-%/fp7, %0"
 		: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
 #endif
 
+#if defined BSD_SETJMP || defined BSD__SETJMP
+  return 0;
+#else
   /* Save the signal mask if requested.  */
   return __sigjmp_save (env, savemask);
+#endif
 }