Use DMB only on ARMv7

[urcu.git] / include / urcu / arch.h

diff --git a/include/urcu/arch.h b/include/urcu/arch.h
index fdbec3da5cc07da407203709408038cd129dac33..620743c0f68fb33dd004d3266bcf900e2a96b898 100644 (file)
--- a/include/urcu/arch.h
+++ b/include/urcu/arch.h
@@ -41,6 +41,7 @@
  * URCU_ARCH_ALPHA : All DEC Alpha variants
  * URCU_ARCH_IA64 : All Intel Itanium variants
  * URCU_ARCH_ARM : All ARM 32 bits variants
+ *   URCU_ARCH_ARMV7 : All ARMv7 ISA variants
  * URCU_ARCH_AARCH64 : All ARM 64 bits variants
  * URCU_ARCH_MIPS : All MIPS variants
  * URCU_ARCH_NIOS2 : All Intel / Altera NIOS II variants
@@ -49,39 +50,40 @@
  * URCU_ARCH_M68K : All Motorola 68000 variants
  * URCU_ARCH_RISCV : All RISC-V variants
  */
-#if (defined(__i386__) || defined(__i386))
+
+#if (defined(__INTEL_OFFLOAD) || defined(__TARGET_ARCH_MIC) || defined(__MIC__))
 
 #define URCU_ARCH_X86 1
-#define URCU_ARCH_I386 1
+#define URCU_ARCH_AMD64 1
+#define URCU_ARCH_K1OM 1
 #include <urcu/arch/x86.h>
 
-#elif (defined(__i486__) || defined(__i586__) || defined(__i686__))
+#elif (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64))
 
 #define URCU_ARCH_X86 1
+#define URCU_ARCH_AMD64 1
 #include <urcu/arch/x86.h>
 
-#elif (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64))
+#elif (defined(__i486__) || defined(__i586__) || defined(__i686__))
 
 #define URCU_ARCH_X86 1
-#define URCU_ARCH_AMD64 1
 #include <urcu/arch/x86.h>
 
-#elif (defined(__INTEL_OFFLOAD) || defined(__TARGET_ARCH_MIC) || defined(__MIC__))
+#elif (defined(__i386__) || defined(__i386))
 
 #define URCU_ARCH_X86 1
-#define URCU_ARCH_AMD64 1
-#define URCU_ARCH_K1OM 1
+#define URCU_ARCH_I386 1
 #include <urcu/arch/x86.h>
 
-#elif (defined(__powerpc__) || defined(__powerpc) || defined(__ppc__))
+#elif (defined(__powerpc64__) || defined(__ppc64__))
 
 #define URCU_ARCH_PPC 1
+#define URCU_ARCH_PPC64 1
 #include <urcu/arch/ppc.h>
 
-#elif (defined(__powerpc64__) || defined(__ppc64__))
+#elif (defined(__powerpc__) || defined(__powerpc) || defined(__ppc__))
 
 #define URCU_ARCH_PPC 1
-#define URCU_ARCH_PPC64 1
 #include <urcu/arch/ppc.h>
 
 #elif (defined(__s390__) || defined(__s390x__) || defined(__zarch__))
@@ -104,6 +106,12 @@
 #define URCU_ARCH_IA64 1
 #include <urcu/arch/ia64.h>
 
+#elif (defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__))
+
+#define URCU_ARCH_ARMV7 1
+#define URCU_ARCH_ARM 1
+#include <urcu/arch/arm.h>
+
 #elif (defined(__arm__) || defined(__arm))
 
 #define URCU_ARCH_ARM 1