diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-04-25 06:34:34 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-04-25 06:34:34 -0700 |
| commit | 4608880fb06700822d01e9e5d6729fcdeb82b64b (patch) | |
| tree | ef7b9fa23a81fb0175c171cbf715890b6e656caf | |
| parent | 7492e2789fce71013afb11221eabbaf4363e435a (diff) | |
| download | infinitytier-4608880fb06700822d01e9e5d6729fcdeb82b64b.tar.gz infinitytier-4608880fb06700822d01e9e5d6729fcdeb82b64b.zip | |
Re-enable faster ed25519 signatures on x64 thanks to PR from @jonathonf
| -rw-r--r-- | make-linux.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/make-linux.mk b/make-linux.mk index c318c785..2e6a8632 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -71,15 +71,11 @@ ifeq ($(ZT_DEBUG),1) # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box! node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS) else - CFLAGS?=-O3 -fstack-protector + CFLAGS?=-O3 -fstack-protector -fPIE override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) - CXXFLAGS?=-O3 -fstack-protector + CXXFLAGS?=-O3 -fstack-protector -fPIE override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS) - ifneq ($(ZT_USE_X64_ASM_ED25519),1) - override CFLAGS+=-fPIE - override CXXFLAGS+=-fPIE - LDFLAGS=-pie -Wl,-z,relro,-z,now - endif + LDFLAGS=-pie -Wl,-z,relro,-z,now STRIP?=strip STRIP+=--strip-all endif @@ -104,10 +100,12 @@ ZT_ARCHITECTURE=999 ifeq ($(CC_MACH),x86_64) ZT_ARCHITECTURE=2 ZT_USE_X64_ASM_SALSA=1 + ZT_USE_X64_ASM_ED25519=1 endif ifeq ($(CC_MACH),amd64) ZT_ARCHITECTURE=2 ZT_USE_X64_ASM_SALSA=1 + ZT_USE_X64_ASM_ED25519=1 endif ifeq ($(CC_MACH),powerpc64le) ZT_ARCHITECTURE=8 |