Dike out.

diff --git a/sysdeps/sparc/sparc32/bsd-_setjmp.S b/sysdeps/sparc/sparc32/bsd-_setjmp.S
index bf49765..4e6a2da 100644 (file)
--- a/sysdeps/sparc/sparc32/bsd-_setjmp.S
+++ b/sysdeps/sparc/sparc32/bsd-_setjmp.S
@@ -1,40 +1 @@
-/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'.  Sparc version.
-   Copyright (C) 1994, 1997 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.  */
-
-#include <sysdep.h>
-
-ENTRY (_setjmp)
-
-#ifdef PIC
-       save    %sp, -64, %sp
-1:     call    2f
-       sethi   %hi(_GLOBAL_OFFSET_TABLE_-(1b-.)), %g1
-2:     or      %l7, %lo(_GLOBAL_OFFSET_TABLE_-(1b-.)), %g1
-       add     %g1, %o7, %g1
-       sethi   %hi(C_SYMBOL_NAME(__sigsetjmp)), %g2
-       restore
-       or      %g2, %lo(C_SYMBOL_NAME(__sigsetjmp)), %g2
-       ld      [%g1+%g2], %g1
-#else
-       sethi   %hi(C_SYMBOL_NAME(__sigsetjmp)), %g1
-       or      %g1, %lo(C_SYMBOL_NAME(__sigsetjmp)), %g1
-#endif
-
-       jmp %g1
-        mov %g0, %o1           /* Pass second argument of zero.  */
+/* _setjmp is in setjmp.S  */

diff --git a/sysdeps/sparc/sparc32/bsd-setjmp.S b/sysdeps/sparc/sparc32/bsd-setjmp.S
index 16dc260..1da848d 100644 (file)
--- a/sysdeps/sparc/sparc32/bsd-setjmp.S
+++ b/sysdeps/sparc/sparc32/bsd-setjmp.S
@@ -1,40 +1 @@
-/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'.  Sparc version.
-   Copyright (C) 1994, 1997 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.  */
-
-#include <sysdep.h>
-
-ENTRY (setjmp)
-
-#ifdef PIC
-       save    %sp, -64, %sp
-1:     call    2f
-       sethi   %hi(_GLOBAL_OFFSET_TABLE_-(1b-.)), %g1
-2:     or      %l7, %lo(_GLOBAL_OFFSET_TABLE_-(1b-.)), %g1
-       add     %g1, %o7, %g1
-       sethi   %hi(C_SYMBOL_NAME(__sigsetjmp)), %g2
-       restore
-       or      %g2, %lo(C_SYMBOL_NAME(__sigsetjmp)), %g2
-       ld      [%g1+%g2], %g1
-#else
-       sethi   %hi(C_SYMBOL_NAME(__sigsetjmp)), %g1
-       or      %g1, %lo(C_SYMBOL_NAME(__sigsetjmp)), %g1
-#endif
-
-       jmp %g1
-        mov 1, %o1             /* Pass second argument of one.  */
+/* setjmp is in setjmp.S  */

diff --git a/sysdeps/sparc/sparc32/setjmp.S b/sysdeps/sparc/sparc32/setjmp.S
index 772ec72..58d9411 100644 (file)
--- a/sysdeps/sparc/sparc32/setjmp.S
+++ b/sysdeps/sparc/sparc32/setjmp.S
@@ -22,33 +22,29 @@
 #define _ASM 1
 #include <bits/setjmp.h>
 
+ENTRY(_setjmp)
+       b       1f
+        set    0, %o1
+END(_setjmp)
+
+ENTRY(setjmp)
+       set     1, %o1
+END(setjmp)
+
 ENTRY (__sigsetjmp)
-       /* Save our SP and FP; in the delay slot of the jump, save our
-          return PC.  Save the signal mask if requested with a tail-call
-          for simplicity; it always returns zero.  */
-       ta   ST_FLUSH_WINDOWS
-#ifdef PIC
-       mov  %o7,%g1
-2:
-       call 1f
-       nop
 1:
-       sethi %hi(_GLOBAL_OFFSET_TABLE_-(2b-.)),%g2
-       or    %g2,%lo(_GLOBAL_OFFSET_TABLE_-(2b-.)),%g2
-       add   %g2,%o7,%g2
-       sethi %hi(C_SYMBOL_NAME (__sigjmp_save)), %g3
-       or    %g3,%lo(C_SYMBOL_NAME (__sigjmp_save)), %g3
-       st    %sp, [%o0 + (JB_SP * 4)]
-       st    %fp, [%o0 + (JB_FP * 4)]
-       mov   %g1,%o7
-       ld    [%g2+%g3],%g1
-       jmp   %g1
-       st   %o7, [%o0+(JB_PC*4)]
-#else
-       sethi %hi(C_SYMBOL_NAME (__sigjmp_save)), %g1
-       st %sp, [%o0 + (JB_SP*4)]
-       or %lo(C_SYMBOL_NAME (__sigjmp_save)), %g1, %g1
-       st %fp, [%o0 + (JB_FP*4)]
-       jmp %g1
-        st %o7, [%o0 + (JB_PC*4)]
-#endif /* PIC */
+       /* Save our PC, SP and FP.  Save the signal mask if requested with
+          a tail-call for simplicity; it always returns zero.  */
+       ta      ST_FLUSH_WINDOWS
+
+       st      %o7, [%o0 + (JB_PC * 4)]
+       st      %sp, [%o0 + (JB_SP * 4)]
+       st      %fp, [%o0 + (JB_FP * 4)]
+
+       mov     %o7, %g1
+       call    __sigjmp_save
+        mov    %g1, %o7
+END(__sigsetjmp)
+
+weak_extern(_setjmp)
+weak_extern(setjmp)