mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-09-20 21:06:22 +02:00
Linux/MacOSX: cleaner support for SSE compiler switches
This commit is contained in:
parent
f96eb0c5ec
commit
0f7ef7dcd7
22
src/Makefile
22
src/Makefile
@ -129,6 +129,7 @@ export PLATFORM_ARCH := "Unknown"
|
|||||||
export PLATFORM_UNSUPPORTED := 0
|
export PLATFORM_UNSUPPORTED := 0
|
||||||
|
|
||||||
export CPU_ARCH ?= unknown
|
export CPU_ARCH ?= unknown
|
||||||
|
export SIMD_SUPPORTED := 0
|
||||||
|
|
||||||
ARCH = $(shell uname -p)
|
ARCH = $(shell uname -p)
|
||||||
ifeq "$(ARCH)" "unknown"
|
ifeq "$(ARCH)" "unknown"
|
||||||
@ -149,9 +150,11 @@ endif
|
|||||||
|
|
||||||
ifeq "$(CPU_ARCH)" "x86"
|
ifeq "$(CPU_ARCH)" "x86"
|
||||||
PLATFORM_ARCH := i386
|
PLATFORM_ARCH := i386
|
||||||
|
SIMD_SUPPORTED := 1
|
||||||
C_CXX_FLAGS += -D TC_ARCH_X86
|
C_CXX_FLAGS += -D TC_ARCH_X86
|
||||||
else ifeq "$(CPU_ARCH)" "x64"
|
else ifeq "$(CPU_ARCH)" "x64"
|
||||||
PLATFORM_ARCH := amd64
|
PLATFORM_ARCH := amd64
|
||||||
|
SIMD_SUPPORTED := 1
|
||||||
C_CXX_FLAGS += -D TC_ARCH_X64
|
C_CXX_FLAGS += -D TC_ARCH_X64
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -163,7 +166,7 @@ ifeq "$(shell uname -s)" "Linux"
|
|||||||
PLATFORM := Linux
|
PLATFORM := Linux
|
||||||
C_CXX_FLAGS += -DTC_UNIX -DTC_LINUX
|
C_CXX_FLAGS += -DTC_UNIX -DTC_LINUX
|
||||||
|
|
||||||
ifneq "$(CPU_ARCH)" "unknown"
|
ifeq "$(SIMD_SUPPORTED)" "1"
|
||||||
CFLAGS += -msse2
|
CFLAGS += -msse2
|
||||||
CXXFLAGS += -msse2
|
CXXFLAGS += -msse2
|
||||||
|
|
||||||
@ -176,10 +179,12 @@ ifeq "$(shell uname -s)" "Linux"
|
|||||||
|
|
||||||
ifeq "$(GCC_GTEQ_430)" "1"
|
ifeq "$(GCC_GTEQ_430)" "1"
|
||||||
ifeq "$(origin SSSE3)" "command line"
|
ifeq "$(origin SSSE3)" "command line"
|
||||||
CFLAGS += -mssse3 -msse4.1
|
CFLAGS += -mssse3
|
||||||
|
CXXFLAGS += -mssse3
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq "$(origin SSE41)" "command line"
|
ifeq "$(origin SSE41)" "command line"
|
||||||
|
CFLAGS += -mssse3 -msse4.1
|
||||||
CXXFLAGS += -mssse3 -msse4.1
|
CXXFLAGS += -mssse3 -msse4.1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -235,6 +240,19 @@ ifeq "$(shell uname -s)" "Darwin"
|
|||||||
CPU_ARCH = x86
|
CPU_ARCH = x86
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
CFLAGS += -msse2
|
||||||
|
CXXFLAGS += -msse2
|
||||||
|
|
||||||
|
ifeq "$(origin SSSE3)" "command line"
|
||||||
|
CFLAGS += -mssse3
|
||||||
|
CXXFLAGS += -mssse3
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(origin SSE41)" "command line"
|
||||||
|
CFLAGS += -mssse3 -msse4.1
|
||||||
|
CXXFLAGS += -mssse3 -msse4.1
|
||||||
|
endif
|
||||||
|
|
||||||
AS := $(BASE_DIR)/Build/Tools/MacOSX/nasm
|
AS := $(BASE_DIR)/Build/Tools/MacOSX/nasm
|
||||||
ASFLAGS += --prefix _
|
ASFLAGS += --prefix _
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user