diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-08-19 01:10:37 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-08-19 01:11:51 +0200 |
| commit | a63ae585961cb7c0bdd454c213f04818824dd205 (patch) | |
| tree | de5fcf4619ae731920d024c962348e9e9370098d | |
| parent | 7ad75a81cadc1629dbc1a60e7247e8d1c5ea83a4 (diff) | |
| download | VeraCrypt-a63ae585961cb7c0bdd454c213f04818824dd205.tar.gz VeraCrypt-a63ae585961cb7c0bdd454c213f04818824dd205.zip | |
Linux: don't use SSE/AES switched of gcc if the architecture is not x86 or x64 (for example ARM).
| -rw-r--r-- | src/Makefile | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/Makefile b/src/Makefile index 0f7ac328..0477d5a1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -163,23 +163,25 @@ ifeq "$(shell uname -s)" "Linux" PLATFORM := Linux C_CXX_FLAGS += -DTC_UNIX -DTC_LINUX - CFLAGS += -msse2 - CXXFLAGS += -msse2 - - GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40400) - GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40300) - ifeq "$(GCC_GTEQ_440)" "1" - CFLAGS += -maes - CXXFLAGS += -maes - endif - - ifeq "$(GCC_GTEQ_430)" "1" - ifeq "$(origin SSSE3)" "command line" - CFLAGS += -mssse3 -msse4.1 + ifneq "$(CPU_ARCH)" "unknown" + CFLAGS += -msse2 + CXXFLAGS += -msse2 + + GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40400) + GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40300) + ifeq "$(GCC_GTEQ_440)" "1" + CFLAGS += -maes + CXXFLAGS += -maes endif - ifeq "$(origin SSE41)" "command line" - CXXFLAGS += -mssse3 -msse4.1 + ifeq "$(GCC_GTEQ_430)" "1" + ifeq "$(origin SSSE3)" "command line" + CFLAGS += -mssse3 -msse4.1 + endif + + ifeq "$(origin SSE41)" "command line" + CXXFLAGS += -mssse3 -msse4.1 + endif endif endif |