summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--aria_simd.cpp4
-rw-r--r--config_asm.h6
-rw-r--r--gcm.cpp4
-rw-r--r--gcm_simd.cpp2
-rw-r--r--keccak_simd.cpp4
-rw-r--r--lsh256.cpp8
-rw-r--r--lsh512.cpp8
-rw-r--r--rijndael_simd.cpp4
-rw-r--r--sha_simd.cpp4
-rw-r--r--shacal2_simd.cpp4
-rw-r--r--simon128_simd.cpp8
-rw-r--r--speck128_simd.cpp8
-rw-r--r--xts.cpp3
13 files changed, 6 insertions, 61 deletions
diff --git a/aria_simd.cpp b/aria_simd.cpp
index 4d212cf1..56265e0e 100644
--- a/aria_simd.cpp
+++ b/aria_simd.cpp
@@ -23,10 +23,6 @@
# include <arm_acle.h>
#endif
-// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#define M128_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-
// Squash MS LNK4221 and libtool warnings
extern const char ARIA_SIMD_FNAME[] = __FILE__;
diff --git a/config_asm.h b/config_asm.h
index 6c231311..2eb4f570 100644
--- a/config_asm.h
+++ b/config_asm.h
@@ -211,6 +211,12 @@
# undef CRYPTOPP_CLMUL_AVAILABLE
#endif
+// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
+#define M128_CAST(x) ((__m128i *)(void *)(x))
+#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
+#define M256_CAST(x) ((__m256i *)(void *)(x))
+#define CONST_M256_CAST(x) ((const __m256i *)(const void *)(x))
+
#endif // CRYPTOPP_DISABLE_ASM
#endif // X86, X32, X64
diff --git a/gcm.cpp b/gcm.cpp
index 76ef058f..380dc780 100644
--- a/gcm.cpp
+++ b/gcm.cpp
@@ -44,10 +44,6 @@ NAMESPACE_BEGIN(CryptoPP)
#endif
#endif // CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
-// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#define M128_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-
word16 GCM_Base::s_reductionTable[256];
volatile bool GCM_Base::s_reductionTableInitialized = false;
diff --git a/gcm_simd.cpp b/gcm_simd.cpp
index cf29b7c4..82d64ebd 100644
--- a/gcm_simd.cpp
+++ b/gcm_simd.cpp
@@ -56,8 +56,6 @@
#endif
// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#define M128_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
#define UINT64_CAST(x) ((uint64_t *)(void *)(x))
#define CONST_UINT64_CAST(x) ((const uint64_t *)(const void *)(x))
diff --git a/keccak_simd.cpp b/keccak_simd.cpp
index f2bb8b71..5a534a99 100644
--- a/keccak_simd.cpp
+++ b/keccak_simd.cpp
@@ -54,10 +54,6 @@ CRYPTOPP_ALIGN_DATA(16)
const word64
rho56[2] = {W64LIT(0x0007060504030201), W64LIT(0x080F0E0D0C0B0A09)};
-// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#define M128_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-
#if defined(__XOP__)
# define ROL64in128(a, o) _mm_roti_epi64((a), (o))
# define ROL64in128_8(a) ROL64in128((a), 8)
diff --git a/lsh256.cpp b/lsh256.cpp
index a98a7e1f..123cd3e9 100644
--- a/lsh256.cpp
+++ b/lsh256.cpp
@@ -46,8 +46,6 @@
#if defined(CRYPTOPP_LSH256_SSE2_AVAILABLE)
# include <emmintrin.h>
-# define M128_CAST(x) ((__m128i *)(void *)(x))
-# define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
# if defined(__XOP__)
# include <ammintrin.h>
# if defined(__GNUC__)
@@ -62,16 +60,10 @@
#if defined(CRYPTOPP_LSH256_AVX_AVAILABLE)
# include <immintrin.h>
-# define M256_CAST(x) ((__m256i *)(void *)(x))
-# define CONST_M256_CAST(x) ((const __m256i *)(const void *)(x))
#endif
#if defined(CRYPTOPP_HAVE_ATTRIBUTE_TARGET)
# include <x86intrin.h>
-# undef M128_CAST
-# undef CONST_M128_CAST
-# define M128_CAST(x) ((__m128i *)(void *)(x))
-# define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
#endif
ANONYMOUS_NAMESPACE_BEGIN
diff --git a/lsh512.cpp b/lsh512.cpp
index fdb0e17a..3173088c 100644
--- a/lsh512.cpp
+++ b/lsh512.cpp
@@ -46,8 +46,6 @@
#if defined(CRYPTOPP_LSH512_SSE2_AVAILABLE)
# include <emmintrin.h>
-# define M128_CAST(x) ((__m128i *)(void *)(x))
-# define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
# if defined(__XOP__)
# include <ammintrin.h>
# if defined(__GNUC__)
@@ -62,8 +60,6 @@
#if defined(CRYPTOPP_LSH512_AVX_AVAILABLE)
# include <immintrin.h>
-# define M256_CAST(x) ((__m256i *)(void *)(x))
-# define CONST_M256_CAST(x) ((const __m256i *)(const void *)(x))
#endif
#if defined(CRYPTOPP_LSH512_AVX2_AVAILABLE)
@@ -72,10 +68,6 @@
#if defined(CRYPTOPP_HAVE_ATTRIBUTE_TARGET)
# include <x86intrin.h>
-# undef M128_CAST
-# undef CONST_M128_CAST
-# define M128_CAST(x) ((__m128i *)(void *)(x))
-# define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
#endif
ANONYMOUS_NAMESPACE_BEGIN
diff --git a/rijndael_simd.cpp b/rijndael_simd.cpp
index 916c7f4d..c3421b3e 100644
--- a/rijndael_simd.cpp
+++ b/rijndael_simd.cpp
@@ -61,10 +61,6 @@
# define EXCEPTION_EXECUTE_HANDLER 1
#endif
-// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#define M128_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-
// Squash MS LNK4221 and libtool warnings
extern const char RIJNDAEL_SIMD_FNAME[] = __FILE__;
diff --git a/sha_simd.cpp b/sha_simd.cpp
index bb46f24e..18bdf192 100644
--- a/sha_simd.cpp
+++ b/sha_simd.cpp
@@ -47,10 +47,6 @@
# define EXCEPTION_EXECUTE_HANDLER 1
#endif
-// Clang intrinsic casts
-#define M128_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-
// Squash MS LNK4221 and libtool warnings
extern const char SHA_SIMD_FNAME[] = __FILE__;
diff --git a/shacal2_simd.cpp b/shacal2_simd.cpp
index 45f38e48..5114601b 100644
--- a/shacal2_simd.cpp
+++ b/shacal2_simd.cpp
@@ -22,10 +22,6 @@
# include <immintrin.h>
#endif
-// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#define M128_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-
// Squash MS LNK4221 and libtool warnings
extern const char SHACAL2_SIMD_FNAME[] = __FILE__;
diff --git a/simon128_simd.cpp b/simon128_simd.cpp
index 758ee9cb..5a0aaddf 100644
--- a/simon128_simd.cpp
+++ b/simon128_simd.cpp
@@ -286,14 +286,6 @@ inline void SIMON128_Dec_6_Blocks(uint64x2_t &block0, uint64x2_t &block1,
#if (CRYPTOPP_SSSE3_AVAILABLE)
-// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#ifndef M128_CAST
-# define M128_CAST(x) ((__m128i *)(void *)(x))
-#endif
-#ifndef CONST_M128_CAST
-# define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-#endif
-
// GCC double casts, https://www.spinics.net/lists/gcchelp/msg47735.html
#ifndef DOUBLE_CAST
# define DOUBLE_CAST(x) ((double *)(void *)(x))
diff --git a/speck128_simd.cpp b/speck128_simd.cpp
index 1c61c9a1..a17ce38d 100644
--- a/speck128_simd.cpp
+++ b/speck128_simd.cpp
@@ -261,14 +261,6 @@ inline void SPECK128_Dec_6_Blocks(uint64x2_t &block0, uint64x2_t &block1,
#if defined(CRYPTOPP_SSSE3_AVAILABLE)
-// Clang intrinsic casts, http://bugs.llvm.org/show_bug.cgi?id=20670
-#ifndef M128_CAST
-# define M128_CAST(x) ((__m128i *)(void *)(x))
-#endif
-#ifndef CONST_M128_CAST
-# define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
-#endif
-
// GCC double casts, https://www.spinics.net/lists/gcchelp/msg47735.html
#ifndef DOUBLE_CAST
# define DOUBLE_CAST(x) ((double *)(void *)(x))
diff --git a/xts.cpp b/xts.cpp
index 3e64ee87..27fbf76c 100644
--- a/xts.cpp
+++ b/xts.cpp
@@ -22,9 +22,6 @@
// 0.3 to 0.4 cpb profit
#if defined(__SSE2__) || defined(_M_X64)
# include <emmintrin.h>
-// Clang intrinsic casts
-# define M128_CAST(x) ((__m128i *)(void *)(x))
-# define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
#endif
#if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
View Lorry Controller Status