arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed 'aligned' makefile target. It was made default in 5.6.5

pull/402/head
Jeffrey Walton 2017-03-28 23:49:58 -04:00
parent c305e88127
commit c21023e2dc
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GNUmakefile
View File

@ -391,13 +391,6 @@ endif # ELF/ELF64
endif # CXXFLAGS endif # CXXFLAGS
endif # Gold endif # Gold
# Aligned access testing. Issue 'make aligned'.
ifneq ($(filter align aligned,$(MAKECMDGOALS)),)
ifeq ($(findstring -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS,$(CXXFLAGS)),)
CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
endif # CXXFLAGS
endif # Aligned access
# GCC code coverage. Issue 'make coverage'. # GCC code coverage. Issue 'make coverage'.
ifneq ($(filter coverage,$(MAKECMDGOALS)),) ifneq ($(filter coverage,$(MAKECMDGOALS)),)
ifeq ($(findstring -coverage,$(CXXFLAGS)),) ifeq ($(findstring -coverage,$(CXXFLAGS)),)
@ -522,8 +515,8 @@ deps GNUmakefile.deps:
$(CXX) $(strip $(CXXFLAGS)) -MM *.cpp > GNUmakefile.deps $(CXX) $(strip $(CXXFLAGS)) -MM *.cpp > GNUmakefile.deps
# CXXFLAGS are tuned earlier. # CXXFLAGS are tuned earlier.
.PHONY: asan ubsan align aligned .PHONY: asan ubsan
asan ubsan align aligned: libcryptopp.a cryptest.exe asan ubsan: libcryptopp.a cryptest.exe
# CXXFLAGS are tuned earlier. Applications must use linker flags # CXXFLAGS are tuned earlier. Applications must use linker flags
# -Wl,--gc-sections (Linux and Unix) or -Wl,-dead_strip (OS X) # -Wl,--gc-sections (Linux and Unix) or -Wl,-dead_strip (OS X)

3
blake2.cpp
View File

@ -28,7 +28,7 @@ NAMESPACE_BEGIN(CryptoPP)
inline __m128i MM_SET_EPI64X(const word64 a, const word64 b) inline __m128i MM_SET_EPI64X(const word64 a, const word64 b)
{ {
const word64 t[2] = {b,a}; __m128i r; const word64 t[2] = {b,a}; __m128i r;
memcpy(&r, &t, sizeof(r)); memcpy(&r, &t, sizeof(t));
return r; return r;
} }
#else #else
@ -3905,7 +3905,6 @@ static void BLAKE2_NEON_Compress64(const byte* input, BLAKE2_State<word64, true>
#define BLAKE2B_LOAD_MSG_9_4(b0, b1) \ #define BLAKE2B_LOAD_MSG_9_4(b0, b1) \
do { b0 = vextq_u64(m5, m7, 1); b1 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m0)); } while(0) do { b0 = vextq_u64(m5, m7, 1); b1 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m0)); } while(0)
#undef BLAKE2B_LOAD_MSG_10_1
#define BLAKE2B_LOAD_MSG_10_1(b0, b1) \ #define BLAKE2B_LOAD_MSG_10_1(b0, b1) \
do { b0 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m1)); b1 = vcombine_u64(vget_low_u64(m2), vget_low_u64(m3)); } while(0) do { b0 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m1)); b1 = vcombine_u64(vget_low_u64(m2), vget_low_u64(m3)); } while(0)