aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2000-11-21 20:55:38 +0000
committerAndreas Schwab <schwab@suse.de>2000-11-21 20:55:38 +0000
commit57c2def90978a8e9003a434b42e55f115604b688 (patch)
tree6c7918f9e2a1b464b6ca9b8e33ba7c1014cf887c
parent307ea00a0e88f51308737746723d7c3985a314d6 (diff)
downloadglibc-57c2def90978a8e9003a434b42e55f115604b688.zip
glibc-57c2def90978a8e9003a434b42e55f115604b688.tar.gz
glibc-57c2def90978a8e9003a434b42e55f115604b688.tar.bz2
* 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.
-rw-r--r--sysdeps/alpha/setjmp.S6
-rw-r--r--sysdeps/arm/fpu/setjmp.S5
-rw-r--r--sysdeps/arm/setjmp.S5
-rw-r--r--sysdeps/i386/elf/setjmp.S2
-rw-r--r--sysdeps/i386/setjmp.S5
-rw-r--r--sysdeps/s390/elf/setjmp.S2
-rw-r--r--sysdeps/s390/setjmp.S6
-rw-r--r--sysdeps/sh/sh3/setjmp.S3
-rw-r--r--sysdeps/sh/sh4/setjmp.S5
-rw-r--r--sysdeps/sparc/sparc32/setjmp.S6
-rw-r--r--sysdeps/unix/sysv/linux/ia64/setjmp.S10
-rw-r--r--sysdeps/unix/sysv/linux/m68k/setjmp.c81
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S6
13 files changed, 17 insertions, 125 deletions
diff --git a/sysdeps/alpha/setjmp.S b/sysdeps/alpha/setjmp.S
index 894bb9e..299bd4d 100644
--- 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
--- 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
--- 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/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S
index bf03e65..9cfa83d 100644
--- a/sysdeps/i386/elf/setjmp.S
+++ b/sysdeps/i386/elf/setjmp.S
@@ -35,10 +35,8 @@ ENTRY (BP_SYM (setjmp))
jmp .Linternal_sigsetjmp
END (BP_SYM (setjmp))
- /* Binary compatibility entry point. */
ENTRY (BP_SYM (_setjmp))
.weak C_SYMBOL_NAME (BP_SYM (_setjmp))
-ENTRY (BP_SYM (__setjmp))
PUSH_SIGNAL_MASK (0)
/* FALL THROUGH */
diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
index 673b7ab..0d26bc8 100644
--- a/sysdeps/i386/setjmp.S
+++ b/sysdeps/i386/setjmp.S
@@ -25,11 +25,6 @@
#include "bp-sym.h"
#include "bp-asm.h"
- /* Binary compatibility entry point. */
-ENTRY (BP_SYM (__setjmp))
- PUSH_SIGNAL_MASK (0)
- /* FALL THROUGH */
-
#define PARMS LINKAGE /* no space for saved regs */
#define JMPBUF PARMS
#define SIGMSK JMPBUF+PTR_SIZE
diff --git a/sysdeps/s390/elf/setjmp.S b/sysdeps/s390/elf/setjmp.S
index 952cba2..e00c903 100644
--- a/sysdeps/s390/elf/setjmp.S
+++ b/sysdeps/s390/elf/setjmp.S
@@ -31,10 +31,8 @@ ENTRY (setjmp)
j __sigsetjmp /* branch relativ to __sigsetjmp */
END (setjmp)
- /* Binary compatibility entry point. */
ENTRY(_setjmp)
.weak C_SYMBOL_NAME (_setjmp)
-ENTRY(__setjmp)
lhi %r3,0 /* second argument of zero */
ENTRY(__sigsetjmp)
diff --git a/sysdeps/s390/setjmp.S b/sysdeps/s390/setjmp.S
index af3d360..5c92191 100644
--- a/sysdeps/s390/setjmp.S
+++ b/sysdeps/s390/setjmp.S
@@ -28,12 +28,6 @@
/* Save the current program position in ENV and return 0. */
/* R2 = pointer to jmp_buf, R3 = savemask */
-/* Binary compatibility entry point. */
-
-ENTRY(__setjmp)
- sr %r3,%r3 /* set savemask to zero */
-END (__setjmp)
-
ENTRY(__sigsetjmp)
stm %r6,%r15,0(%r2) /* store registers in jmp_buf */
#ifdef PIC
diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S
index 74c7f70..c25f9a4 100644
--- a/sysdeps/sh/sh3/setjmp.S
+++ b/sysdeps/sh/sh3/setjmp.S
@@ -22,9 +22,6 @@
#define _ASM
#include <bits/setjmp.h>
- /* Binary compatibility entry point. */
-ENTRY (__setjmp)
- mov #0, r5
ENTRY (__sigsetjmp)
/* Save registers */
add #(JB_SIZE - 4 * 5), r4
diff --git a/sysdeps/sh/sh4/setjmp.S b/sysdeps/sh/sh4/setjmp.S
index 76061cd..1c091e8 100644
--- a/sysdeps/sh/sh4/setjmp.S
+++ b/sysdeps/sh/sh4/setjmp.S
@@ -22,9 +22,6 @@
#define _ASM
#include <bits/setjmp.h>
- /* Binary compatibility entry point. */
-ENTRY (__setjmp)
- mov #0, r5
ENTRY (__sigsetjmp)
/* Save registers */
add #JB_SIZE, r4
@@ -69,4 +66,4 @@ ENTRY (__sigsetjmp)
.L1:
.long C_SYMBOL_NAME(__sigjmp_save)
#endif
-END (__setjmp)
+END (__sigsetjmp)
diff --git a/sysdeps/sparc/sparc32/setjmp.S b/sysdeps/sparc/sparc32/setjmp.S
index 2ab409b..1a2e488 100644
--- a/sysdeps/sparc/sparc32/setjmp.S
+++ b/sysdeps/sparc/sparc32/setjmp.S
@@ -23,10 +23,10 @@
#define _SETJMP_H
#include <bits/setjmp.h>
-ENTRY(__setjmp)
+ENTRY(_setjmp)
b 1f
set 0, %o1
-END(__setjmp)
+END(_setjmp)
ENTRY(setjmp)
set 1, %o1
@@ -47,5 +47,5 @@ ENTRY (__sigsetjmp)
mov %g1, %o7
END(__sigsetjmp)
-weak_alias(__setjmp, _setjmp)
+weak_extern(_setjmp)
weak_extern(setjmp)
diff --git a/sysdeps/unix/sysv/linux/ia64/setjmp.S b/sysdeps/unix/sysv/linux/ia64/setjmp.S
index 05f47bc..63abe0d 100644
--- a/sysdeps/unix/sysv/linux/ia64/setjmp.S
+++ b/sysdeps/unix/sysv/linux/ia64/setjmp.S
@@ -81,13 +81,13 @@ setjmp: alloc r8=ar.pfs,2,0,0,0
br.cond.sptk.many __sigsetjmp
.endp setjmp
- .global __setjmp
- .proc __setjmp
-__setjmp:
+ .global _setjmp
+ .proc _setjmp
+_setjmp:
alloc r8=ar.pfs,2,0,0,0
mov in1=0
br.cond.sptk.many __sigsetjmp
- .endp __setjmp
+ .endp _setjmp
/* __sigsetjmp(__jmp_buf buf, int savemask) */
.align 32
@@ -183,5 +183,5 @@ __sigsetjmp:
ret
.endp __sigsetjmp
-weak_alias(__setjmp, _setjmp)
+weak_extern(_setjmp)
weak_extern(setjmp)
diff --git a/sysdeps/unix/sysv/linux/m68k/setjmp.c b/sysdeps/unix/sysv/linux/m68k/setjmp.c
deleted file mode 100644
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;
-}
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S b/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
index 65a1d34..d67ebc1 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
@@ -29,10 +29,10 @@
/* int _setjmp(jmp_buf) */
-ENTRY(__setjmp)
+ENTRY(_setjmp)
ba __sigsetjmp_local
set 0, %o1
-END(__setjmp)
+END(_setjmp)
/* int setjmp(jmp_buf) */
@@ -60,5 +60,5 @@ __sigsetjmp_local:
END(__sigsetjmp)
-weak_alias(__setjmp, _setjmp)
+weak_extern(_setjmp)
weak_extern(setjmp)