From owner-p4-projects@FreeBSD.ORG  Mon Jul  2 01:24:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 87A6816A421; Mon,  2 Jul 2007 01:24:45 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6240516A400
	for <perforce@freebsd.org>; Mon,  2 Jul 2007 01:24:45 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 52C2413C43E
	for <perforce@freebsd.org>; Mon,  2 Jul 2007 01:24:45 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l621Ojmq035610
	for <perforce@freebsd.org>; Mon, 2 Jul 2007 01:24:45 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l621Oisx035607
	for perforce@freebsd.org; Mon, 2 Jul 2007 01:24:44 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 2 Jul 2007 01:24:44 GMT
Message-Id: <200707020124.l621Oisx035607@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122691 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2007 01:24:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=122691

Change 122691 by peter@peter_overcee on 2007/07/02 01:23:43

	Fix differentiation of RSYSCALL and PSEUDO on arm.  PSEUDO
	was implemented identically to RSYSCALL and caused symbol
	pollution/collisions.

Affected files ...

.. //depot/projects/hammer/lib/libc/arm/SYS.h#4 edit

Differences ...

==== //depot/projects/hammer/lib/libc/arm/SYS.h#4 (text+ko) ====

@@ -56,26 +56,19 @@
 	_SYSCALL_NOERROR(x);						\
 	bcs PIC_SYM(CERROR, PLT)
 
-#define SYSCALL_NOERROR(x)						\
-	_SYSCALL_NOERROR(x)
-
 #define SYSCALL(x)							\
 	_SYSCALL(x)
 
-
-#define PSEUDO_NOERROR(x)						\
-	_SYSCALL_NOERROR(x);						\
+#define PSEUDO(x)							\
+	ENTRY(__CONCAT(__sys_, x));					\
+	.weak _C_LABEL(__CONCAT(_,x));					\
+	.set _C_LABEL(__CONCAT(_,x)),_C_LABEL(__CONCAT(__sys_,x));	\
+	SYSTRAP(x)
+	bcs PIC_SYM(CERROR, PLT)
 	RET
 
-#define PSEUDO(x)							\
+#define RSYSCALL(x)							\
 	_SYSCALL(x);							\
 	RET
 
-
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x)
-
-#define RSYSCALL(x)							\
-	PSEUDO(x)
-
 	.globl  CERROR