diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-08-08 23:02:36 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-08-08 23:02:36 +0000 |
| commit | 5ac246132c75c6d08b860424d463b52bb2ea02d6 (patch) | |
| tree | 44816966e66c99358ac73574f00241d03e5bfd0b /GNUmakefile | |
| parent | 0a38de22b46642450902b2d1bb67829ac9c2a275 (diff) | |
| download | cryptopp-5ac246132c75c6d08b860424d463b52bb2ea02d6.tar.gz | |
fix compile with GCC 4.4 and -march=i386
fix minor documentation issues
fix compile w/o GAS 2.19 or later
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@519 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile index 9871323..62f2f60 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -30,6 +30,7 @@ ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0- IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun") GAS210_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])") GAS217_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])") +GAS219_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])") ISMINGW = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "mingw") ifneq ($(GCC42_OR_LATER),0) @@ -54,6 +55,10 @@ CXXFLAGS += -DCRYPTOPP_DISABLE_ASM else ifeq ($(GAS217_OR_LATER),0) CXXFLAGS += -DCRYPTOPP_DISABLE_SSSE3 +else +ifeq ($(GAS219_OR_LATER),0) +CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI +endif endif ifeq ($(UNAME),SunOS) CXXFLAGS += -Wa,--divide # allow use of "/" operator |