Module Name: src
Committed By: skrll
Date: Sat Oct 31 13:58:22 UTC 2020
Modified Files:
src/sys/arch/arm/include: cpufunc.h
Log Message:
Fix armv6 builds by providing an armv6 is macro
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/arm/include/cpufunc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.84 src/sys/arch/arm/include/cpufunc.h:1.85
--- src/sys/arch/arm/include/cpufunc.h:1.84 Tue Sep 29 18:13:29 2020
+++ src/sys/arch/arm/include/cpufunc.h Sat Oct 31 13:58:22 2020
@@ -42,8 +42,6 @@
#ifndef _ARM_CPUFUNC_H_
#define _ARM_CPUFUNC_H_
-#define isb() __asm __volatile("isb" : : : "memory")
-
#ifdef _ARM_ARCH_7
/*
* Options for DMB and DSB:
@@ -62,12 +60,16 @@
*/
#define dsb(opt) __asm __volatile("dsb " __STRING(opt) : : : "memory")
#define dmb(opt) __asm __volatile("dmb " __STRING(opt) : : : "memory")
+#define isb() __asm __volatile("isb" : : : "memory")
+
#else
#define dsb(opt) \
__asm __volatile("mcr p15, 0, %0, c7, c10, 4" :: "r" (0) : "memory")
#define dmb(opt) \
__asm __volatile("mcr p15, 0, %0, c7, c10, 5" :: "r" (0) : "memory")
+#define isb() \
+ __asm __volatile("mcr p15, 0, %0, c7, c5, 4" :: "r" (0) : "memory")
#endif
