From 74ef70683d037d5afe1f873cb8ff55c4ff964f0a Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 1 Aug 2017 08:58:19 -0400 Subject: [PATCH 1/5] Discard Clang error messages --- GNUmakefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 49ad24ef..f74e64ae 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -199,15 +199,15 @@ endif # -DCRYPTOPP_DISABLE_SSSE3 endif # -DCRYPTOPP_DISABLE_ASM endif # CXXFLAGS -SSSE3_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -mssse3 -dM -E - | grep -i -c -q __SSSE3__ && echo "-mssse3") +SSSE3_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -mssse3 -dM -E - 2>/dev/null | grep -i -c -q __SSSE3__ && echo "-mssse3") ARIA_FLAG = $(SSSE3_FLAG) ifeq ($(findstring -DCRYPTOPP_DISABLE_SSE4,$(CXXFLAGS)),) -SSE42_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -msse4.2 -dM -E - | grep -i -c -q __SSE4_2__ && echo "-msse4.2") +SSE42_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -msse4.2 -dM -E - 2>/dev/null | grep -i -c -q __SSE4_2__ && echo "-msse4.2") ifeq ($(findstring -DCRYPTOPP_DISABLE_AESNI,$(CXXFLAGS)),) -GCM_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -mssse3 -mpclmul -dM -E - | grep -i -c -q __PCLMUL__ && echo "-mssse3 -mpclmul") -AES_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -msse4.1 -maes -dM -E - | grep -i -c -q __AES__ && echo "-msse4.1 -maes") +GCM_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -mssse3 -mpclmul -dM -E - 2>/dev/null | grep -i -c -q __PCLMUL__ && echo "-mssse3 -mpclmul") +AES_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -msse4.1 -maes -dM -E - 2>/dev/null | grep -i -c -q __AES__ && echo "-msse4.1 -maes") ifeq ($(findstring -DCRYPTOPP_DISABLE_SHA,$(CXXFLAGS)),) -SHA_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -msse4.2 -msha -dM -E - | grep -i -c -q __SHA__ && echo "-msse4.2 -msha") +SHA_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -msse4.2 -msha -dM -E - 2>/dev/null | grep -i -c -q __SHA__ && echo "-msse4.2 -msha") BLAKE2_FLAG = $(SSE42_FLAG) CRC_FLAG = $(SSE42_FLAG) endif @@ -304,16 +304,16 @@ endif endif ifeq ($(IS_NEON),1) - NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon -dM -E - | grep -i -c -q __ARM_NEON && echo "-march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon") + NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon -dM -E - 2>/dev/null | grep -i -c -q __ARM_NEON && echo "-march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon") GCM_FLAG = $(NEON_FLAG) ARIA_FLAG = $(NEON_FLAG) BLAKE2_FLAG = $(NEON_FLAG) endif ifeq ($(IS_ARMV8),1) - ARMV8A_NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv8-a -dM -E - | grep -i -c -q __ARM_NEON && echo "-march=armv8-a") - ARMV8A_CRC_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv8-a+crc -dM -E - | grep -i -c -q __ARM_FEATURE_CRC32 && echo "-march=armv8-a+crc") - ARMV8A_CRYPTO_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv8-a+crypto -dM -E - | grep -i -c -q __ARM_FEATURE_CRYPTO && echo "-march=armv8-a+crypto") + ARMV8A_NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv8-a -dM -E - 2>/dev/null | grep -i -c -q __ARM_NEON && echo "-march=armv8-a") + ARMV8A_CRC_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv8-a+crc -dM -E - 2>/dev/null | grep -i -c -q __ARM_FEATURE_CRC32 && echo "-march=armv8-a+crc") + ARMV8A_CRYPTO_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv8-a+crypto -dM -E - 2>/dev/null | grep -i -c -q __ARM_FEATURE_CRYPTO && echo "-march=armv8-a+crypto") CRC_FLAG = $(ARMV8A_CRC_FLAG) AES_FLAG = $(ARMV8A_CRYPTO_FLAG) GCM_FLAG = $(ARMV8A_CRYPTO_FLAG) From f30ab0598e0448fca94e44d1e79ede50e9f883f0 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 2 Aug 2017 04:18:16 -0400 Subject: [PATCH 2/5] Fix x64 builds Take 4 --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 80006a6b..33e4a0fa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -27,7 +27,7 @@ image: build: - project: cryptest.sln +# project: cryptest.sln verbosity: minimal parallel: true From be96ff3b0e6d37929d3a451c303e5db3f35f737c Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 2 Aug 2017 04:23:54 -0400 Subject: [PATCH 3/5] Fix x64 builds Take 5 --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 33e4a0fa..b243215d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,11 +25,11 @@ image: - Visual Studio 2015 - Visual Studio 2013 -build: +build: off # project: cryptest.sln - verbosity: minimal - parallel: true +# verbosity: minimal +# parallel: true test_script: From 4264ff0f16315b63fb363f49cd3d7ee5c348f93a Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 2 Aug 2017 04:25:46 -0400 Subject: [PATCH 4/5] Fix x64 builds Take 6 --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b243215d..0a75762b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,9 +35,9 @@ test_script: - cmd: >- - vcupgrade.exe -nologo -overwrite cryptlib.vcxproj +# vcupgrade.exe -nologo -overwrite cryptlib.vcxproj - vcupgrade.exe -nologo -overwrite cryptest.vcxproj +# vcupgrade.exe -nologo -overwrite cryptest.vcxproj msbuild /t:Build cryptlib.vcxproj From 946b04bb90c021547b61bafcc8cb06ced57d297c Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 2 Aug 2017 04:26:53 -0400 Subject: [PATCH 5/5] Fix x64 builds Take 7 --- .appveyor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0a75762b..0ba54d7b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,10 +35,6 @@ test_script: - cmd: >- -# vcupgrade.exe -nologo -overwrite cryptlib.vcxproj - -# vcupgrade.exe -nologo -overwrite cryptest.vcxproj - msbuild /t:Build cryptlib.vcxproj msbuild /t:Build cryptest.vcxproj