diff --git a/wolfcrypt/src/poly1305.c b/wolfcrypt/src/poly1305.c
index 285d1c93a..bc66264ae 100644
--- a/wolfcrypt/src/poly1305.c
+++ b/wolfcrypt/src/poly1305.c
@@ -54,8 +54,19 @@
     #include <emmintrin.h>
     #include <immintrin.h>
 
+    #if defined(__GNUC__) && ((__GNUC__ < 4) || \
+                              (__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
+        #define NO_AVX2_SUPPORT
+    #endif
+    #if defined(__clang__) && ((__clang_major__ < 3) || \
+                               (__clang_major__ == 3 && __clang_minor__ <= 5))
+        #define NO_AVX2_SUPPORT
+    #endif
+
     #define HAVE_INTEL_AVX1
-    #define HAVE_INTEL_AVX2
+    #ifndef NO_AVX2_SUPPORT
+        #define HAVE_INTEL_AVX2
+    #endif
 #endif
 
 #ifdef USE_INTEL_SPEEDUP