PERFORCE change 130893 for review

[Marcel Moolenaar]

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

Change 130893 by marcel at 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)