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

Fix xompile on downlevel assemblers 

This surfaced on Solaris with an ancient Binutils
pull/668/merge
Jeffrey Walton 2018-07-16 15:27:25 -04:00
parent b91491da4f
commit ee8c141d3c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GNUmakefile
View File

@ -237,9 +237,9 @@ ifeq ($(HAVE_GAS)$(GAS219_OR_LATER),10)
CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI
else else
ifeq ($(HAVE_GAS)$(GAS224_OR_LATER),10) ifeq ($(HAVE_GAS)$(GAS224_OR_LATER),10)
CXXFLAGS += -DCRYPTOPP_DISABLE_SHA CXXFLAGS += -DCRYPTOPP_DISABLE_SHANI
endif # -DCRYPTOPP_DISABLE_SHA endif # -DCRYPTOPP_DISABLE_SHANI
endif # -DCRYPTOPP_DISABLE_AESNI endif # -DCRYPTOPP_DISABLE_AESNI
endif # -DCRYPTOPP_DISABLE_SSE4 endif # -DCRYPTOPP_DISABLE_SSE4
endif # -DCRYPTOPP_DISABLE_SSSE3 endif # -DCRYPTOPP_DISABLE_SSSE3
@ -284,12 +284,12 @@ ifeq ($(findstring -DCRYPTOPP_DISABLE_AESNI,$(CXXFLAGS)),)
AES_FLAG = -msse4.1 -maes AES_FLAG = -msse4.1 -maes
SM4_FLAG = -mssse3 -maes SM4_FLAG = -mssse3 -maes
endif endif
ifeq ($(findstring -DCRYPTOPP_DISABLE_SHA,$(CXXFLAGS)),) ifeq ($(findstring -DCRYPTOPP_DISABLE_SHANI,$(CXXFLAGS)),)
HAVE_SHA = $(shell echo | $(CXX) -x c++ $(CXXFLAGS) -msse4.2 -msha -dM -E - 2>/dev/null | $(GREP) -i -c __SHA__) HAVE_SHA = $(shell echo | $(CXX) -x c++ $(CXXFLAGS) -msse4.2 -msha -dM -E - 2>/dev/null | $(GREP) -i -c __SHA__)
ifeq ($(HAVE_SHA),1) ifeq ($(HAVE_SHA),1)
SHA_FLAG = -msse4.2 -msha SHA_FLAG = -msse4.2 -msha
endif endif
endif # -DCRYPTOPP_DISABLE_SHA endif # -DCRYPTOPP_DISABLE_SHANI
endif # -DCRYPTOPP_DISABLE_AESNI endif # -DCRYPTOPP_DISABLE_AESNI
endif # -DCRYPTOPP_DISABLE_SSE4 endif # -DCRYPTOPP_DISABLE_SSE4
endif # -DCRYPTOPP_DISABLE_SSSE3 endif # -DCRYPTOPP_DISABLE_SSSE3