Date: Sun, 2 Nov 2008 01:28:47 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184548 - in head/lib/libc/i386: . gen stdlib string sys Message-ID: <200811020128.mA21Sl2D025187@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Sun Nov 2 01:28:47 2008 New Revision: 184548 URL: http://svn.freebsd.org/changeset/base/184548 Log: Add missing END() macros, as per rev 184547 for amd64. The lack of these is mostly harmless, but it does upset some of valgrind's functionality. Modified: head/lib/libc/i386/SYS.h head/lib/libc/i386/gen/_ctx_start.S head/lib/libc/i386/gen/_setjmp.S head/lib/libc/i386/gen/fabs.S head/lib/libc/i386/gen/modf.S head/lib/libc/i386/gen/rfork_thread.S head/lib/libc/i386/gen/setjmp.S head/lib/libc/i386/gen/sigsetjmp.S head/lib/libc/i386/stdlib/abs.S head/lib/libc/i386/stdlib/div.S head/lib/libc/i386/stdlib/labs.S head/lib/libc/i386/stdlib/ldiv.S head/lib/libc/i386/string/bcmp.S head/lib/libc/i386/string/bcopy.S head/lib/libc/i386/string/bzero.S head/lib/libc/i386/string/ffs.S head/lib/libc/i386/string/index.S head/lib/libc/i386/string/memchr.S head/lib/libc/i386/string/memcmp.S head/lib/libc/i386/string/memset.S head/lib/libc/i386/string/rindex.S head/lib/libc/i386/string/strcat.S head/lib/libc/i386/string/strchr.S head/lib/libc/i386/string/strcmp.S head/lib/libc/i386/string/strcpy.S head/lib/libc/i386/string/strlen.S head/lib/libc/i386/string/strncmp.S head/lib/libc/i386/string/strrchr.S head/lib/libc/i386/string/swab.S head/lib/libc/i386/string/wcschr.S head/lib/libc/i386/string/wcscmp.S head/lib/libc/i386/string/wcslen.S head/lib/libc/i386/string/wmemchr.S head/lib/libc/i386/sys/Ovfork.S head/lib/libc/i386/sys/brk.S head/lib/libc/i386/sys/exect.S head/lib/libc/i386/sys/getcontext.S head/lib/libc/i386/sys/pipe.S head/lib/libc/i386/sys/ptrace.S head/lib/libc/i386/sys/reboot.S head/lib/libc/i386/sys/sbrk.S head/lib/libc/i386/sys/setlogin.S head/lib/libc/i386/sys/syscall.S Modified: head/lib/libc/i386/SYS.h ============================================================================== --- head/lib/libc/i386/SYS.h Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/SYS.h Sun Nov 2 01:28:47 2008 (r184548) @@ -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: head/lib/libc/i386/gen/_ctx_start.S ============================================================================== --- head/lib/libc/i386/gen/_ctx_start.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/gen/_ctx_start.S Sun Nov 2 01:28:47 2008 (r184548) @@ -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: head/lib/libc/i386/gen/_setjmp.S ============================================================================== --- head/lib/libc/i386/gen/_setjmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/gen/_setjmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -58,6 +58,7 @@ ENTRY(_setjmp) fnstcw 24(%eax) xorl %eax,%eax ret +END(_setjmp) .weak CNAME(_longjmp) .set CNAME(_longjmp),CNAME(___longjmp) @@ -76,3 +77,4 @@ ENTRY(___longjmp) incl %eax 1: movl %ecx,0(%esp) ret +END(___longjmp) Modified: head/lib/libc/i386/gen/fabs.S ============================================================================== --- head/lib/libc/i386/gen/fabs.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/gen/fabs.S Sun Nov 2 01:28:47 2008 (r184548) @@ -40,3 +40,4 @@ ENTRY(fabs) fldl 4(%esp) fabs ret +END(fabs) Modified: head/lib/libc/i386/gen/modf.S ============================================================================== --- head/lib/libc/i386/gen/modf.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/gen/modf.S Sun Nov 2 01:28:47 2008 (r184548) @@ -82,3 +82,4 @@ ENTRY(modf) fdivp /* return +/- 0 for +/- Inf, NaN for NaN */ leave ret +END(modf) Modified: head/lib/libc/i386/gen/rfork_thread.S ============================================================================== --- head/lib/libc/i386/gen/rfork_thread.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/gen/rfork_thread.S Sun Nov 2 01:28:47 2008 (r184548) @@ -115,3 +115,4 @@ ENTRY(rfork_thread) popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(rfork_thread) Modified: head/lib/libc/i386/gen/setjmp.S ============================================================================== --- head/lib/libc/i386/gen/setjmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/gen/setjmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -69,6 +69,7 @@ ENTRY(setjmp) fnstcw 24(%ecx) xorl %eax,%eax ret +END(setjmp) .weak CNAME(longjmp) .set CNAME(longjmp),CNAME(__longjmp) @@ -96,3 +97,4 @@ ENTRY(__longjmp) incl %eax 1: movl %ecx,0(%esp) ret +END(__longjmp) Modified: head/lib/libc/i386/gen/sigsetjmp.S ============================================================================== --- head/lib/libc/i386/gen/sigsetjmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/gen/sigsetjmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -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: head/lib/libc/i386/stdlib/abs.S ============================================================================== --- head/lib/libc/i386/stdlib/abs.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/stdlib/abs.S Sun Nov 2 01:28:47 2008 (r184548) @@ -44,3 +44,4 @@ ENTRY(abs) jns 1f negl %eax 1: ret +END(abs) Modified: head/lib/libc/i386/stdlib/div.S ============================================================================== --- head/lib/libc/i386/stdlib/div.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/stdlib/div.S Sun Nov 2 01:28:47 2008 (r184548) @@ -36,3 +36,4 @@ ENTRY(div) movl %eax,4(%esp) movl %edx,8(%esp) ret +END(div) Modified: head/lib/libc/i386/stdlib/labs.S ============================================================================== --- head/lib/libc/i386/stdlib/labs.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/stdlib/labs.S Sun Nov 2 01:28:47 2008 (r184548) @@ -44,3 +44,4 @@ ENTRY(labs) jns 1f negl %eax 1: ret +END(labs) Modified: head/lib/libc/i386/stdlib/ldiv.S ============================================================================== --- head/lib/libc/i386/stdlib/ldiv.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/stdlib/ldiv.S Sun Nov 2 01:28:47 2008 (r184548) @@ -39,3 +39,4 @@ ENTRY(ldiv) movl %eax,4(%esp) movl %edx,8(%esp) ret +END(ldiv) Modified: head/lib/libc/i386/string/bcmp.S ============================================================================== --- head/lib/libc/i386/string/bcmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/bcmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -61,3 +61,4 @@ L1: popl %esi popl %edi ret +END(bcmp) Modified: head/lib/libc/i386/string/bcopy.S ============================================================================== --- head/lib/libc/i386/string/bcopy.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/bcopy.S Sun Nov 2 01:28:47 2008 (r184548) @@ -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: head/lib/libc/i386/string/bzero.S ============================================================================== --- head/lib/libc/i386/string/bzero.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/bzero.S Sun Nov 2 01:28:47 2008 (r184548) @@ -79,3 +79,4 @@ L1: rep popl %ebx popl %edi ret +END(bzero) Modified: head/lib/libc/i386/string/ffs.S ============================================================================== --- head/lib/libc/i386/string/ffs.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/ffs.S Sun Nov 2 01:28:47 2008 (r184548) @@ -51,3 +51,4 @@ ENTRY(ffs) .align 2 L1: xorl %eax,%eax /* clear result */ ret +END(ffs) Modified: head/lib/libc/i386/string/index.S ============================================================================== --- head/lib/libc/i386/string/index.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/index.S Sun Nov 2 01:28:47 2008 (r184548) @@ -61,3 +61,4 @@ L1: L2: popl %ebx ret +END(index) Modified: head/lib/libc/i386/string/memchr.S ============================================================================== --- head/lib/libc/i386/string/memchr.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/memchr.S Sun Nov 2 01:28:47 2008 (r184548) @@ -56,3 +56,4 @@ ENTRY(memchr) L1: xorl %eax,%eax popl %edi ret +END(memchr) Modified: head/lib/libc/i386/string/memcmp.S ============================================================================== --- head/lib/libc/i386/string/memcmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/memcmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -73,3 +73,4 @@ L6: movzbl -1(%edi),%eax /* Perform un popl %esi popl %edi ret +END(memcmp) Modified: head/lib/libc/i386/string/memset.S ============================================================================== --- head/lib/libc/i386/string/memset.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/memset.S Sun Nov 2 01:28:47 2008 (r184548) @@ -87,3 +87,4 @@ L1: rep popl %ebx popl %edi ret +END(memset) Modified: head/lib/libc/i386/string/rindex.S ============================================================================== --- head/lib/libc/i386/string/rindex.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/rindex.S Sun Nov 2 01:28:47 2008 (r184548) @@ -62,3 +62,4 @@ L2: jne L1 popl %ebx ret +END(rindex) Modified: head/lib/libc/i386/string/strcat.S ============================================================================== --- head/lib/libc/i386/string/strcat.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/strcat.S Sun Nov 2 01:28:47 2008 (r184548) @@ -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: head/lib/libc/i386/string/strchr.S ============================================================================== --- head/lib/libc/i386/string/strchr.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/strchr.S Sun Nov 2 01:28:47 2008 (r184548) @@ -61,3 +61,4 @@ L1: L2: popl %ebx ret +END(strchr) Modified: head/lib/libc/i386/string/strcmp.S ============================================================================== --- head/lib/libc/i386/string/strcmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/strcmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -117,3 +117,4 @@ L3: movzbl (%eax),%eax movzbl (%edx),%edx subl %edx,%eax ret +END(strcmp) Modified: head/lib/libc/i386/string/strcpy.S ============================================================================== --- head/lib/libc/i386/string/strcpy.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/strcpy.S Sun Nov 2 01:28:47 2008 (r184548) @@ -87,3 +87,4 @@ L1: movb (%edx),%al /* unroll loop, but jne L1 L2: popl %eax /* pop dst address */ ret +END(strcpy) Modified: head/lib/libc/i386/string/strlen.S ============================================================================== --- head/lib/libc/i386/string/strlen.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/strlen.S Sun Nov 2 01:28:47 2008 (r184548) @@ -51,3 +51,4 @@ ENTRY(strlen) leal -1(%ecx),%eax /* and subtracting one */ popl %edi ret +END(strlen) Modified: head/lib/libc/i386/string/strncmp.S ============================================================================== --- head/lib/libc/i386/string/strncmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/strncmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -164,3 +164,4 @@ L3: movzbl (%eax),%eax /* unsigned comp L4: xorl %eax,%eax popl %ebx ret +END(strncmp) Modified: head/lib/libc/i386/string/strrchr.S ============================================================================== --- head/lib/libc/i386/string/strrchr.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/strrchr.S Sun Nov 2 01:28:47 2008 (r184548) @@ -62,3 +62,4 @@ L2: jne L1 popl %ebx ret +END(strrchr) Modified: head/lib/libc/i386/string/swab.S ============================================================================== --- head/lib/libc/i386/string/swab.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/swab.S Sun Nov 2 01:28:47 2008 (r184548) @@ -97,3 +97,4 @@ L3: lodsw L4: popl %edi popl %esi ret +END(swab) Modified: head/lib/libc/i386/string/wcschr.S ============================================================================== --- head/lib/libc/i386/string/wcschr.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/wcschr.S Sun Nov 2 01:28:47 2008 (r184548) @@ -74,3 +74,4 @@ found0: popl %ebx no: popl %ebx xorl %eax,%eax ret +END(wcschr) Modified: head/lib/libc/i386/string/wcscmp.S ============================================================================== --- head/lib/libc/i386/string/wcscmp.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/wcscmp.S Sun Nov 2 01:28:47 2008 (r184548) @@ -77,3 +77,4 @@ no0: subl (%esi),%eax popl %esi popl %edi ret +END(wcscmp) Modified: head/lib/libc/i386/string/wcslen.S ============================================================================== --- head/lib/libc/i386/string/wcslen.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/wcslen.S Sun Nov 2 01:28:47 2008 (r184548) @@ -66,3 +66,4 @@ found2: incl %eax found1: incl %eax found0: popl %ebx ret +END(wcslen) Modified: head/lib/libc/i386/string/wmemchr.S ============================================================================== --- head/lib/libc/i386/string/wmemchr.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/string/wmemchr.S Sun Nov 2 01:28:47 2008 (r184548) @@ -103,3 +103,4 @@ no: xorl %eax,%eax popl %ebx popl %edi ret +END(wmemchr) Modified: head/lib/libc/i386/sys/Ovfork.S ============================================================================== --- head/lib/libc/i386/sys/Ovfork.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/Ovfork.S Sun Nov 2 01:28:47 2008 (r184548) @@ -52,3 +52,4 @@ ENTRY(__sys_vfork) pushl %ecx PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(__sys_vfork) Modified: head/lib/libc/i386/sys/brk.S ============================================================================== --- head/lib/libc/i386/sys/brk.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/brk.S Sun Nov 2 01:28:47 2008 (r184548) @@ -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: head/lib/libc/i386/sys/exect.S ============================================================================== --- head/lib/libc/i386/sys/exect.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/exect.S Sun Nov 2 01:28:47 2008 (r184548) @@ -49,3 +49,4 @@ ENTRY(exect) KERNCALL PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) /* exect(file, argv, env); */ +END(exect) Modified: head/lib/libc/i386/sys/getcontext.S ============================================================================== --- head/lib/libc/i386/sys/getcontext.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/getcontext.S Sun Nov 2 01:28:47 2008 (r184548) @@ -48,3 +48,4 @@ ENTRY(__sys_getcontext) 1: PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(__sys_getcontext) Modified: head/lib/libc/i386/sys/pipe.S ============================================================================== --- head/lib/libc/i386/sys/pipe.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/pipe.S Sun Nov 2 01:28:47 2008 (r184548) @@ -44,3 +44,4 @@ SYSCALL(pipe) movl %edx,4(%ecx) movl $0,%eax ret +END(pipe) Modified: head/lib/libc/i386/sys/ptrace.S ============================================================================== --- head/lib/libc/i386/sys/ptrace.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/ptrace.S Sun Nov 2 01:28:47 2008 (r184548) @@ -55,3 +55,4 @@ ENTRY(ptrace) err: PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) +END(ptrace) Modified: head/lib/libc/i386/sys/reboot.S ============================================================================== --- head/lib/libc/i386/sys/reboot.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/reboot.S Sun Nov 2 01:28:47 2008 (r184548) @@ -40,3 +40,4 @@ __FBSDID("$FreeBSD$"); SYSCALL(reboot) iret +END(reboot) Modified: head/lib/libc/i386/sys/sbrk.S ============================================================================== --- head/lib/libc/i386/sys/sbrk.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/sbrk.S Sun Nov 2 01:28:47 2008 (r184548) @@ -88,3 +88,4 @@ back: err: jmp HIDENAME(cerror) #endif /* PIC */ +END(sbrk) Modified: head/lib/libc/i386/sys/setlogin.S ============================================================================== --- head/lib/libc/i386/sys/setlogin.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/setlogin.S Sun Nov 2 01:28:47 2008 (r184548) @@ -52,3 +52,4 @@ SYSCALL(setlogin) movl $0,CNAME(_logname_valid) #endif ret /* setlogin(name) */ +END(setlogin) Modified: head/lib/libc/i386/sys/syscall.S ============================================================================== --- head/lib/libc/i386/sys/syscall.S Sun Nov 2 01:10:54 2008 (r184547) +++ head/lib/libc/i386/sys/syscall.S Sun Nov 2 01:28:47 2008 (r184548) @@ -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?200811020128.mA21Sl2D025187>