Fix for Curve25519 FE math build error with Intel Speedups enabled and no AVX2. Fixes to allow forcing NO_AVX2_SUPPORT. Reproducible with ./configure --enable-curve25519 --enable-ed25519 --enable-intelasm CFLAGS="-DNO_AVX2_SUPPORT".

This commit is contained in:
David Garske
2018-12-05 13:04:30 -08:00
parent dfcfbc885d
commit 8355dd29cb
5 changed files with 10 additions and 8 deletions

View File

@@ -55,10 +55,12 @@
#if defined(__GNUC__) && ((__GNUC__ < 4) || \ #if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8)) (__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT #define NO_AVX2_SUPPORT
#endif #endif
#if defined(__clang__) && ((__clang_major__ < 3) || \ #if defined(__clang__) && ((__clang_major__ < 3) || \
(__clang_major__ == 3 && __clang_minor__ <= 5)) (__clang_major__ == 3 && __clang_minor__ <= 5))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT #define NO_AVX2_SUPPORT
#elif defined(__clang__) && defined(NO_AVX2_SUPPORT) #elif defined(__clang__) && defined(NO_AVX2_SUPPORT)
#undef NO_AVX2_SUPPORT #undef NO_AVX2_SUPPORT

View File

@@ -24,6 +24,7 @@
#if defined(__GNUC__) && ((__GNUC__ < 4) || \ #if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8)) (__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT #define NO_AVX2_SUPPORT
#endif #endif
#if defined(__clang__) && ((__clang_major__ < 3) || \ #if defined(__clang__) && ((__clang_major__ < 3) || \

View File

@@ -56,6 +56,7 @@
#if defined(__GNUC__) && ((__GNUC__ < 4) || \ #if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8)) (__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT #define NO_AVX2_SUPPORT
#endif #endif
#if defined(__clang__) && ((__clang_major__ < 3) || \ #if defined(__clang__) && ((__clang_major__ < 3) || \

View File

@@ -115,10 +115,9 @@
#if defined(USE_INTEL_SPEEDUP) #if defined(USE_INTEL_SPEEDUP)
#define HAVE_INTEL_AVX1
#if defined(__GNUC__) && ((__GNUC__ < 4) || \ #if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8)) (__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT #define NO_AVX2_SUPPORT
#endif #endif
#if defined(__clang__) && ((__clang_major__ < 3) || \ #if defined(__clang__) && ((__clang_major__ < 3) || \

View File

@@ -146,10 +146,9 @@
#if defined(USE_INTEL_SPEEDUP) #if defined(USE_INTEL_SPEEDUP)
#define HAVE_INTEL_AVX1
#if defined(__GNUC__) && ((__GNUC__ < 4) || \ #if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8)) (__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT #define NO_AVX2_SUPPORT
#endif #endif
#if defined(__clang__) && ((__clang_major__ < 3) || \ #if defined(__clang__) && ((__clang_major__ < 3) || \