Author: nwhitehorn
Date: Tue Jul 13 13:11:18 2010
New Revision: 209993
URL: http://svn.freebsd.org/changeset/base/209993

Log:
  Convert several instances of MACHINE_ARCH to MACHINE_CPUARCH and use the
  correct compiler flags on 64-bit PowerPC.

Modified:
  head/sys/conf/kern.mk
  head/sys/conf/kern.post.mk
  head/sys/conf/kern.pre.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk       Tue Jul 13 12:51:02 2010        (r209992)
+++ head/sys/conf/kern.mk       Tue Jul 13 13:11:18 2010        (r209993)
@@ -74,7 +74,7 @@ INLINE_LIMIT?=        8000
 # floating point registers for integer operations which it has a tendency to 
do.
 # Also explicitly disable Altivec instructions inside the kernel.
 #
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=       -msoft-float -mno-altivec
 INLINE_LIMIT?= 15000
 .endif

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk  Tue Jul 13 12:51:02 2010        (r209992)
+++ head/sys/conf/kern.post.mk  Tue Jul 13 13:11:18 2010        (r209993)
@@ -166,8 +166,8 @@ SRCS=       assym.s vnode_if.h ${BEFORE_DEPEND
        mv .newdep .depend
 
 _ILINKS= machine
-.if ${MACHINE} != ${MACHINE_ARCH}
-_ILINKS+= ${MACHINE_ARCH}
+.if ${MACHINE} != ${MACHINE_CPUARCH}
+_ILINKS+= ${MACHINE_CPUARCH}
 .endif
 
 # Ensure that the link exists without depending on it when it exists.
@@ -181,8 +181,8 @@ ${_ILINKS}:
        @case ${.TARGET} in \
        machine) \
                path=${S}/${MACHINE}/include ;; \
-       ${MACHINE_ARCH}) \
-               path=${S}/${MACHINE_ARCH}/include ;; \
+       ${MACHINE_CPUARCH}) \
+               path=${S}/${MACHINE_CPUARCH}/include ;; \
        esac ; \
        ${ECHO} ${.TARGET} "->" $$path ; \
        ln -s $$path ${.TARGET}

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk   Tue Jul 13 12:51:02 2010        (r209992)
+++ head/sys/conf/kern.pre.mk   Tue Jul 13 13:11:18 2010        (r209993)
@@ -12,7 +12,7 @@ KODIR?=               /boot/${KERNEL}
 LDSCRIPT_NAME?=        ldscript.$M
 LDSCRIPT?=     $S/conf/${LDSCRIPT_NAME}
 
-M=     ${MACHINE_ARCH}
+M=     ${MACHINE_CPUARCH}
 
 AWK?=          awk
 LINT?=         lint

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk       Tue Jul 13 12:51:02 2010        (r209992)
+++ head/sys/conf/kmod.mk       Tue Jul 13 13:11:18 2010        (r209993)
@@ -129,7 +129,7 @@ CFLAGS+=    ${DEBUG_FLAGS}
 CFLAGS+=       -fno-omit-frame-pointer
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=       -mlongcall -fno-omit-frame-pointer
 .endif
 
@@ -226,8 +226,8 @@ ${FULLPROG}: ${OBJS}
 .endif
 
 _ILINKS=@ machine
-.if ${MACHINE} != ${MACHINE_ARCH}
-_ILINKS+=${MACHINE_ARCH}
+.if ${MACHINE} != ${MACHINE_CPUARCH}
+_ILINKS+=${MACHINE_CPUARCH}
 .endif
 
 all: objwarn ${PROG}
@@ -254,8 +254,8 @@ SYSDIR=     ${_dir}
 
 ${_ILINKS}:
        @case ${.TARGET} in \
-       ${MACHINE_ARCH}) \
-               path=${SYSDIR}/${MACHINE_ARCH}/include ;; \
+       ${MACHINE_CPUARCH}) \
+               path=${SYSDIR}/${MACHINE_CPUARCH}/include ;; \
        machine) \
                path=${SYSDIR}/${MACHINE}/include ;; \
        @) \
@@ -451,11 +451,11 @@ assym.s: @/kern/genassym.sh
 .endif
        sh @/kern/genassym.sh genassym.o > ${.TARGET}
 .if exists(@)
-genassym.o: @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c
+genassym.o: @/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
 .endif
 genassym.o: @ machine ${SRCS:Mopt_*.h}
        ${CC} -c ${CFLAGS:N-fno-common} \
-           @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c
+           @/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
 .endif
 
 lint: ${SRCS}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to