void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Static ARM32 build fixes.

Browse source
This commit is contained in:
Adam Ierymenko 2017-04-24 18:12:58 -07:00
parent 97f1d7ae2e
commit 77796caba6
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
make-linux.mk
View file

@ -171,6 +171,22 @@ endif
# Disable software updates by default on Linux since that is normally done with package management # Disable software updates by default on Linux since that is normally done with package management
override DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\"" override DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""
# Static builds, which are currently done for a number of Linux targets
ifeq ($(ZT_STATIC),1)
override LDFLAGS+=-static
ifeq ($(ZT_ARCHITECTURE),3)
ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
override CFLAGS+=-march=armv5te -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
override CXXFLAGS+=-march=armv5te -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
ZT_USE_ARM32_NEON_ASM_SALSA2012=0
else
override CFLAGS+=-march=armv6zk -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -mno-unaligned-access -marm
override CXXFLAGS+=-march=armv6zk -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -mno-unaligned-access -marm
ZT_USE_ARM32_NEON_ASM_SALSA2012=0
endif
endif
endif
# Build faster crypto on some targets # Build faster crypto on some targets
ifeq ($(ZT_USE_X64_ASM_SALSA2012),1) ifeq ($(ZT_USE_X64_ASM_SALSA2012),1)
override DEFS+=-DZT_USE_X64_ASM_SALSA2012 override DEFS+=-DZT_USE_X64_ASM_SALSA2012
@ -181,20 +197,6 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_SALSA2012),1)
override OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o override OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o
endif endif
# Static builds, which are currently done for a number of Linux targets
ifeq ($(ZT_STATIC),1)
override LDFLAGS+=-static
ifeq ($(ZT_ARCHITECTURE),3)
ifeq ($(ZT_ARM_SOFTFLOAT),1)
override CFLAGS+=-march=armv5te -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
override CXXFLAGS+=-march=armv5te -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
else
override CFLAGS+=-march=armv6zk -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -mno-unaligned-access
override CXXFLAGS+=-march=armv6zk -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -mno-unaligned-access
endif
endif
endif
all: one all: one
one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o