From owner-svn-src-all@freebsd.org Mon Jun 15 18:57:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D73B33E09A; Mon, 15 Jun 2020 18:57:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49m0vY2Rryz4HGN; Mon, 15 Jun 2020 18:57:45 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9A2222359; Mon, 15 Jun 2020 18:57:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05FIvhbZ083635; Mon, 15 Jun 2020 18:57:43 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05FIvhYI083634; Mon, 15 Jun 2020 18:57:43 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006151857.05FIvhYI083634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 15 Jun 2020 18:57:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362202 - head/sys/arm/include X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/arm/include X-SVN-Commit-Revision: 362202 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.33 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: Mon, 15 Jun 2020 18:57:47 -0000 Author: jhb Date: Mon Jun 15 18:57:43 2020 New Revision: 362202 URL: https://svnweb.freebsd.org/changeset/base/362202 Log: Simplify MACHINE_ARCH to be a single string. Big endian and armv4 mean that we are now down to only two supported variants. A future change will use MACHINE_ARCH in assembly which does not support C-style string concatentation and thus needs MACHINE_ARCH defined as a single string. Reviewed by: imp Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D25211 Modified: head/sys/arm/include/param.h Modified: head/sys/arm/include/param.h ============================================================================== --- head/sys/arm/include/param.h Mon Jun 15 16:35:27 2020 (r362201) +++ head/sys/arm/include/param.h Mon Jun 15 18:57:43 2020 (r362202) @@ -54,25 +54,15 @@ #define __PCI_REROUTE_INTERRUPT -#if __ARM_ARCH >= 7 -#define _V_SUFFIX "v7" -#elif __ARM_ARCH >= 6 -#define _V_SUFFIX "v6" -#else -#define _V_SUFFIX "" -#endif - -#ifdef __ARM_BIG_ENDIAN -#define _EB_SUFFIX "eb" -#else -#define _EB_SUFFIX "" -#endif - #ifndef MACHINE #define MACHINE "arm" #endif #ifndef MACHINE_ARCH -#define MACHINE_ARCH "arm" _V_SUFFIX _EB_SUFFIX +#if __ARM_ARCH >= 7 +#define MACHINE_ARCH "armv7" +#else +#define MACHINE_ARCH "armv6" +#endif #endif #ifdef SMP