Date: Thu, 13 Nov 2008 20:46:07 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r184939 - in stable/7/lib/libc: . amd64 amd64/gen amd64/stdlib amd64/string amd64/sys i386 i386/gen i386/stdlib i386/string i386/sys Message-ID: <200811132046.mADKk7nd068519@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Thu Nov 13 20:46:07 2008 New Revision: 184939 URL: http://svn.freebsd.org/changeset/base/184939 Log: MFC: 184547,184548: add END() macros for Assembler code in libc. This causes the symbol table to include the size of the function. Approved by: re (kib) Modified: stable/7/lib/libc/ (props changed) stable/7/lib/libc/amd64/SYS.h stable/7/lib/libc/amd64/gen/_setjmp.S stable/7/lib/libc/amd64/gen/fabs.S stable/7/lib/libc/amd64/gen/modf.S stable/7/lib/libc/amd64/gen/rfork_thread.S stable/7/lib/libc/amd64/gen/setjmp.S stable/7/lib/libc/amd64/gen/sigsetjmp.S stable/7/lib/libc/amd64/stdlib/div.S stable/7/lib/libc/amd64/stdlib/ldiv.S stable/7/lib/libc/amd64/stdlib/lldiv.S stable/7/lib/libc/amd64/string/bcmp.S stable/7/lib/libc/amd64/string/bcopy.S stable/7/lib/libc/amd64/string/bzero.S stable/7/lib/libc/amd64/string/memcmp.S stable/7/lib/libc/amd64/string/memset.S stable/7/lib/libc/amd64/string/strcat.S stable/7/lib/libc/amd64/string/strcmp.S stable/7/lib/libc/amd64/string/strcpy.S stable/7/lib/libc/amd64/sys/brk.S stable/7/lib/libc/amd64/sys/exect.S stable/7/lib/libc/amd64/sys/getcontext.S stable/7/lib/libc/amd64/sys/pipe.S stable/7/lib/libc/amd64/sys/ptrace.S stable/7/lib/libc/amd64/sys/reboot.S stable/7/lib/libc/amd64/sys/sbrk.S stable/7/lib/libc/amd64/sys/setlogin.S stable/7/lib/libc/amd64/sys/vfork.S stable/7/lib/libc/i386/SYS.h stable/7/lib/libc/i386/gen/_ctx_start.S stable/7/lib/libc/i386/gen/_setjmp.S stable/7/lib/libc/i386/gen/fabs.S stable/7/lib/libc/i386/gen/modf.S stable/7/lib/libc/i386/gen/rfork_thread.S stable/7/lib/libc/i386/gen/setjmp.S stable/7/lib/libc/i386/gen/sigsetjmp.S stable/7/lib/libc/i386/stdlib/abs.S stable/7/lib/libc/i386/stdlib/div.S stable/7/lib/libc/i386/stdlib/labs.S stable/7/lib/libc/i386/stdlib/ldiv.S stable/7/lib/libc/i386/string/bcmp.S stable/7/lib/libc/i386/string/bcopy.S stable/7/lib/libc/i386/string/bzero.S stable/7/lib/libc/i386/string/ffs.S stable/7/lib/libc/i386/string/index.S stable/7/lib/libc/i386/string/memchr.S stable/7/lib/libc/i386/string/memcmp.S stable/7/lib/libc/i386/string/memset.S stable/7/lib/libc/i386/string/rindex.S stable/7/lib/libc/i386/string/strcat.S stable/7/lib/libc/i386/string/strchr.S stable/7/lib/libc/i386/string/strcmp.S stable/7/lib/libc/i386/string/strcpy.S stable/7/lib/libc/i386/string/strlen.S stable/7/lib/libc/i386/string/strncmp.S stable/7/lib/libc/i386/string/strrchr.S stable/7/lib/libc/i386/string/swab.S stable/7/lib/libc/i386/string/wcschr.S stable/7/lib/libc/i386/string/wcscmp.S stable/7/lib/libc/i386/string/wcslen.S stable/7/lib/libc/i386/string/wmemchr.S stable/7/lib/libc/i386/sys/Ovfork.S stable/7/lib/libc/i386/sys/brk.S stable/7/lib/libc/i386/sys/exect.S stable/7/lib/libc/i386/sys/getcontext.S stable/7/lib/libc/i386/sys/pipe.S stable/7/lib/libc/i386/sys/ptrace.S stable/7/lib/libc/i386/sys/reboot.S stable/7/lib/libc/i386/sys/sbrk.S stable/7/lib/libc/i386/sys/setlogin.S stable/7/lib/libc/i386/sys/syscall.S Modified: stable/7/lib/libc/amd64/SYS.h ============================================================================== --- stable/7/lib/libc/amd64/SYS.h Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/SYS.h Thu Nov 13 20:46:07 2008 (r184939) @@ -43,13 +43,15 @@ .weak CNAME(__CONCAT(_,x)); \ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \ - 2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx + 2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \ + END(__CONCAT(__sys_,x)) #define PSEUDO(x) ENTRY(__CONCAT(__sys_,x)); \ .weak CNAME(__CONCAT(_,x)); \ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret ; \ - 2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx + 2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \ + END(__CONCAT(__sys_,x)) #else #define RSYSCALL(x) ENTRY(__CONCAT(__sys_,x)); \ .weak CNAME(x); \ @@ -57,13 +59,15 @@ .weak CNAME(__CONCAT(_,x)); \ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \ - 2: jmp HIDENAME(cerror) + 2: jmp HIDENAME(cerror); \ + END(__CONCAT(__sys_,x)) #define PSEUDO(x) ENTRY(__CONCAT(__sys_,x)); \ .weak CNAME(__CONCAT(_,x)); \ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \ - 2: jmp HIDENAME(cerror) + 2: jmp HIDENAME(cerror); \ + END(__CONCAT(__sys_,x)) #endif #define KERNCALL movq %rcx, %r10; syscall Modified: stable/7/lib/libc/amd64/gen/_setjmp.S ============================================================================== --- stable/7/lib/libc/amd64/gen/_setjmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/gen/_setjmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -60,6 +60,7 @@ ENTRY(_setjmp) fnstcw 64(%rax) /* 8; fpu cw */ xorq %rax,%rax ret +END(_setjmp) .weak CNAME(_longjmp) .set CNAME(_longjmp),CNAME(___longjmp) @@ -81,3 +82,4 @@ ENTRY(___longjmp) incq %rax 1: movq %rcx,0(%rsp) ret +END(___longjmp) Modified: stable/7/lib/libc/amd64/gen/fabs.S ============================================================================== --- stable/7/lib/libc/amd64/gen/fabs.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/gen/fabs.S Thu Nov 13 20:46:07 2008 (r184939) @@ -37,6 +37,7 @@ ENTRY(fabs) movsd signbit(%rip), %xmm0 andnpd %xmm1, %xmm0 ret +END(fabs) .data signbit: Modified: stable/7/lib/libc/amd64/gen/modf.S ============================================================================== --- stable/7/lib/libc/amd64/gen/modf.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/gen/modf.S Thu Nov 13 20:46:07 2008 (r184939) @@ -86,3 +86,4 @@ ENTRY(modf) movsd -8(%rsp),%xmm0 ret +END(modf) Modified: stable/7/lib/libc/amd64/gen/rfork_thread.S ============================================================================== --- stable/7/lib/libc/amd64/gen/rfork_thread.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/gen/rfork_thread.S Thu Nov 13 20:46:07 2008 (r184939) @@ -99,3 +99,4 @@ ENTRY(rfork_thread) #else jmp HIDENAME(cerror) #endif +END(rfork_thread) Modified: stable/7/lib/libc/amd64/gen/setjmp.S ============================================================================== --- stable/7/lib/libc/amd64/gen/setjmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/gen/setjmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -69,6 +69,7 @@ ENTRY(setjmp) fnstcw 64(%rcx) /* 8; fpu cw */ xorq %rax,%rax ret +END(setjmp) .weak CNAME(longjmp) .set CNAME(longjmp),CNAME(__longjmp) @@ -99,3 +100,4 @@ ENTRY(__longjmp) incq %rax 1: movq %rcx,0(%rsp) ret +END(__longjmp) Modified: stable/7/lib/libc/amd64/gen/sigsetjmp.S ============================================================================== --- stable/7/lib/libc/amd64/gen/sigsetjmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/gen/sigsetjmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -77,6 +77,7 @@ ENTRY(sigsetjmp) fnstcw 64(%rcx) /* 8; fpu cw */ xorq %rax,%rax ret +END(sigsetjmp) .weak CNAME(siglongjmp) .set CNAME(siglongjmp),CNAME(__siglongjmp) @@ -109,3 +110,4 @@ ENTRY(__siglongjmp) incq %rax 1: movq %rcx,0(%rsp) ret +END(__siglongjmp) Modified: stable/7/lib/libc/amd64/stdlib/div.S ============================================================================== --- stable/7/lib/libc/amd64/stdlib/div.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/stdlib/div.S Thu Nov 13 20:46:07 2008 (r184939) @@ -15,3 +15,4 @@ ENTRY(div) salq $32,%rdx orq %rdx,%rax ret +END(div) Modified: stable/7/lib/libc/amd64/stdlib/ldiv.S ============================================================================== --- stable/7/lib/libc/amd64/stdlib/ldiv.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/stdlib/ldiv.S Thu Nov 13 20:46:07 2008 (r184939) @@ -13,3 +13,4 @@ ENTRY(ldiv) cqto idivq %rsi ret +END(ldiv) Modified: stable/7/lib/libc/amd64/stdlib/lldiv.S ============================================================================== --- stable/7/lib/libc/amd64/stdlib/lldiv.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/stdlib/lldiv.S Thu Nov 13 20:46:07 2008 (r184939) @@ -13,3 +13,4 @@ ENTRY(lldiv) cqto idivq %rsi ret +END(lldiv) Modified: stable/7/lib/libc/amd64/string/bcmp.S ============================================================================== --- stable/7/lib/libc/amd64/string/bcmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/bcmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -22,3 +22,4 @@ L1: setne %al movsbl %al,%eax ret +END(bcmp) Modified: stable/7/lib/libc/amd64/string/bcopy.S ============================================================================== --- stable/7/lib/libc/amd64/string/bcopy.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/bcopy.S Thu Nov 13 20:46:07 2008 (r184939) @@ -86,3 +86,12 @@ ENTRY(bcopy) movsq cld ret +#ifdef MEMCOPY +END(memcpy) +#else +#ifdef MEMMOVE +END(memmove) +#else +END(bcopy) +#endif +#endif Modified: stable/7/lib/libc/amd64/string/bzero.S ============================================================================== --- stable/7/lib/libc/amd64/string/bzero.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/bzero.S Thu Nov 13 20:46:07 2008 (r184939) @@ -41,3 +41,4 @@ L1: movq %rsi,%rcx /* zero remainder by stosb ret +END(bzero) Modified: stable/7/lib/libc/amd64/string/memcmp.S ============================================================================== --- stable/7/lib/libc/amd64/string/memcmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/memcmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -39,3 +39,4 @@ L6: xorl %eax,%eax /* Perform unsigned movb -1(%rsi),%dl subl %edx,%eax ret +END(memcmp) Modified: stable/7/lib/libc/amd64/string/memset.S ============================================================================== --- stable/7/lib/libc/amd64/string/memset.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/memset.S Thu Nov 13 20:46:07 2008 (r184939) @@ -58,3 +58,4 @@ L1: rep movq %r11,%rax ret +END(memset) Modified: stable/7/lib/libc/amd64/string/strcat.S ============================================================================== --- stable/7/lib/libc/amd64/string/strcat.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/strcat.S Thu Nov 13 20:46:07 2008 (r184939) @@ -163,3 +163,4 @@ ENTRY(strcat) .Ldone: ret +END(strcat) Modified: stable/7/lib/libc/amd64/string/strcmp.S ============================================================================== --- stable/7/lib/libc/amd64/string/strcmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/strcmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -71,3 +71,4 @@ ENTRY(strcmp) movzbq %dl,%rdx subq %rdx,%rax ret +END(strcmp) Modified: stable/7/lib/libc/amd64/string/strcpy.S ============================================================================== --- stable/7/lib/libc/amd64/string/strcpy.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/string/strcpy.S Thu Nov 13 20:46:07 2008 (r184939) @@ -109,3 +109,4 @@ ENTRY(strcpy) .Ldone: ret +END(strcpy) Modified: stable/7/lib/libc/amd64/sys/brk.S ============================================================================== --- stable/7/lib/libc/amd64/sys/brk.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/brk.S Thu Nov 13 20:46:07 2008 (r184939) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); ENTRY(_brk) pushq %rdi jmp ok +END(_brk) ENTRY(brk) pushq %rdi @@ -81,3 +82,4 @@ err: #else jmp HIDENAME(cerror) #endif +END(brk) Modified: stable/7/lib/libc/amd64/sys/exect.S ============================================================================== --- stable/7/lib/libc/amd64/sys/exect.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/exect.S Thu Nov 13 20:46:07 2008 (r184939) @@ -53,3 +53,4 @@ ENTRY(exect) #else jmp HIDENAME(cerror) #endif +END(exect) Modified: stable/7/lib/libc/amd64/sys/getcontext.S ============================================================================== --- stable/7/lib/libc/amd64/sys/getcontext.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/getcontext.S Thu Nov 13 20:46:07 2008 (r184939) @@ -52,3 +52,4 @@ ENTRY(__sys_getcontext) #else jmp HIDENAME(cerror) #endif +END(__sys_getcontext) Modified: stable/7/lib/libc/amd64/sys/pipe.S ============================================================================== --- stable/7/lib/libc/amd64/sys/pipe.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/pipe.S Thu Nov 13 20:46:07 2008 (r184939) @@ -57,3 +57,4 @@ ENTRY(__sys_pipe) #else jmp HIDENAME(cerror) #endif +END(__sys_pipe) Modified: stable/7/lib/libc/amd64/sys/ptrace.S ============================================================================== --- stable/7/lib/libc/amd64/sys/ptrace.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/ptrace.S Thu Nov 13 20:46:07 2008 (r184939) @@ -57,3 +57,4 @@ err: #else jmp HIDENAME(cerror) #endif +END(ptrace) Modified: stable/7/lib/libc/amd64/sys/reboot.S ============================================================================== --- stable/7/lib/libc/amd64/sys/reboot.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/reboot.S Thu Nov 13 20:46:07 2008 (r184939) @@ -54,3 +54,4 @@ ENTRY(__sys_reboot) #else jmp HIDENAME(cerror) #endif +END(__sys_reboot) Modified: stable/7/lib/libc/amd64/sys/sbrk.S ============================================================================== --- stable/7/lib/libc/amd64/sys/sbrk.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/sbrk.S Thu Nov 13 20:46:07 2008 (r184939) @@ -85,3 +85,4 @@ err: #else jmp HIDENAME(cerror) #endif +END(sbrk) Modified: stable/7/lib/libc/amd64/sys/setlogin.S ============================================================================== --- stable/7/lib/libc/amd64/sys/setlogin.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/setlogin.S Thu Nov 13 20:46:07 2008 (r184939) @@ -62,3 +62,4 @@ ENTRY(__sys_setlogin) #else jmp HIDENAME(cerror) #endif +END(__sys_setlogin) Modified: stable/7/lib/libc/amd64/sys/vfork.S ============================================================================== --- stable/7/lib/libc/amd64/sys/vfork.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/amd64/sys/vfork.S Thu Nov 13 20:46:07 2008 (r184939) @@ -56,3 +56,4 @@ ENTRY(__sys_vfork) #else jmp HIDENAME(cerror) #endif +END(__sys_vfork) Modified: stable/7/lib/libc/i386/SYS.h ============================================================================== --- stable/7/lib/libc/i386/SYS.h Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/SYS.h Thu Nov 13 20:46:07 2008 (r184939) @@ -44,13 +44,14 @@ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b -#define RSYSCALL(x) SYSCALL(x); ret +#define RSYSCALL(x) SYSCALL(x); ret; END(__CONCAT(__sys_,x)) #define PSEUDO(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \ ENTRY(__CONCAT(__sys_,x)); \ .weak CNAME(__CONCAT(_,x)); \ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ - mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b; ret + mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b; ret; \ + END(__CONCAT(__sys_,x)) /* gas messes up offset -- although we don't currently need it, do for BCS */ #define LCALL(x,y) .byte 0x9a ; .long y; .word x Modified: stable/7/lib/libc/i386/gen/_ctx_start.S ============================================================================== --- stable/7/lib/libc/i386/gen/_ctx_start.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/gen/_ctx_start.S Thu Nov 13 20:46:07 2008 (r184939) @@ -49,3 +49,4 @@ ENTRY(_ctx_start) call PIC_PLT(_ctx_done) /* should never return */ call PIC_PLT(abort) /* fubar */ ret +END(_ctx_start) Modified: stable/7/lib/libc/i386/gen/_setjmp.S ============================================================================== --- stable/7/lib/libc/i386/gen/_setjmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/gen/_setjmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -58,6 +58,7 @@ ENTRY(_setjmp) fnstcw 24(%eax) xorl %eax,%eax ret +END(_setjmp) .weak CNAME(_longjmp) .set CNAME(_longjmp),CNAME(___longjmp) @@ -77,3 +78,4 @@ ENTRY(___longjmp) incl %eax 1: movl %ecx,0(%esp) ret +END(___longjmp) Modified: stable/7/lib/libc/i386/gen/fabs.S ============================================================================== --- stable/7/lib/libc/i386/gen/fabs.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/gen/fabs.S Thu Nov 13 20:46:07 2008 (r184939) @@ -40,3 +40,4 @@ ENTRY(fabs) fldl 4(%esp) fabs ret +END(fabs) Modified: stable/7/lib/libc/i386/gen/modf.S ============================================================================== --- stable/7/lib/libc/i386/gen/modf.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/gen/modf.S Thu Nov 13 20:46:07 2008 (r184939) @@ -82,3 +82,4 @@ ENTRY(modf) fdivp /* return +/- 0 for +/- Inf, NaN for NaN */ leave ret +END(modf) Modified: stable/7/lib/libc/i386/gen/rfork_thread.S ============================================================================== --- stable/7/lib/libc/i386/gen/rfork_thread.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/gen/rfork_thread.S Thu Nov 13 20:46:07 2008 (r184939) @@ -115,3 +115,4 @@ ENTRY(rfork_thread) popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(rfork_thread) Modified: stable/7/lib/libc/i386/gen/setjmp.S ============================================================================== --- stable/7/lib/libc/i386/gen/setjmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/gen/setjmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -69,6 +69,7 @@ ENTRY(setjmp) fnstcw 24(%ecx) xorl %eax,%eax ret +END(setjmp) .weak CNAME(longjmp) .set CNAME(longjmp),CNAME(__longjmp) @@ -97,3 +98,4 @@ ENTRY(__longjmp) incl %eax 1: movl %ecx,0(%esp) ret +END(__longjmp) Modified: stable/7/lib/libc/i386/gen/sigsetjmp.S ============================================================================== --- stable/7/lib/libc/i386/gen/sigsetjmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/gen/sigsetjmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -78,10 +78,11 @@ ENTRY(sigsetjmp) fnstcw 24(%ecx) xorl %eax,%eax ret +END(sigsetjmp) .weak CNAME(siglongjmp); - .set CNAME(siglongjmp),CNAME(__siglongjmp); -ENTRY(__siglongjmp); + .set CNAME(siglongjmp),CNAME(__siglongjmp) +ENTRY(__siglongjmp) movl 4(%esp),%edx cmpl $0,44(%edx) jz 2f @@ -108,3 +109,4 @@ ENTRY(__siglongjmp); incl %eax 1: movl %ecx,0(%esp) ret +END(__siglongjmp) Modified: stable/7/lib/libc/i386/stdlib/abs.S ============================================================================== --- stable/7/lib/libc/i386/stdlib/abs.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/stdlib/abs.S Thu Nov 13 20:46:07 2008 (r184939) @@ -44,3 +44,4 @@ ENTRY(abs) jns 1f negl %eax 1: ret +END(abs) Modified: stable/7/lib/libc/i386/stdlib/div.S ============================================================================== --- stable/7/lib/libc/i386/stdlib/div.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/stdlib/div.S Thu Nov 13 20:46:07 2008 (r184939) @@ -36,3 +36,4 @@ ENTRY(div) movl %eax,4(%esp) movl %edx,8(%esp) ret +END(div) Modified: stable/7/lib/libc/i386/stdlib/labs.S ============================================================================== --- stable/7/lib/libc/i386/stdlib/labs.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/stdlib/labs.S Thu Nov 13 20:46:07 2008 (r184939) @@ -44,3 +44,4 @@ ENTRY(labs) jns 1f negl %eax 1: ret +END(labs) Modified: stable/7/lib/libc/i386/stdlib/ldiv.S ============================================================================== --- stable/7/lib/libc/i386/stdlib/ldiv.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/stdlib/ldiv.S Thu Nov 13 20:46:07 2008 (r184939) @@ -39,3 +39,4 @@ ENTRY(ldiv) movl %eax,4(%esp) movl %edx,8(%esp) ret +END(ldiv) Modified: stable/7/lib/libc/i386/string/bcmp.S ============================================================================== --- stable/7/lib/libc/i386/string/bcmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/bcmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -61,3 +61,4 @@ L1: popl %esi popl %edi ret +END(bcmp) Modified: stable/7/lib/libc/i386/string/bcopy.S ============================================================================== --- stable/7/lib/libc/i386/string/bcopy.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/bcopy.S Thu Nov 13 20:46:07 2008 (r184939) @@ -97,3 +97,12 @@ ENTRY(bcopy) popl %esi cld ret +#ifdef MEMCOPY +END(memcpy) +#else +#ifdef MEMMOVE +END(memmove) +#else +END(bcopy) +#endif +#endif Modified: stable/7/lib/libc/i386/string/bzero.S ============================================================================== --- stable/7/lib/libc/i386/string/bzero.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/bzero.S Thu Nov 13 20:46:07 2008 (r184939) @@ -79,3 +79,4 @@ L1: rep popl %ebx popl %edi ret +END(bzero) Modified: stable/7/lib/libc/i386/string/ffs.S ============================================================================== --- stable/7/lib/libc/i386/string/ffs.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/ffs.S Thu Nov 13 20:46:07 2008 (r184939) @@ -51,3 +51,4 @@ ENTRY(ffs) .align 2 L1: xorl %eax,%eax /* clear result */ ret +END(ffs) Modified: stable/7/lib/libc/i386/string/index.S ============================================================================== --- stable/7/lib/libc/i386/string/index.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/index.S Thu Nov 13 20:46:07 2008 (r184939) @@ -61,3 +61,4 @@ L1: L2: popl %ebx ret +END(index) Modified: stable/7/lib/libc/i386/string/memchr.S ============================================================================== --- stable/7/lib/libc/i386/string/memchr.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/memchr.S Thu Nov 13 20:46:07 2008 (r184939) @@ -56,3 +56,4 @@ ENTRY(memchr) L1: xorl %eax,%eax popl %edi ret +END(memchr) Modified: stable/7/lib/libc/i386/string/memcmp.S ============================================================================== --- stable/7/lib/libc/i386/string/memcmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/memcmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -73,3 +73,4 @@ L6: movzbl -1(%edi),%eax /* Perform un popl %esi popl %edi ret +END(memcmp) Modified: stable/7/lib/libc/i386/string/memset.S ============================================================================== --- stable/7/lib/libc/i386/string/memset.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/memset.S Thu Nov 13 20:46:07 2008 (r184939) @@ -87,3 +87,4 @@ L1: rep popl %ebx popl %edi ret +END(memset) Modified: stable/7/lib/libc/i386/string/rindex.S ============================================================================== --- stable/7/lib/libc/i386/string/rindex.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/rindex.S Thu Nov 13 20:46:07 2008 (r184939) @@ -62,3 +62,4 @@ L2: jne L1 popl %ebx ret +END(rindex) Modified: stable/7/lib/libc/i386/string/strcat.S ============================================================================== --- stable/7/lib/libc/i386/string/strcat.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/strcat.S Thu Nov 13 20:46:07 2008 (r184939) @@ -98,3 +98,4 @@ L1: movb (%edx),%al /* unroll loop, but L2: popl %eax /* pop destination address */ popl %edi /* restore edi */ ret +END(strcat) Modified: stable/7/lib/libc/i386/string/strchr.S ============================================================================== --- stable/7/lib/libc/i386/string/strchr.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/strchr.S Thu Nov 13 20:46:07 2008 (r184939) @@ -61,3 +61,4 @@ L1: L2: popl %ebx ret +END(strchr) Modified: stable/7/lib/libc/i386/string/strcmp.S ============================================================================== --- stable/7/lib/libc/i386/string/strcmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/strcmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -117,3 +117,4 @@ L3: movzbl (%eax),%eax movzbl (%edx),%edx subl %edx,%eax ret +END(strcmp) Modified: stable/7/lib/libc/i386/string/strcpy.S ============================================================================== --- stable/7/lib/libc/i386/string/strcpy.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/strcpy.S Thu Nov 13 20:46:07 2008 (r184939) @@ -87,3 +87,4 @@ L1: movb (%edx),%al /* unroll loop, but jne L1 L2: popl %eax /* pop dst address */ ret +END(strcpy) Modified: stable/7/lib/libc/i386/string/strlen.S ============================================================================== --- stable/7/lib/libc/i386/string/strlen.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/strlen.S Thu Nov 13 20:46:07 2008 (r184939) @@ -51,3 +51,4 @@ ENTRY(strlen) leal -1(%ecx),%eax /* and subtracting one */ popl %edi ret +END(strlen) Modified: stable/7/lib/libc/i386/string/strncmp.S ============================================================================== --- stable/7/lib/libc/i386/string/strncmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/strncmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -164,3 +164,4 @@ L3: movzbl (%eax),%eax /* unsigned comp L4: xorl %eax,%eax popl %ebx ret +END(strncmp) Modified: stable/7/lib/libc/i386/string/strrchr.S ============================================================================== --- stable/7/lib/libc/i386/string/strrchr.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/strrchr.S Thu Nov 13 20:46:07 2008 (r184939) @@ -62,3 +62,4 @@ L2: jne L1 popl %ebx ret +END(strrchr) Modified: stable/7/lib/libc/i386/string/swab.S ============================================================================== --- stable/7/lib/libc/i386/string/swab.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/swab.S Thu Nov 13 20:46:07 2008 (r184939) @@ -97,3 +97,4 @@ L3: lodsw L4: popl %edi popl %esi ret +END(swab) Modified: stable/7/lib/libc/i386/string/wcschr.S ============================================================================== --- stable/7/lib/libc/i386/string/wcschr.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/wcschr.S Thu Nov 13 20:46:07 2008 (r184939) @@ -74,3 +74,4 @@ found0: popl %ebx no: popl %ebx xorl %eax,%eax ret +END(wcschr) Modified: stable/7/lib/libc/i386/string/wcscmp.S ============================================================================== --- stable/7/lib/libc/i386/string/wcscmp.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/wcscmp.S Thu Nov 13 20:46:07 2008 (r184939) @@ -77,3 +77,4 @@ no0: subl (%esi),%eax popl %esi popl %edi ret +END(wcscmp) Modified: stable/7/lib/libc/i386/string/wcslen.S ============================================================================== --- stable/7/lib/libc/i386/string/wcslen.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/wcslen.S Thu Nov 13 20:46:07 2008 (r184939) @@ -66,3 +66,4 @@ found2: incl %eax found1: incl %eax found0: popl %ebx ret +END(wcslen) Modified: stable/7/lib/libc/i386/string/wmemchr.S ============================================================================== --- stable/7/lib/libc/i386/string/wmemchr.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/string/wmemchr.S Thu Nov 13 20:46:07 2008 (r184939) @@ -103,3 +103,4 @@ no: xorl %eax,%eax popl %ebx popl %edi ret +END(wmemchr) Modified: stable/7/lib/libc/i386/sys/Ovfork.S ============================================================================== --- stable/7/lib/libc/i386/sys/Ovfork.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/Ovfork.S Thu Nov 13 20:46:07 2008 (r184939) @@ -52,3 +52,4 @@ ENTRY(__sys_vfork) pushl %ecx PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(__sys_vfork) Modified: stable/7/lib/libc/i386/sys/brk.S ============================================================================== --- stable/7/lib/libc/i386/sys/brk.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/brk.S Thu Nov 13 20:46:07 2008 (r184939) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); .globl HIDENAME(minbrk) ENTRY(_brk) jmp ok +END(_brk) ENTRY(brk) #ifdef PIC @@ -84,3 +85,4 @@ ok: err: jmp HIDENAME(cerror) #endif +END(brk) Modified: stable/7/lib/libc/i386/sys/exect.S ============================================================================== --- stable/7/lib/libc/i386/sys/exect.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/exect.S Thu Nov 13 20:46:07 2008 (r184939) @@ -49,3 +49,4 @@ ENTRY(exect) KERNCALL PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) /* exect(file, argv, env); */ +END(exect) Modified: stable/7/lib/libc/i386/sys/getcontext.S ============================================================================== --- stable/7/lib/libc/i386/sys/getcontext.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/getcontext.S Thu Nov 13 20:46:07 2008 (r184939) @@ -48,3 +48,4 @@ ENTRY(__sys_getcontext) 1: PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(__sys_getcontext) Modified: stable/7/lib/libc/i386/sys/pipe.S ============================================================================== --- stable/7/lib/libc/i386/sys/pipe.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/pipe.S Thu Nov 13 20:46:07 2008 (r184939) @@ -44,3 +44,4 @@ SYSCALL(pipe) movl %edx,4(%ecx) movl $0,%eax ret +END(pipe) Modified: stable/7/lib/libc/i386/sys/ptrace.S ============================================================================== --- stable/7/lib/libc/i386/sys/ptrace.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/ptrace.S Thu Nov 13 20:46:07 2008 (r184939) @@ -55,3 +55,4 @@ ENTRY(ptrace) err: PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(ptrace) Modified: stable/7/lib/libc/i386/sys/reboot.S ============================================================================== --- stable/7/lib/libc/i386/sys/reboot.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/reboot.S Thu Nov 13 20:46:07 2008 (r184939) @@ -40,3 +40,4 @@ __FBSDID("$FreeBSD$"); SYSCALL(reboot) iret +END(reboot) Modified: stable/7/lib/libc/i386/sys/sbrk.S ============================================================================== --- stable/7/lib/libc/i386/sys/sbrk.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/sbrk.S Thu Nov 13 20:46:07 2008 (r184939) @@ -88,3 +88,4 @@ back: err: jmp HIDENAME(cerror) #endif /* PIC */ +END(sbrk) Modified: stable/7/lib/libc/i386/sys/setlogin.S ============================================================================== --- stable/7/lib/libc/i386/sys/setlogin.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/setlogin.S Thu Nov 13 20:46:07 2008 (r184939) @@ -52,3 +52,4 @@ SYSCALL(setlogin) movl $0,CNAME(_logname_valid) #endif ret /* setlogin(name) */ +END(setlogin) Modified: stable/7/lib/libc/i386/sys/syscall.S ============================================================================== --- stable/7/lib/libc/i386/sys/syscall.S Thu Nov 13 20:40:38 2008 (r184938) +++ stable/7/lib/libc/i386/sys/syscall.S Thu Nov 13 20:46:07 2008 (r184939) @@ -50,3 +50,4 @@ ENTRY(syscall) 1: PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(syscall)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811132046.mADKk7nd068519>