From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 21:34:21 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 752B5106564A;
	Wed,  3 Mar 2010 21:34:21 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 64F2A8FC18;
	Wed,  3 Mar 2010 21:34:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23LYLkB072067;
	Wed, 3 Mar 2010 21:34:21 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23LYL0U072065;
	Wed, 3 Mar 2010 21:34:21 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003032134.o23LYL0U072065@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 3 Mar 2010 21:34:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204667 - user/jmallett/octeon/lib/libc/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Mar 2010 21:34:21 -0000

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();							\