diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-07-13 17:05:14 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-07-13 17:05:14 -0400 |
| commit | 28e20d6e5f920e48688c71456f9392a4a5f78135 (patch) | |
| tree | 02ec331031fab2e0a7977f5dbd411b382210f9e2 /sha.cpp | |
| parent | 26ae1fb7e9b9a6a2a09cc409d8d516a01c5edbed (diff) | |
| download | cryptopp-git-28e20d6e5f920e48688c71456f9392a4a5f78135.tar.gz | |
Fix "Error: symbol SHA512_Round is already defined" (GH #684)
Diffstat (limited to 'sha.cpp')
| -rw-r--r-- | sha.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -952,7 +952,13 @@ const word64 SHA512_K[80] = { #if CRYPTOPP_SSE2_ASM_AVAILABLE && (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32)
-ANONYMOUS_NAMESPACE_BEGIN
+// Anonymous namespace removed due to a new compile error.
+// g++ -DNDEBUG -g2 -O3 -pthread -pipe -c sha.cpp
+// sha.cpp: Assembler messages:
+// sha.cpp:1155: Error: symbol `SHA512_Round' is already defined
+// sha.cpp:1155: Error: symbol `SHA512_Round' is already defined
+
+// ANONYMOUS_NAMESPACE_BEGIN
CRYPTOPP_NAKED void CRYPTOPP_FASTCALL SHA512_HashBlock_SSE2(word64 *state, const word64 *data)
{
@@ -1035,8 +1041,8 @@ CRYPTOPP_NAKED void CRYPTOPP_FASTCALL SHA512_HashBlock_SSE2(word64 *state, const AS2( pxor xmm7, xmm6)\
AS2( psrlq r, c-b)\
AS2( pxor r, xmm7)
-
ASL(SHA512_Round)
+
// k + w is in mm0, a is in mm4, e is in mm5
AS2( paddq mm0, [edi+7*8]) // h
AS2( movq mm2, [edi+5*8]) // f
@@ -1070,6 +1076,7 @@ CRYPTOPP_NAKED void CRYPTOPP_FASTCALL SHA512_HashBlock_SSE2(word64 *state, const AS2( movq [esi+eax*8+16*8], mm0)
AS2( paddq mm0, [ebx+eax*8])
ASC( call, SHA512_Round)
+
AS1( inc eax)
AS2( sub edi, 8)
AS2( test eax, 7)
@@ -1148,7 +1155,7 @@ CRYPTOPP_NAKED void CRYPTOPP_FASTCALL SHA512_HashBlock_SSE2(word64 *state, const #endif
}
-ANONYMOUS_NAMESPACE_END
+// ANONYMOUS_NAMESPACE_END
#endif // CRYPTOPP_SSE2_ASM_AVAILABLE
|