diff options
author | Jeffrey Walton <noloader@gmail.com> | 2017-03-28 23:49:58 -0400 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2017-03-28 23:49:58 -0400 |
commit | c21023e2dc69232c13f119ab0584b960a55e8754 (patch) | |
tree | 070bac1e7f529acc874a306d947252a6251d2c5a | |
parent | c305e8812772582edeb6e373b6e34feb59f3799f (diff) | |
download | cryptopp-git-c21023e2dc69232c13f119ab0584b960a55e8754.tar.gz |
Removed 'aligned' makefile target. It was made default in 5.6.5
-rwxr-xr-x | GNUmakefile | 11 | ||||
-rw-r--r-- | blake2.cpp | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/GNUmakefile b/GNUmakefile index fc4b756c..31b4fcdb 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -391,13 +391,6 @@ endif # ELF/ELF64 endif # CXXFLAGS 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'. ifneq ($(filter coverage,$(MAKECMDGOALS)),) ifeq ($(findstring -coverage,$(CXXFLAGS)),) @@ -522,8 +515,8 @@ deps GNUmakefile.deps: $(CXX) $(strip $(CXXFLAGS)) -MM *.cpp > GNUmakefile.deps # CXXFLAGS are tuned earlier. -.PHONY: asan ubsan align aligned -asan ubsan align aligned: libcryptopp.a cryptest.exe +.PHONY: asan ubsan +asan ubsan: libcryptopp.a cryptest.exe # CXXFLAGS are tuned earlier. Applications must use linker flags # -Wl,--gc-sections (Linux and Unix) or -Wl,-dead_strip (OS X) @@ -28,7 +28,7 @@ NAMESPACE_BEGIN(CryptoPP) inline __m128i MM_SET_EPI64X(const word64 a, const word64 b)
{
const word64 t[2] = {b,a}; __m128i r;
- memcpy(&r, &t, sizeof(r));
+ memcpy(&r, &t, sizeof(t));
return r;
}
#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) \
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) \
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)
|