aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-02-22 00:33:59 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-02-22 22:30:29 +0100
commit40005b9a0da6ad2be8e35c1141f903dc06afd780 (patch)
tree84e203ff66812c615b168a0fa0524d92cda38d59
parentc8b32ce8ac9031a764c61c6e25af36fded2c34aa (diff)
downloadbuildroot-40005b9a0da6ad2be8e35c1141f903dc06afd780.tar.gz
buildroot-40005b9a0da6ad2be8e35c1141f903dc06afd780.tar.bz2
package/cryptopp: fix build with gcc < 4.9
Disable AVX2 if gcc < 4.9 Fixes: - http://autobuild.buildroot.org/results/195e40b34344f773da51a3fbff9d8e76c517eed1 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch b/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch
new file mode 100644
index 0000000000..fd8b3c5ff2
--- /dev/null
+++ b/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch
@@ -0,0 +1,40 @@
+From c484938fb4a57430a2e47334f753b1d771aa0f1b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 21 Feb 2019 20:26:24 +0100
+Subject: [PATCH] config.h: avx2 depends on gcc 4.9
+
+Build of cryptopp on x86 with gcc 4.8 fails on:
+chacha_avx.cpp: In function 'void CryptoPP::ChaCha_OperateKeystream_AVX2(const word32*, const byte*, CryptoPP::byte*, unsigned int)':
+chacha_avx.cpp:98:85: error: '_mm256_broadcastsi128_si256' was not declared in this scope
+
+This is due to the fact that _mm256_broadcastsi128_si256 has been added
+only in gcc 4.9:
+https://github.com/gcc-mirror/gcc/commit/78e8d5ffbf0ba5031b736d2c6fc6a44605047cbc
+
+So bump CRYPTOPP_GCC_VERSION from 4.7 to 4.9 for AVX2 support
+
+Fixes:
+ - http://autobuild.buildroot.org/results/195e40b34344f773da51a3fbff9d8e76c517eed1
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/weidai11/cryptopp/pull/809]
+---
+ config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.h b/config.h
+index eccba009..4516d2b3 100644
+--- a/config.h
++++ b/config.h
+@@ -591,7 +591,7 @@ NAMESPACE_END
+ // Requires Binutils 2.24
+ #if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \
+ (defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
+- (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \
++ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
+ #define CRYPTOPP_AVX2_AVAILABLE 1
+ #endif
+--
+2.14.1
+