Merge branch 'master-xenomai-clang-fix' into master-bela

giuliomoro · Dec 26, 2018 · c94fb52 · c94fb52
2 parents c470be4 + 1f208b2
commit c94fb52
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/generators/ir2c/static/HvLightPipe.c b/generators/ir2c/static/HvLightPipe.c
@@ -21,6 +21,12 @@
 #define hv_sfence() _mm_sfence()
 #elif __arm__ || HV_SIMD_NEON
   #if __ARM_ACLE
+    #ifdef __clang__
+      // this is defined by Xenomai's compiler.h and it causes
+      // troubles when including the below, where it is defined as a function
+      #undef  __clz
+    #endif /* __clang_ */
+
     #include <arm_acle.h>
     // https://msdn.microsoft.com/en-us/library/hh875058.aspx#BarrierRestrictions
     // http://doxygen.reactos.org/d8/d47/armintr_8h_a02be7ec76ca51842bc90d9b466b54752.html