summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2014-03-22 15:59:18 +0000
committerandrew <andrew@FreeBSD.org>2014-03-22 15:59:18 +0000
commit27bcbecb3424c1b23f6398bd1bd5652b2867ea6b (patch)
tree7ea2e37e3cf650bec25c7a05ce4a21cbd38e1358
parent260ba47599729a7cb2f104c437c909e8109aa2d2 (diff)
downloadFreeBSD-src-27bcbecb3424c1b23f6398bd1bd5652b2867ea6b.zip
FreeBSD-src-27bcbecb3424c1b23f6398bd1bd5652b2867ea6b.tar.gz
Simplify how we build MACHINE_ARCH. There are 3 options that may be set
however only arm, armeb, armv6, and soon armv6hf will be used.
-rw-r--r--sys/arm/include/param.h24
1 files changed, 15 insertions, 9 deletions
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index ab5b406..d28a2b3 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -52,23 +52,29 @@
#define __PCI_REROUTE_INTERRUPT
-#ifndef MACHINE
-#define MACHINE "arm"
-#endif
-#ifndef MACHINE_ARCH
#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6)
-#ifdef __ARMEB__
-#define MACHINE_ARCH "armv6eb"
+#define _V6_SUFFIX "v6"
#else
-#define MACHINE_ARCH "armv6"
+#define _V6_SUFFIX ""
#endif
+
+#ifdef __ARM_PCS_VFP
+#define _HF_SUFFIX "hf"
#else
+#define _HF_SUFFIX ""
+#endif
+
#ifdef __ARMEB__
-#define MACHINE_ARCH "armeb"
+#define _EB_SUFFIX "eb"
#else
-#define MACHINE_ARCH "arm"
+#define _EB_SUFFIX ""
#endif
+
+#ifndef MACHINE
+#define MACHINE "arm"
#endif
+#ifndef MACHINE_ARCH
+#define MACHINE_ARCH "arm" _V6_SUFFIX _HF_SUFFIX _EB_SUFFIX
#endif
#if defined(SMP) || defined(KLD_MODULE)
OpenPOWER on IntegriCloud