Update #4202.
---
.../score/cpu/arm/include/rtems/score/arm.h | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/cpukit/score/cpu/arm/include/rtems/score/arm.h
b/cpukit/score/cpu/arm/include/rtems/score/arm.h
index f753dd60ed..b1e4b07a37 100644
--- a/cpukit/score/cpu/arm/include/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/arm.h
@@ -1,7 +1,9 @@
/**
* @file
*
- * @brief ARM Assembler Support API
+ * @ingroup RTEMSScoreCPUARM
+ *
+ * @brief This header file provides defines derived from ARM multilib defines.
*/
/*
@@ -26,8 +28,9 @@ extern "C" {
/**
* @addtogroup RTEMSScoreCPUARM
+ *
+ * @{
*/
-/**@{**/
#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
#define CPU_MODEL_NAME "ARMv7M"
@@ -40,10 +43,7 @@ extern "C" {
#define ARM_MULTILIB_ARCH_V4
#endif
-#if defined(__ARM_ARCH_7A__) \
- || defined(__ARM_ARCH_7R__) \
- || defined(__ARM_ARCH_7M__) \
- || defined(__ARM_ARCH_7EM__)
+#if __ARM_ARCH >= 7
#define ARM_MULTILIB_HAS_WFI
#define ARM_MULTILIB_HAS_LOAD_STORE_EXCLUSIVE
#define ARM_MULTILIB_HAS_BARRIER_INSTRUCTIONS
@@ -51,18 +51,17 @@ extern "C" {
#ifndef ARM_DISABLE_THREAD_ID_REGISTER_USE
#if defined(__ARM_ARCH_7A__) \
- || defined(__ARM_ARCH_7R__)
+ || defined(__ARM_ARCH_7R__) \
+ || __ARM_ARCH >= 8
#define ARM_MULTILIB_HAS_THREAD_ID_REGISTER
#endif
#endif
-#if defined(__ARM_ARCH_7A__)
+#if defined(__ARM_ARCH_7A__) || __ARM_ARCH >= 8
#define ARM_MULTILIB_CACHE_LINE_MAX_64
#endif
-#if defined(__ARM_ARCH_7A__) \
- || defined(__ARM_ARCH_7M__) \
- || defined(__ARM_ARCH_7EM__)
+#if __ARM_ARCH >= 7
#define ARM_MULTILIB_HAS_CPACR
#endif
--
2.26.2
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
