diff options
| author | jasone <jasone@FreeBSD.org> | 2000-01-20 21:58:27 +0000 |
|---|---|---|
| committer | jasone <jasone@FreeBSD.org> | 2000-01-20 21:58:27 +0000 |
| commit | 303a1b5e43d1ba6712cacc54c1948573df74cac3 (patch) | |
| tree | a136b1278296a9a9300e66b22e1c30ea04829651 /lib/libc/amd64 | |
| parent | d28faf45be05bed11d5dbd509470a4449f5d1714 (diff) | |
| download | FreeBSD-src-303a1b5e43d1ba6712cacc54c1948573df74cac3.zip FreeBSD-src-303a1b5e43d1ba6712cacc54c1948573df74cac3.tar.gz | |
Remove unnecessary alternate entry points for *setjmp(). Make the main
entry point the standard name when not compiling libc_r (for example,
longjmp is the main entry point instead of __longjmp).
Suggested by: bde
Diffstat (limited to 'lib/libc/amd64')
| -rw-r--r-- | lib/libc/amd64/gen/_setjmp.S | 11 | ||||
| -rw-r--r-- | lib/libc/amd64/gen/setjmp.S | 11 | ||||
| -rw-r--r-- | lib/libc/amd64/gen/sigsetjmp.S | 11 |
3 files changed, 18 insertions, 15 deletions
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S index 64606c5..9c66308 100644 --- a/lib/libc/amd64/gen/_setjmp.S +++ b/lib/libc/amd64/gen/_setjmp.S @@ -53,8 +53,7 @@ #include "DEFS.h" -ALTENTRY(_setjmp) -ENTRY(___setjmp) +ENTRY(_setjmp) movl 4(%esp),%eax movl 0(%esp),%edx movl %edx, 0(%eax) /* rta */ @@ -67,10 +66,12 @@ ENTRY(___setjmp) xorl %eax,%eax ret -#ifndef _THREAD_SAFE -ALTENTRY(_longjmp) -#endif +#ifdef _THREAD_SAFE ENTRY(___longjmp) +#else +ALTENTRY(___longjmp) +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 211c8a5..39e9c21 100644 --- a/lib/libc/amd64/gen/setjmp.S +++ b/lib/libc/amd64/gen/setjmp.S @@ -54,8 +54,7 @@ #include "DEFS.h" #include "SYS.h" -ALTENTRY(setjmp) -ENTRY(__setjmp) +ENTRY(setjmp) movl 4(%esp),%ecx PIC_PROLOGUE leal 28(%ecx), %eax @@ -81,10 +80,12 @@ ENTRY(__setjmp) xorl %eax,%eax ret -#ifndef _THREAD_SAFE -ALTENTRY(longjmp) -#endif +#ifdef _THREAD_SAFE ENTRY(__longjmp) +#else +ALTENTRY(__longjmp) +ENTRY(longjmp) +#endif movl 4(%esp),%edx PIC_PROLOGUE pushl $0 /* (sigset_t*)oset */ diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S index 2449094..13c0dc7 100644 --- a/lib/libc/amd64/gen/sigsetjmp.S +++ b/lib/libc/amd64/gen/sigsetjmp.S @@ -59,8 +59,7 @@ * use sigreturn() if sigreturn() works. */ -ALTENTRY(sigsetjmp) -ENTRY(__sigsetjmp) +ENTRY(sigsetjmp) movl 8(%esp),%eax movl 4(%esp),%ecx movl %eax,44(%ecx) @@ -90,10 +89,12 @@ ENTRY(__sigsetjmp) xorl %eax,%eax ret -#ifndef _THREAD_SAFE -ALTENTRY(siglongjmp) -#endif +#ifdef _THREAD_SAFE ENTRY(__siglongjmp) +#else +ALTENTRY(__siglongjmp) +ENTRY(siglongjmp) +#endif movl 4(%esp),%edx cmpl $0,44(%edx) jz 2f |
