summaryrefslogtreecommitdiff
path: root/dev-libs/crypto++
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-03-20 00:40:44 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-03-20 00:40:44 +0000
commit4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree356496503d52354aa6d9f2d36126302fed5f3a73 /dev-libs/crypto++
parentfcc5224904648a8e6eb528d7603154160a20022f (diff)
gentoo resync : 20.03.2022
Diffstat (limited to 'dev-libs/crypto++')
-rw-r--r--dev-libs/crypto++/Manifest8
-rw-r--r--dev-libs/crypto++/crypto++-8.2.0-r2.ebuild61
-rw-r--r--dev-libs/crypto++/crypto++-8.4.0.ebuild53
-rw-r--r--dev-libs/crypto++/crypto++-8.5.0.ebuild60
-rw-r--r--dev-libs/crypto++/files/crypto++-8.2.0-build.patch271
5 files changed, 0 insertions, 453 deletions
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index a8a932fbfaf3..18a03c52c63e 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,13 +1,5 @@
-AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540b7c7d8c88c4f671db41c3b9b22ab8d537b9ddeb6cee899daa58b2173e5486ee763ba6f163ecfa3a20018a5117a94 SHA512 d9f23cf713e76d986d50fce895ba9ef2980b3ad81460b81217f9fa5af2a8840ab9e9e72c1d8d9635eaeceaa45f1add9e8dad36fd4159923b659f4fce09ef502e
AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66df3d84c73829f49e36f3dffa9ba75be064235d9128721798967a7baff1e1f283f7789587d31f299275501039ba9e78ec4ccd0 SHA512 61f342e134cf696a1d064b9c27cbece4cccbbaa6a6ac55bd0bdff9e13669ce2e19b9f31ba0307410822bcf2c016397dbe81f79815a23f3f1cff2a3aa45d8622c
-DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
-DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09
-DIST cryptopp850.zip 9125575 BLAKE2B 857a65d63d17a3447d3cbd8370f9d750c480a9734c79739550b1ec7a6da3e7183af5748c2dfa5127be3810d73960af2f3b09b4b2bf4e624a43bfc4357ecde12b SHA512 090472545c74bbf0579b56b09e8b5dcd777b38f29f7199a2e68f45d4a8c687acc82f105ba8b2a38f9aa65e5997a3d846aaf2341ab74d58b4bbfd1f5f03823b93
-DIST cryptopp850.zip.sig 659 BLAKE2B e56d059069aa233b11dd1dd2c555ba8b9b0d12474d4f5ec9057e626ad22449959b9474ccf9ce553a2507f50215b669cf4b90cab6b51697559a6ffb95d41da9ec SHA512 7b59fbeb14fea942c846573c7bf8e76d6cee86aca4b605ce06323bc6f5549232285864cd735c2a882ca4df3d93747436a5268fee63dbf8eb43c503143b660e63
DIST cryptopp860.zip 9274149 BLAKE2B c93998e2deb93abf12b801877404f0f82547bfbbbc5aae727e68daffc2407877dda76d7bcd06239d40a48baf21b6f2e29f74e9a97ecbc1b5d4b5bcc50ada71da SHA512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03
DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9b56476ff64de0c28d47a13fe99d7f5819cfeb52e514ade1454622451b267bcc751868defcb080ddf79e8c SHA512 6231816b1ccec75cbcdd09daa8895830c5f4c595a4a0aa24dacc3e377832d8db5efa1aeadf815e53db32fc5263b09dd1b249668f34da4bfad5d5cba6f031ce21
-EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
-EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
-EBUILD crypto++-8.5.0.ebuild 1446 BLAKE2B 0f3b1636a874deba4ddfbe68a77155154eaade357ec1347fce2b3500612f134115bb38b6b52389b33e3aa16213f7f77537f631d03ed967b857fb0b889d86c61d SHA512 3e570722fb2dd098957d883e85f250abbf075e7498be37042ebc96446424e09b8b9e9040b9eda72dca054f87d2128a318eb569021d6cf49c6b1f2e5c377170cf
EBUILD crypto++-8.6.0.ebuild 1484 BLAKE2B 3ad6b804dac04fa8b2e4f5cc302f62c432a8ffccf9db10784fb7cea48820dd5cf3b094e189cf339158107a6fc2680fe658d9bb847638584aed98011e682c0811 SHA512 37eed0f2ad965b8c6f82ec1163095e83212742dea7b0f8d037fcc968206b2878cfc21708c2a515cd06dff2ce90f1b825784e2381b2bf11c723fe30b63219767d
MISC metadata.xml 506 BLAKE2B 5d6a8770ad53c178e43d30c04be9924718eaf373e8d9945f637db7af71fccf9b21bf46141910ec1cb1ea12e3817dfef4c7881d935fb6f441898ee949ac13ee5f SHA512 8d195dfc2d4f627f59d3a37d4988a0bc59e420a64f8615b819760e32449640eff2f357160b2b9797817d38b0e44c8d6bc04bc4f84a2bd20cfdb7fb5d12df7f2d
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
deleted file mode 100644
index a52ee90857ea..000000000000
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-
-LICENSE="Boost-1.0"
-SLOT="0/8" # subslot is so version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
-IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
-)
-
-config_add() {
- sed -i -e "/Important Settings/a#define $1 1" config.h || die
-}
-
-pkg_setup() {
- export CXX="$(tc-getCXX)"
- export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- export PREFIX="${EPREFIX}/usr"
-}
-
-src_prepare() {
- default
-
- use asm || config_add CRYPTOPP_DISABLE_ASM
- use cpu_flags_x86_aes || config_add CRYPTOPP_DISABLE_AESNI
- use cpu_flags_x86_avx || config_add CRYPTOPP_DISABLE_AVX
- use cpu_flags_x86_avx2 || config_add CRYPTOPP_DISABLE_AVX2
- use cpu_flags_x86_pclmul || config_add CRYPTOPP_DISABLE_CLMUL
- use cpu_flags_x86_sha || config_add CRYPTOPP_DISABLE_SHANI
- use cpu_flags_x86_sse2 || config_add CRYPTOPP_DISABLE_SSE2
- use cpu_flags_x86_sse4_2 || config_add CRYPTOPP_DISABLE_SSE4
- use cpu_flags_x86_ssse3 || config_add CRYPTOPP_DISABLE_SSSE3
-
- # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
- [[ ${CHOST} == *-darwin* ]] && config_add CRYPTOPP_DISABLE_ASM
-}
-
-src_compile() {
- emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
- default
-
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/crypto++-8.4.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild
deleted file mode 100644
index 276755fe4309..000000000000
--- a/dev-libs/crypto++/crypto++-8.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-S="${WORKDIR}"
-
-LICENSE="Boost-1.0"
-SLOT="0/8.4" # subslot is so version (was broken in 8.3.0, check on bumps!)
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
-IUSE="+asm static-libs"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
-)
-
-config_uncomment() {
- sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
-}
-
-src_prepare() {
- default
-
- use asm || config_uncomment CRYPTOPP_DISABLE_ASM
-
- # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
- [[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
-}
-
-src_configure() {
- export CXX="$(tc-getCXX)"
- export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- export PREFIX="${EPREFIX}/usr"
- tc-export AR RANLIB
- default
-}
-
-src_compile() {
- emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
- default
-
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/crypto++-8.5.0.ebuild b/dev-libs/crypto++/crypto++-8.5.0.ebuild
deleted file mode 100644
index af996cfaed97..000000000000
--- a/dev-libs/crypto++/crypto++-8.5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/crypto++.asc
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-SRC_URI+=" verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )"
-S="${WORKDIR}"
-
-LICENSE="Boost-1.0"
-# Bumped to 8.5 in 8.5.0 out of caution
-# subslot is so version (was broken in 8.3.0, check on bumps!)
-SLOT="0/8.5"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="+asm static-libs"
-
-BDEPEND="
- app-arch/unzip
- verify-sig? ( sec-keys/openpgp-keys-crypto++ )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
-)
-
-config_uncomment() {
- sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
-}
-
-src_prepare() {
- default
-
- use asm || config_uncomment CRYPTOPP_DISABLE_ASM
-
- # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
- [[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
-}
-
-src_configure() {
- export CXX="$(tc-getCXX)"
- export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- export PREFIX="${EPREFIX}/usr"
- tc-export AR RANLIB
- default
-}
-
-src_compile() {
- emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
- default
-
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-build.patch b/dev-libs/crypto++/files/crypto++-8.2.0-build.patch
deleted file mode 100644
index 7c7e8a9c1b66..000000000000
--- a/dev-libs/crypto++/files/crypto++-8.2.0-build.patch
+++ /dev/null
@@ -1,271 +0,0 @@
---- a/config.h 2019-07-02 19:25:10.448720035 +0300
-+++ a/config.h 2019-07-02 19:25:25.785455586 +0300
-@@ -514,7 +514,7 @@ NAMESPACE_END
- #endif
-
- // 32-bit SunCC does not enable SSE2 by default.
--#if !defined(CRYPTOPP_DISABLE_ASM) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
-+#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSE2) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
- #define CRYPTOPP_SSE2_INTRIN_AVAILABLE 1
- #endif
-
-From fbbf0a08e8cf4faca661b0f75f806ea652abea70 Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader@gmail.com>
-Date: Tue, 2 Jul 2019 16:55:00 -0400
-Subject: [PATCH] Add missing XOP header for blake2b_simd.cpp (GH #859) The
- Gentoo folks caught a bug at https://bugs.gentoo.org/689162. The 689162 bug
- uses -march=bdver1 -msse4.1 on a AMD Bulldozer machine.
-
-Investigating the issue we are missing the XOP header blake2b_simd.cpp. However, adding the XOP header is not enough for this particular config. Four source files fail to compile with the expected headers. We are waiting on the GCC folks to get back to us with a fix.
----
- blake2b_simd.cpp | 5 +++++
- keccak_simd.cpp | 5 +++++
- simon128_simd.cpp | 1 +
- speck128_simd.cpp | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
-index ff138321..b246824c 100644
---- a/blake2b_simd.cpp
-+++ b/blake2b_simd.cpp
-@@ -32,6 +32,11 @@
- # undef CRYPTOPP_ALTIVEC_AVAILABLE
- #endif
-
-+#if defined(__XOP__)
-+# include <immintrin.h>
-+# include <ammintrin.h>
-+#endif
-+
- #if (CRYPTOPP_SSE41_AVAILABLE)
- # include <emmintrin.h>
- # include <tmmintrin.h>
-diff --git a/keccak_simd.cpp b/keccak_simd.cpp
-index 45674ac2..ae2f2095 100644
---- a/keccak_simd.cpp
-+++ b/keccak_simd.cpp
-@@ -26,6 +26,11 @@
- # include <tmmintrin.h>
- #endif
-
-+#if defined(__XOP__)
-+# include <immintrin.h>
-+# include <ammintrin.h>
-+#endif
-+
- // Squash MS LNK4221 and libtool warnings
- extern const char KECCAK_SIMD_FNAME[] = __FILE__;
-
-diff --git a/simon128_simd.cpp b/simon128_simd.cpp
-index 5331c351..4b551f8f 100644
---- a/simon128_simd.cpp
-+++ b/simon128_simd.cpp
-@@ -23,6 +23,7 @@
- #endif
-
- #if defined(__XOP__)
-+# include <immintrin.h>
- # include <ammintrin.h>
- #endif
-
-diff --git a/speck128_simd.cpp b/speck128_simd.cpp
-index 2c356346..fb3eb1e6 100644
---- a/speck128_simd.cpp
-+++ b/speck128_simd.cpp
-@@ -23,6 +23,7 @@
- #endif
-
- #if defined(__XOP__)
-+# include <immintrin.h>
- # include <ammintrin.h>
- #endif
-
---
-2.21.0
-
-From eeb7dadc76572b7061922ca6ac5f247bdfd985ad Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader@gmail.com>
-Date: Tue, 2 Jul 2019 19:10:11 -0400
-Subject: [PATCH] Fix missing _mm_roti_epi32 and _mm_roti_epi64 under GCC (GH
- #859)
-
----
- blake2b_simd.cpp | 4 +++-
- blake2s_simd.cpp | 7 +++++++
- chacha_simd.cpp | 3 +++
- cham_simd.cpp | 3 +++
- keccak_simd.cpp | 4 +++-
- lea_simd.cpp | 3 +++
- simeck_simd.cpp | 3 +++
- simon128_simd.cpp | 4 +++-
- simon64_simd.cpp | 3 +++
- speck128_simd.cpp | 4 +++-
- speck64_simd.cpp | 3 +++
- 11 files changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
-index b246824c..6803d0ae 100644
---- a/blake2b_simd.cpp
-+++ b/blake2b_simd.cpp
-@@ -33,8 +33,10 @@
- #endif
-
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- #if (CRYPTOPP_SSE41_AVAILABLE)
-diff --git a/blake2s_simd.cpp b/blake2s_simd.cpp
-index f02b9771..4b6d1bd6 100644
---- a/blake2s_simd.cpp
-+++ b/blake2s_simd.cpp
-@@ -42,6 +42,13 @@
- # undef CRYPTOPP_ALTIVEC_AVAILABLE
- #endif
-
-+#if defined(__XOP__)
-+# include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
-+#endif
-+
- #if (CRYPTOPP_SSE41_AVAILABLE)
- # include <emmintrin.h>
- # include <tmmintrin.h>
-diff --git a/chacha_simd.cpp b/chacha_simd.cpp
-index a983ab69..5a63ecee 100644
---- a/chacha_simd.cpp
-+++ b/chacha_simd.cpp
-@@ -46,6 +46,9 @@
-
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- // C1189: error: This header is specific to ARM targets
-diff --git a/cham_simd.cpp b/cham_simd.cpp
-index 7fcaece1..e102a877 100644
---- a/cham_simd.cpp
-+++ b/cham_simd.cpp
-@@ -24,6 +24,9 @@
-
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- #if defined(__AVX512F__)
-diff --git a/keccak_simd.cpp b/keccak_simd.cpp
-index ae2f2095..194291a0 100644
---- a/keccak_simd.cpp
-+++ b/keccak_simd.cpp
-@@ -27,8 +27,10 @@
- #endif
-
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- // Squash MS LNK4221 and libtool warnings
-diff --git a/lea_simd.cpp b/lea_simd.cpp
-index b4180e34..ee2a5697 100644
---- a/lea_simd.cpp
-+++ b/lea_simd.cpp
-@@ -24,6 +24,9 @@
-
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- #if defined(__AVX512F__)
-diff --git a/simeck_simd.cpp b/simeck_simd.cpp
-index 2a9efc99..f92a53d7 100644
---- a/simeck_simd.cpp
-+++ b/simeck_simd.cpp
-@@ -24,6 +24,9 @@
-
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- // Squash MS LNK4221 and libtool warnings
-diff --git a/simon128_simd.cpp b/simon128_simd.cpp
-index 4b551f8f..cb16fa8d 100644
---- a/simon128_simd.cpp
-+++ b/simon128_simd.cpp
-@@ -23,8 +23,10 @@
- #endif
-
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- #if defined(__AVX512F__)
-diff --git a/simon64_simd.cpp b/simon64_simd.cpp
-index eb5a1757..fcbe1342 100644
---- a/simon64_simd.cpp
-+++ b/simon64_simd.cpp
-@@ -25,6 +25,9 @@
-
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- // C1189: error: This header is specific to ARM targets
-diff --git a/speck128_simd.cpp b/speck128_simd.cpp
-index fb3eb1e6..0c0f389e 100644
---- a/speck128_simd.cpp
-+++ b/speck128_simd.cpp
-@@ -23,8 +23,10 @@
- #endif
-
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- #if defined(__AVX512F__)
-diff --git a/speck64_simd.cpp b/speck64_simd.cpp
-index 0a720fb3..0b43c175 100644
---- a/speck64_simd.cpp
-+++ b/speck64_simd.cpp
-@@ -25,6 +25,9 @@
-
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+# include <x86intrin.h>
-+# endif
- #endif
-
- // C1189: error: This header is specific to ARM targets