From owner-svn-src-all@FreeBSD.ORG  Mon Sep 13 01:20:53 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA9E61065673;
	Mon, 13 Sep 2010 01:20:53 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C987E8FC17;
	Mon, 13 Sep 2010 01:20:53 +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 o8D1KrnN043446;
	Mon, 13 Sep 2010 01:20:53 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8D1KrJM043444;
	Mon, 13 Sep 2010 01:20:53 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201009130120.o8D1KrJM043444@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 13 Sep 2010 01:20:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212513 - in head/usr.bin/xlint/arch: powerpc powerpc64
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2010 01:20:54 -0000

Author: imp
Date: Mon Sep 13 01:20:53 2010
New Revision: 212513
URL: http://svn.freebsd.org/changeset/base/212513

Log:
  merge powerpc and powerpc64 now that we use TARGET_CPUARCH

Deleted:
  head/usr.bin/xlint/arch/powerpc64/
Modified:
  head/usr.bin/xlint/arch/powerpc/targparam.h

Modified: head/usr.bin/xlint/arch/powerpc/targparam.h
==============================================================================
--- head/usr.bin/xlint/arch/powerpc/targparam.h	Mon Sep 13 01:00:48 2010	(r212512)
+++ head/usr.bin/xlint/arch/powerpc/targparam.h	Mon Sep 13 01:20:53 2010	(r212513)
@@ -29,13 +29,19 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 /*
  * Machine-dependent target parameters for lint1.
  */
 
+#ifdef __powerpc64__
+#include "lp64.h"
+#else
 #include "ilp32.h"
+#endif
 
 /*    
  * Should be set to 1 if the difference of two pointers is of type long
@@ -43,8 +49,13 @@
  * kept in sync with the compiler!
  */     
 
+#ifdef __powerpc64__
+#define	PTRDIFF_IS_LONG		1
+#define	SIZEOF_IS_ULONG		1
+#else
 #define	PTRDIFF_IS_LONG		0
 #define	SIZEOF_IS_ULONG		0
+#endif
 
 #define	FLOAT_SIZE		(4 * CHAR_BIT)
 #define	DOUBLE_SIZE		(8 * CHAR_BIT)