mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2024-12-25 15:41:05 +00:00
Re-enable faster ed25519 signatures on x64 thanks to PR from @jonathonf
This commit is contained in:
parent
7492e2789f
commit
4608880fb0
@ -71,15 +71,11 @@ ifeq ($(ZT_DEBUG),1)
|
|||||||
# C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
|
# 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)
|
node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
|
||||||
else
|
else
|
||||||
CFLAGS?=-O3 -fstack-protector
|
CFLAGS?=-O3 -fstack-protector -fPIE
|
||||||
override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
|
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)
|
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
|
||||||
ifneq ($(ZT_USE_X64_ASM_ED25519),1)
|
LDFLAGS=-pie -Wl,-z,relro,-z,now
|
||||||
override CFLAGS+=-fPIE
|
|
||||||
override CXXFLAGS+=-fPIE
|
|
||||||
LDFLAGS=-pie -Wl,-z,relro,-z,now
|
|
||||||
endif
|
|
||||||
STRIP?=strip
|
STRIP?=strip
|
||||||
STRIP+=--strip-all
|
STRIP+=--strip-all
|
||||||
endif
|
endif
|
||||||
@ -104,10 +100,12 @@ ZT_ARCHITECTURE=999
|
|||||||
ifeq ($(CC_MACH),x86_64)
|
ifeq ($(CC_MACH),x86_64)
|
||||||
ZT_ARCHITECTURE=2
|
ZT_ARCHITECTURE=2
|
||||||
ZT_USE_X64_ASM_SALSA=1
|
ZT_USE_X64_ASM_SALSA=1
|
||||||
|
ZT_USE_X64_ASM_ED25519=1
|
||||||
endif
|
endif
|
||||||
ifeq ($(CC_MACH),amd64)
|
ifeq ($(CC_MACH),amd64)
|
||||||
ZT_ARCHITECTURE=2
|
ZT_ARCHITECTURE=2
|
||||||
ZT_USE_X64_ASM_SALSA=1
|
ZT_USE_X64_ASM_SALSA=1
|
||||||
|
ZT_USE_X64_ASM_ED25519=1
|
||||||
endif
|
endif
|
||||||
ifeq ($(CC_MACH),powerpc64le)
|
ifeq ($(CC_MACH),powerpc64le)
|
||||||
ZT_ARCHITECTURE=8
|
ZT_ARCHITECTURE=8
|
||||||
|
Loading…
Reference in New Issue
Block a user