svn commit: r362202 - head/sys/arm/include

[John Baldwin]

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