From owner-svn-src-head@FreeBSD.ORG  Sat May 10 16:38:19 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3C54AF09;
 Sat, 10 May 2014 16:38:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 29CCE20B;
 Sat, 10 May 2014 16:38:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGcJv2006623;
 Sat, 10 May 2014 16:38:19 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGcIbI006620;
 Sat, 10 May 2014 16:38:18 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405101638.s4AGcIbI006620@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 10 May 2014 16:38:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265833 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 May 2014 16:38:19 -0000

Author: imp
Date: Sat May 10 16:38:18 2014
New Revision: 265833
URL: http://svnweb.freebsd.org/changeset/base/265833

Log:
  Remove the compatibility hack for FreeBSD 7 systems for
  MACHINE_CPUARCH. Fewer places to have to hack each time a new one is
  added.

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

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Sat May 10 16:38:09 2014	(r265832)
+++ head/sys/conf/kern.pre.mk	Sat May 10 16:38:18 2014	(r265833)
@@ -7,9 +7,6 @@
 .include <bsd.compiler.mk>
 .include "kern.opts.mk"
 
-# backwards compat option for older systems.
-MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/}
-
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
 KERNEL?=	kernel

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Sat May 10 16:38:09 2014	(r265832)
+++ head/sys/conf/kmod.mk	Sat May 10 16:38:18 2014	(r265833)
@@ -60,9 +60,6 @@
 #		Unload a module.
 #
 
-# backwards compat option for older systems.
-MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/}
-
 AWK?=		awk
 KMODLOAD?=	/sbin/kldload
 KMODUNLOAD?=	/sbin/kldunload