Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/include Fix armv6 builds by providing an armv6 ...



details:   https://anonhg.NetBSD.org/src/rev/0494b38a0bed
branches:  trunk
changeset: 945499:0494b38a0bed
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Oct 31 13:58:22 2020 +0000

description:
Fix armv6 builds by providing an armv6 is macro

diffstat:

 sys/arch/arm/include/cpufunc.h |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 55082e3eedaf -r 0494b38a0bed sys/arch/arm/include/cpufunc.h
--- a/sys/arch/arm/include/cpufunc.h    Sat Oct 31 13:45:00 2020 +0000
+++ b/sys/arch/arm/include/cpufunc.h    Sat Oct 31 13:58:22 2020 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index