Date: Wed, 3 Mar 2010 21:34:21 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204667 - user/jmallett/octeon/lib/libc/mips Message-ID: <201003032134.o23LYL0U072065@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Wed Mar 3 21:34:21 2010 New Revision: 204667 URL: http://svn.freebsd.org/changeset/base/204667 Log: In the PIC prologue for syscalls, use the address of the syscall leaf, not one of the weak symbols for it, as the function. This unbreaks at least lseek and anything else where libc overrides the weak symbol. Modified: user/jmallett/octeon/lib/libc/mips/SYS.h Modified: user/jmallett/octeon/lib/libc/mips/SYS.h ============================================================================== --- user/jmallett/octeon/lib/libc/mips/SYS.h Wed Mar 3 21:28:55 2010 (r204666) +++ user/jmallett/octeon/lib/libc/mips/SYS.h Wed Mar 3 21:34:21 2010 (r204667) @@ -133,7 +133,7 @@ LEAF(__sys_ ## x); \ _C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x)); \ .weak _C_LABEL(__CONCAT(_,x)); \ _C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x)); \ - PIC_PROLOGUE(x); \ + PIC_PROLOGUE(__sys_ ## x); \ SYSTRAP(x); \ bne a3,zero,err; \ PIC_RETURN(); \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003032134.o23LYL0U072065>