From owner-p4-projects@FreeBSD.ORG  Fri Dec 14 21:37:11 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E67B16A421; Fri, 14 Dec 2007 21:37:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9EBF716A41A
	for <perforce@freebsd.org>; Fri, 14 Dec 2007 21:37:10 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EB8A13C459
	for <perforce@freebsd.org>; Fri, 14 Dec 2007 21:37:10 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBELbA90028222
	for <perforce@freebsd.org>; Fri, 14 Dec 2007 21:37:10 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBELbAkA028219
	for perforce@freebsd.org; Fri, 14 Dec 2007 21:37:10 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 14 Dec 2007 21:37:10 GMT
Message-Id: <200712142137.lBELbAkA028219@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130893 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: Fri, 14 Dec 2007 21:37:11 -0000

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

Change 130893 by marcel@marcel_jnpr on 2007/12/14 21:36:13

	Set MACHINE_CPU to aim by default on PowerPC.
	When CPUTYPE is e500, set MACHINE_CPU to booke
	and set _CPUCFLAGS accordingly.

Affected files ...

.. //depot/projects/e500/share/mk/bsd.cpu.mk#6 edit

Differences ...

==== //depot/projects/e500/share/mk/bsd.cpu.mk#6 (text+ko) ====

@@ -12,6 +12,8 @@
 MACHINE_CPU = amd64 sse2 sse
 . elif ${MACHINE_ARCH} == "ia64"
 MACHINE_CPU = itanium
+. elif ${MACHINE_ARCH} == "powerpc"
+MACHINE_CPU = aim
 . elif ${MACHINE_ARCH} == "sparc64"
 . elif ${MACHINE_ARCH} == "arm"
 MACHINE_CPU = arm
@@ -110,8 +112,10 @@
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 .  endif
 . elif ${MACHINE_ARCH} == "powerpc"
-# XXX: This needs to be configurable. Use TARGET_USE_SOFTFLOAT?
-_CPUCFLAGS += -msoft-float
+.  if ${CPUTYPE} == "e500"
+MACHINE_CPU = booke
+_CPUCFLAGS = -Wa,-me500 -msoft-float
+.  endif
 . endif
 
 # Set up the list of CPU features based on the CPU type.  This is an
@@ -175,13 +179,6 @@
 LD += -EB
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
-.  if ${CPUTYPE} == "e500"
-MACHINE_CPU = e500
-_CPUCFLAGS+= -Wa,-me500
-.  endif
-.endif
-
 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
 
 .if !defined(NO_CPU_CFLAGS)