From 774454ba7c9da45759ff40e584f5aed9ba3fcb9a Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 1 Dec 2018 21:33:17 -0500 Subject: [PATCH] Cleanup Disable rules for x86 --- GNUmakefile | 19 ++++++++++--------- GNUmakefile-cross | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4981b73c..42f13fc1 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -375,16 +375,17 @@ ifeq ($(DETECT_FEATURES),1) CXXFLAGS += -DCRYPTOPP_DISABLE_SSE4 endif - # Unusual GCC/Clang on Macports. It assembles AES, but not CLMUL. - # test_x86_clmul.s:15: no such instruction: 'pclmulqdq $0, %xmm1,%xmm0' - ifeq ($(CLMUL_FLAG),) - CXXFLAGS += -DCRYPTOPP_DISABLE_CLMUL - endif - ifeq ($(AESNI_FLAG),) - CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI - endif - ifneq ($(SSE42_FLAG),) + + # Unusual GCC/Clang on Macports. It assembles AES, but not CLMUL. + # test_x86_clmul.s:15: no such instruction: 'pclmulqdq $0, %xmm1,%xmm0' + ifeq ($(CLMUL_FLAG),) + CXXFLAGS += -DCRYPTOPP_DISABLE_CLMUL + endif + ifeq ($(AESNI_FLAG),) + CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI + endif + ifeq ($(AVX_FLAG),) CXXFLAGS += -DCRYPTOPP_DISABLE_AVX else ifeq ($(AVX2_FLAG),) diff --git a/GNUmakefile-cross b/GNUmakefile-cross index d68dcfef..3cc1cfb7 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -315,16 +315,17 @@ ifeq ($(DETECT_FEATURES),1) CXXFLAGS += -DCRYPTOPP_DISABLE_SSE4 endif - # Unusual GCC/Clang on Macports. It assembles AES, but not CLMUL. - # test_x86_clmul.s:15: no such instruction: 'pclmulqdq $0, %xmm1,%xmm0' - ifeq ($(CLMUL_FLAG),) - CXXFLAGS += -DCRYPTOPP_DISABLE_CLMUL - endif - ifeq ($(AESNI_FLAG),) - CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI - endif - ifneq ($(SSE42_FLAG),) + + # Unusual GCC/Clang on Macports. It assembles AES, but not CLMUL. + # test_x86_clmul.s:15: no such instruction: 'pclmulqdq $0, %xmm1,%xmm0' + ifeq ($(CLMUL_FLAG),) + CXXFLAGS += -DCRYPTOPP_DISABLE_CLMUL + endif + ifeq ($(AESNI_FLAG),) + CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI + endif + ifeq ($(AVX_FLAG),) CXXFLAGS += -DCRYPTOPP_DISABLE_AVX else ifeq ($(AVX2_FLAG),)