From 0cee6f01f010a6d0721f26652d41acb219adbd86 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 6 Jul 2018 01:22:38 -0400 Subject: [PATCH] Squash MS LNK4221 and libtool warnings --- eccrypto.cpp | 5 +++++ neon-simd.cpp | 3 +++ ppc-simd.cpp | 3 +++ rijndael-simd.cpp | 3 +++ sha-simd.cpp | 3 +++ sse-simd.cpp | 3 +++ strciphr.cpp | 5 +++++ 7 files changed, 25 insertions(+) diff --git a/eccrypto.cpp b/eccrypto.cpp index 60a86b66..e13b643f 100644 --- a/eccrypto.cpp +++ b/eccrypto.cpp @@ -28,6 +28,11 @@ #include "ec2n.h" #include "misc.h" +// Squash MS LNK4221 and libtool warnings +#ifndef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES +extern const char ECCRYPTO_FNAME[] = __FILE__; +#endif + NAMESPACE_BEGIN(CryptoPP) #if 0 diff --git a/neon-simd.cpp b/neon-simd.cpp index bb10a308..72d86fc0 100644 --- a/neon-simd.cpp +++ b/neon-simd.cpp @@ -30,6 +30,9 @@ # define EXCEPTION_EXECUTE_HANDLER 1 #endif +// Squash MS LNK4221 and libtool warnings +extern const char NEON_SIMD_FNAME[] = __FILE__; + NAMESPACE_BEGIN(CryptoPP) #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY diff --git a/ppc-simd.cpp b/ppc-simd.cpp index 7b3158e8..51c5d3d4 100644 --- a/ppc-simd.cpp +++ b/ppc-simd.cpp @@ -37,6 +37,9 @@ # define EXCEPTION_EXECUTE_HANDLER 1 #endif +// Squash MS LNK4221 and libtool warnings +extern const char PPC_SIMD_FNAME[] = __FILE__; + NAMESPACE_BEGIN(CryptoPP) #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY diff --git a/rijndael-simd.cpp b/rijndael-simd.cpp index ef8a4ade..893f2905 100644 --- a/rijndael-simd.cpp +++ b/rijndael-simd.cpp @@ -66,6 +66,9 @@ #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__; + NAMESPACE_BEGIN(CryptoPP) #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY diff --git a/sha-simd.cpp b/sha-simd.cpp index 419d0611..5b097d3f 100644 --- a/sha-simd.cpp +++ b/sha-simd.cpp @@ -45,6 +45,9 @@ #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__; + NAMESPACE_BEGIN(CryptoPP) // ***************** SIGILL probes ******************** diff --git a/sse-simd.cpp b/sse-simd.cpp index 7da3796a..af07048e 100644 --- a/sse-simd.cpp +++ b/sse-simd.cpp @@ -27,6 +27,9 @@ # include #endif +// Squash MS LNK4221 and libtool warnings +extern const char SSE_SIMD_FNAME[] = __FILE__; + NAMESPACE_BEGIN(CryptoPP) #ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY diff --git a/strciphr.cpp b/strciphr.cpp index 6aae6318..8d72b347 100644 --- a/strciphr.cpp +++ b/strciphr.cpp @@ -6,6 +6,11 @@ #include "strciphr.h" +// Squash MS LNK4221 and libtool warnings +#ifndef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES +extern const char STRCIPHER_FNAME[] = __FILE__; +#endif + NAMESPACE_BEGIN(CryptoPP) template