From da5557c4683fc789a7e4457be28cce869a50c31b Mon Sep 17 00:00:00 2001 From: jb Date: Wed, 29 Apr 1998 09:14:35 +0000 Subject: Stop renaming these in libc_r because wrappered versions don't make sense. PR: i386/4826, bin/5953 --- lib/libc/amd64/gen/_setjmp.S | 12 ++---------- lib/libc/amd64/gen/setjmp.S | 12 ++---------- lib/libc/amd64/gen/sigsetjmp.S | 12 ++---------- lib/libc/i386/gen/_setjmp.S | 12 ++---------- lib/libc/i386/gen/setjmp.S | 12 ++---------- lib/libc/i386/gen/sigsetjmp.S | 12 ++---------- 6 files changed, 12 insertions(+), 60 deletions(-) diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S index 62259ce..4f1d2c7 100644 --- a/lib/libc/amd64/gen/_setjmp.S +++ b/lib/libc/amd64/gen/_setjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $" #endif /* LIBC_RCS and not lint */ /* @@ -53,11 +53,7 @@ #include "DEFS.h" -#ifdef _THREAD_SAFE -ENTRY(__thread_sys_setjmp) -#else ENTRY(_setjmp) -#endif movl 4(%esp),%eax movl 0(%esp),%edx movl %edx, 0(%eax) /* rta */ @@ -70,11 +66,7 @@ ENTRY(_setjmp) xorl %eax,%eax ret -#ifdef _THREAD_SAFE -ENTRY(__thread_sys_longjmp) -#else ENTRY(_longjmp) -#endif movl 4(%esp),%edx movl 8(%esp),%eax movl 0(%edx),%ecx diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S index 6525a16..24884b1 100644 --- a/lib/libc/amd64/gen/setjmp.S +++ b/lib/libc/amd64/gen/setjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $" #endif /* LIBC_RCS and not lint */ /* @@ -54,11 +54,7 @@ #include "DEFS.h" #include "SYS.h" -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_setjmp) -#else ENTRY(setjmp) -#endif PIC_PROLOGUE pushl $0 #ifdef _THREAD_SAFE @@ -81,11 +77,7 @@ ENTRY(setjmp) xorl %eax,%eax ret -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_longjmp) -#else ENTRY(longjmp) -#endif movl 4(%esp),%edx PIC_PROLOGUE pushl 24(%edx) diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S index 1220598..8e49294 100644 --- a/lib/libc/amd64/gen/sigsetjmp.S +++ b/lib/libc/amd64/gen/sigsetjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" @@ -59,11 +59,7 @@ * use sigreturn() if sigreturn() works. */ -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_sigsetjmp) -#else ENTRY(sigsetjmp) -#endif movl 8(%esp),%eax movl 4(%esp),%ecx movl %eax,32(%ecx) @@ -91,11 +87,7 @@ ENTRY(sigsetjmp) xorl %eax,%eax ret -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_siglongjmp) -#else ENTRY(siglongjmp) -#endif movl 4(%esp),%edx cmpl $0,32(%edx) jz 2f diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S index 62259ce..4f1d2c7 100644 --- a/lib/libc/i386/gen/_setjmp.S +++ b/lib/libc/i386/gen/_setjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $" #endif /* LIBC_RCS and not lint */ /* @@ -53,11 +53,7 @@ #include "DEFS.h" -#ifdef _THREAD_SAFE -ENTRY(__thread_sys_setjmp) -#else ENTRY(_setjmp) -#endif movl 4(%esp),%eax movl 0(%esp),%edx movl %edx, 0(%eax) /* rta */ @@ -70,11 +66,7 @@ ENTRY(_setjmp) xorl %eax,%eax ret -#ifdef _THREAD_SAFE -ENTRY(__thread_sys_longjmp) -#else ENTRY(_longjmp) -#endif movl 4(%esp),%edx movl 8(%esp),%eax movl 0(%edx),%ecx diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S index 6525a16..24884b1 100644 --- a/lib/libc/i386/gen/setjmp.S +++ b/lib/libc/i386/gen/setjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $" #endif /* LIBC_RCS and not lint */ /* @@ -54,11 +54,7 @@ #include "DEFS.h" #include "SYS.h" -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_setjmp) -#else ENTRY(setjmp) -#endif PIC_PROLOGUE pushl $0 #ifdef _THREAD_SAFE @@ -81,11 +77,7 @@ ENTRY(setjmp) xorl %eax,%eax ret -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_longjmp) -#else ENTRY(longjmp) -#endif movl 4(%esp),%edx PIC_PROLOGUE pushl 24(%edx) diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S index 1220598..8e49294 100644 --- a/lib/libc/i386/gen/sigsetjmp.S +++ b/lib/libc/i386/gen/sigsetjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" @@ -59,11 +59,7 @@ * use sigreturn() if sigreturn() works. */ -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_sigsetjmp) -#else ENTRY(sigsetjmp) -#endif movl 8(%esp),%eax movl 4(%esp),%ecx movl %eax,32(%ecx) @@ -91,11 +87,7 @@ ENTRY(sigsetjmp) xorl %eax,%eax ret -#ifdef _THREAD_SAFE -ENTRY(_thread_sys_siglongjmp) -#else ENTRY(siglongjmp) -#endif movl 4(%esp),%edx cmpl $0,32(%edx) jz 2f -- cgit v1.1