From owner-svn-src-all@FreeBSD.ORG  Mon Sep 13 07:27:03 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 C9AF81065673;
	Mon, 13 Sep 2010 07:27:03 +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 9FEFD8FC12;
	Mon, 13 Sep 2010 07:27:03 +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 o8D7R3f3073554;
	Mon, 13 Sep 2010 07:27:03 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8D7R3WP073552;
	Mon, 13 Sep 2010 07:27:03 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201009130727.o8D7R3WP073552@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 13 Sep 2010 07:27:03 +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: r212542 - head/sys/conf
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 07:27:03 -0000

Author: imp
Date: Mon Sep 13 07:27:03 2010
New Revision: 212542
URL: http://svn.freebsd.org/changeset/base/212542

Log:
  Prefer MACHINE_CPUARCH over MACHINE_ARCH

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Mon Sep 13 07:25:35 2010	(r212541)
+++ head/sys/conf/kern.mk	Mon Sep 13 07:27:03 2010	(r212542)
@@ -29,7 +29,7 @@ CWARNFLAGS?=	-Wall -Wredundant-decls -Wn
 # operations inside the kernel itself.  These operations are exclusively
 # reserved for user applications.
 #
-.if ${MACHINE_ARCH} == "i386" && ${CC:T:Micc} != "icc"
+.if ${MACHINE_CPUARCH} == "i386" && ${CC:T:Micc} != "icc"
 .if ${CC:T:Mclang} != "clang"
 CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
 .endif
@@ -37,14 +37,14 @@ CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -m
 INLINE_LIMIT?=	8000
 .endif
 
-.if ${MACHINE_ARCH} == "arm"
+.if ${MACHINE_CPUARCH} == "arm"
 INLINE_LIMIT?=	8000
 .endif
 #
 # For IA-64, we use r13 for the kernel globals pointer and we only use
 # a very small subset of float registers for integer divides.
 #
-.if ${MACHINE_ARCH} == "ia64"
+.if ${MACHINE_CPUARCH} == "ia64"
 CFLAGS+=	-ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata
 INLINE_LIMIT?=	15000
 .endif
@@ -54,7 +54,7 @@ INLINE_LIMIT?=	15000
 # point emulation.  This avoids using floating point registers for integer
 # operations which it has a tendency to do.
 #
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_CPUARCH} == "sparc64"
 CFLAGS+=	-mcmodel=medany -msoft-float
 INLINE_LIMIT?=	15000
 .endif
@@ -64,7 +64,7 @@ INLINE_LIMIT?=	15000
 # operations inside the kernel itself.  These operations are exclusively
 # reserved for user applications.
 #
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-mcmodel=kernel -mno-red-zone \
 		-mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow \
 		-msoft-float -fno-asynchronous-unwind-tables
@@ -76,7 +76,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" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+=	-msoft-float -mno-altivec
 INLINE_LIMIT?=	15000
 .endif
@@ -84,7 +84,7 @@ INLINE_LIMIT?=	15000
 #
 # For MIPS we also tell gcc to use floating point emulation
 #
-.if ${MACHINE_ARCH} == "mips"
+.if ${MACHINE_CPUARCH} == "mips"
 CFLAGS+=	-msoft-float
 INLINE_LIMIT?=	8000
 .endif
@@ -106,8 +106,9 @@ CFLAGS+=	-restrict
 #
 # GCC SSP support.
 #
-.if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && ${MACHINE_ARCH} != "ia64" && \
-	${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
+.if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && \
+    ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" && \
+    ${MACHINE_CPUARCH} != "mips"
 CFLAGS+=	-fstack-protector
 .endif