X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fcrc32.h;h=fec67cd9757fbfe478b8d6736b901ae650800354;hb=7c03ed4;hp=242278ff24146c4611eaef6a41929361e64be21c;hpb=9e12d7763d542067a9725b86d40d07d6b7bd7433;p=vpp.git

diff --git a/src/vppinfra/crc32.h b/src/vppinfra/crc32.h
index 242278ff241..fec67cd9757 100644
--- a/src/vppinfra/crc32.h
+++ b/src/vppinfra/crc32.h
@@ -22,18 +22,23 @@
 #define clib_crc32c_uses_intrinsics
 #include <x86intrin.h>
 
+#define crc32_u64 _mm_crc32_u64
+#define crc32_u32 _mm_crc32_u32
+
 static_always_inline u32
 clib_crc32c (u8 * s, int len)
 {
   u32 v = 0;
 
-#if __x86_64__
+#if defined(__x86_64__)
   for (; len >= 8; len -= 8, s += 8)
     v = _mm_crc32_u64 (v, *((u64 *) s));
 #else
   /* workaround weird GCC bug when using _mm_crc32_u32
      which happens with -O2 optimization */
-  volatile ("":::"memory");
+#if !defined (__i686__)
+  asm volatile ("":::"memory");
+#endif
 #endif
 
   for (; len >= 4; len -= 4, s += 4)
@@ -52,6 +57,10 @@ clib_crc32c (u8 * s, int len)
 #define clib_crc32c_uses_intrinsics
 #include <arm_acle.h>
 
+
+#define crc32_u64 __crc32cd
+#define crc32_u32 __crc32cw
+
 static_always_inline u32
 clib_crc32c (u8 * s, int len)
 {