* sysdeps/alpha/setjmp.S: Remove __setjmp entry point.

* sysdeps/arm/setjmp.S: Likewise.
* sysdeps/arm/fpu/setjmp.S: Likewise.
* sysdeps/i386/setjmp.S: Likewise.
* sysdeps/i386/elf/setjmp.S: Likewise.
* sysdeps/s390/setjmp.S: Likewise.
* sysdeps/s390/elf/setjmp.S: Likewise.
* sysdeps/sh/sh3/setjmp.S: Likewise.
* sysdeps/sh/sh4/setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Likewise.
* sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Likewise.
* sysdeps/unix/sysv/linux/m68k/setjmp.c: Removed.

diff --git a/sysdeps/alpha/setjmp.S b/sysdeps/alpha/setjmp.S
index 894bb9e..299bd4d 100644 (file)
--- a/sysdeps/alpha/setjmp.S
+++ b/sysdeps/alpha/setjmp.S
@@ -72,11 +72,11 @@ END(__sigsetjmp)
 /* Put these traditional entry points in the same file so that we can
    elide much of the nonsense in trying to jmp to the real function.  */
 
-ENTRY(__setjmp)
+ENTRY(_setjmp)
        ldgp    gp, 0(pv)
        mov     0, a1
        br      $sigsetjmp_local
-END(__setjmp)
+END(_setjmp)
 
 ENTRY(setjmp)
        ldgp    gp, 0(pv)
@@ -84,5 +84,5 @@ ENTRY(setjmp)
        br      $sigsetjmp_local
 END(setjmp)
 
-weak_alias(__setjmp, _setjmp)
+weak_extern(_setjmp)
 weak_extern(setjmp)

diff --git a/sysdeps/arm/fpu/setjmp.S b/sysdeps/arm/fpu/setjmp.S
index 6ee53c5..b72900c 100644 (file)
--- a/sysdeps/arm/fpu/setjmp.S
+++ b/sysdeps/arm/fpu/setjmp.S
@@ -22,9 +22,6 @@
 #define _ASM
 #include <bits/setjmp.h>
 
-       /* Binary compatibility entry point.  */
-ENTRY (__setjmp)
-       mov     r1, #0
 ENTRY (__sigsetjmp)
        /* Save registers */
        sfmea   f4, 4, [r0]!
@@ -35,4 +32,4 @@ ENTRY (__sigsetjmp)
 
        /* Make a tail call to __sigjmp_save; it takes the same args.  */
        B       PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-END (__setjmp)
+END (__sigsetjmp)

diff --git a/sysdeps/arm/setjmp.S b/sysdeps/arm/setjmp.S
index 237cc0a..97f76cd 100644 (file)
--- a/sysdeps/arm/setjmp.S
+++ b/sysdeps/arm/setjmp.S
@@ -22,13 +22,10 @@
 #define _ASM
 #include <bits/setjmp.h>
 
-       /* Binary compatibility entry point.  */
-ENTRY (__setjmp)
-       mov     r1, #0
 ENTRY (__sigsetjmp)
        /* Save registers */
        stmia   r0, {v1-v6, sl, fp, sp, lr}
 
        /* Make a tail call to __sigjmp_save; it takes the same args.  */
        B       PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-END (__setjmp)
+END (__sigsetjmp)

diff --git a/sysdeps/unix/sysv/linux/m68k/setjmp.c b/sysdeps/unix/sysv/linux/m68k/setjmp.c
deleted file mode 100644 (file)
index 477e896..0000000
--- a/sysdeps/unix/sysv/linux/m68k/setjmp.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright (C) 1991, 1992, 1994, 1996 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 <setjmp.h>
-
-/* Save the current program position in ENV and return 0.  */
-int
-__sigsetjmp (jmp_buf env, int savemask)
-{
-  /* Save data registers D1 through D7.  */
-  asm volatile ("movem%.l %/d1-%/d7, %0"
-               : : "m" (env[0].__jmpbuf[0].__dregs[0]));
-
-  /* Save return address in place of register A0.  */
-  env[0].__jmpbuf[0].__aregs[0] = ((void **) &env)[-1];
-
-  /* Save address registers A1 through A5.  */
-  asm volatile ("movem%.l %/a1-%/a5, %0"
-               : : "m" (env[0].__jmpbuf[0].__aregs[1]));
-
-  /* Save caller's FP, not our own.  */
-  env[0].__jmpbuf[0].__fp = ((void **) &env)[-2];
-
-  /* Save caller's SP, not our own.  */
-  env[0].__jmpbuf[0].__sp = (void *) &env;
-
-#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
-
-  /* Save the signal mask if requested.  */
-  return __sigjmp_save (env, savemask);
-}
-
-/* Binary compatibility entry point.  */
-int
-__setjmp (jmp_buf env)
-{
-  /* Save data registers D1 through D7.  */
-  asm volatile ("movem%.l %/d1-%/d7, %0"
-               : : "m" (env[0].__jmpbuf[0].__dregs[0]));
-
-  /* Save return address in place of register A0.  */
-  env[0].__jmpbuf[0].__aregs[0] = ((void **) &env)[-1];
-
-  /* Save address registers A1 through A5.  */
-  asm volatile ("movem%.l %/a1-%/a5, %0"
-               : : "m" (env[0].__jmpbuf[0].__aregs[1]));
-
-  /* Save caller's FP, not our own.  */
-  env[0].__jmpbuf[0].__fp = ((void **) &env)[-2];
-
-  /* Save caller's SP, not our own.  */
-  env[0].__jmpbuf[0].__sp = (void *) &env;
-
-#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
-
-  /* The signal mask has already been dealt with.  */
-  return 0;
-}