X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/067bfc8b762f86d5ebb65ecca9e1ba3a304ecd84..289d25ae1553d8a14054ddda1aa7b27f649645d1:/client/Makefile diff --git a/client/Makefile b/client/Makefile index d05bdc44..3a96e9e9 100644 --- a/client/Makefile +++ b/client/Makefile @@ -12,14 +12,15 @@ TARFLAGS = -C .. --ignore-failed-read -rvf RM = rm -f MV = mv -#COMMON_FLAGS = -m32 +ENV_LDFLAGS := $(LDFLAGS) +ENV_CFLAGS := $(CFLAGS) VPATH = ../common ../zlib ../uart OBJDIR = obj LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm LUALIB = ../liblua/liblua.a -LDFLAGS = $(COMMON_FLAGS) -CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3 +LDFLAGS = $(ENV_LDFLAGS) +CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall -g -O3 CXXFLAGS = -I../include -Wall -O3 LUAPLATFORM = generic @@ -85,10 +86,11 @@ CORESRCS = uart_posix.c \ CMDSRCS = crapto1/crapto1.c\ crapto1/crypto1.c\ + polarssl/des.c \ + polarssl/aes.c\ mfkey.c\ loclass/cipher.c \ loclass/cipherutils.c \ - loclass/des.c \ loclass/ikeys.c \ loclass/elite_crack.c\ loclass/fileutils.c\ @@ -140,13 +142,13 @@ CMDSRCS = crapto1/crapto1.c\ cmdlfti.c \ cmdlfviking.c\ cmdlfvisa2000.c\ + cmdlfpac.c\ cmdparser.c \ cmdmain.c \ scripting.c\ cmdscript.c\ pm3_binlib.c\ pm3_bitlib.c\ - aes.c\ protocols.c\ sha1.c\ cmdcrc.c\ @@ -161,7 +163,7 @@ cpu_arch = $(shell uname -m) ifneq ($(findstring 86, $(cpu_arch)), ) MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c endif -ifneq ($(findstring 64, $(cpu_arch)), ) +ifneq ($(findstring amd64, $(cpu_arch)), ) MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c endif ifeq ($(MULTIARCHSRCS), ) @@ -183,14 +185,21 @@ MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o) -GCC_GTEQ_490 := $(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/'` \>= 40900) +GCC_VERSION := $(shell gcc --version | awk '/gcc/{print $$NF;}' | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/') +CLANG_VERSION := $(shell gcc --version | awk '/Apple LLVM version/{print $$4;}' | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/') +ifneq ($(CLANG_VERSION), ) + SUPPORTS_AVX512 := $(shell [ $(CLANG_VERSION) -ge 80000 ] && echo "True" ) +endif +ifneq ($(GCC_VERSION), ) + SUPPORTS_AVX512 := $(shell [ $(GCC_VERSION) -ge 40900 ] && echo "True" ) +endif HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2 HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2 HARD_SWITCH_SSE2 = -mmmx -msse2 -mno-avx -mno-avx2 HARD_SWITCH_AVX = -mmmx -msse2 -mavx -mno-avx2 HARD_SWITCH_AVX2 = -mmmx -msse2 -mavx -mavx2 HARD_SWITCH_AVX512 = -mmmx -msse2 -mavx -mavx2 -mavx512f -ifeq "$(GCC_GTEQ_490)" "1" +ifeq "$(SUPPORTS_AVX512)" "True" HARD_SWITCH_NOSIMD += -mno-avx512f HARD_SWITCH_MMX += -mno-avx512f HARD_SWITCH_SSE2 += -mno-avx512f