From owner-svn-src-all@freebsd.org Fri Oct 6 13:43:17 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFACBE37CFB; Fri, 6 Oct 2017 13:43:17 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 BD567B3; Fri, 6 Oct 2017 13:43:17 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v96DhGqK082022; Fri, 6 Oct 2017 13:43:16 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v96DhGMK082021; Fri, 6 Oct 2017 13:43:16 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710061343.v96DhGMK082021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 6 Oct 2017 13:43:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324363 - head/sys/arm/include X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/arm/include X-SVN-Commit-Revision: 324363 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Oct 2017 13:43:18 -0000 Author: imp Date: Fri Oct 6 13:43:16 2017 New Revision: 324363 URL: https://svnweb.freebsd.org/changeset/base/324363 Log: Oversight on armv7 bulk commit: Make MACHINE_ARCH be armv7 for new enough processors. This isn't ideal, because one could still compile MACHINE_ARCH armv6, but with armv7 options enabled. We don't normally do that, and it's a bit of an edge case so accept the less than ideal solution here in the absence of something better. Reported by: strejda@ Sponsored by: Netflix Modified: head/sys/arm/include/param.h Modified: head/sys/arm/include/param.h ============================================================================== --- head/sys/arm/include/param.h Fri Oct 6 12:31:55 2017 (r324362) +++ head/sys/arm/include/param.h Fri Oct 6 13:43:16 2017 (r324363) @@ -52,10 +52,12 @@ #define __PCI_REROUTE_INTERRUPT -#if __ARM_ARCH >= 6 -#define _V6_SUFFIX "v6" +#if __ARM_ARCH >= 7 +#define _V_SUFFIX "v7" +#elif __ARM_ARCH >= 6 +#define _V_SUFFIX "v6" #else -#define _V6_SUFFIX "" +#define _V_SUFFIX "" #endif #ifdef __ARM_BIG_ENDIAN @@ -68,7 +70,7 @@ #define MACHINE "arm" #endif #ifndef MACHINE_ARCH -#define MACHINE_ARCH "arm" _V6_SUFFIX _EB_SUFFIX +#define MACHINE_ARCH "arm" _V_SUFFIX _EB_SUFFIX #endif #if defined(SMP) || defined(KLD_MODULE)