ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-03 17:22:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Need to just have a make option for soft float ARM.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-04-04 11:26:50 -07:00
parent f73a1d2d56
commit 33c3af752b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
make-linux.mk
View File

@ -122,16 +122,26 @@ ifeq ($(CC_MACH),aarch64)
endif endif
DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\"" DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""
# Define some conservative CPU instruction set flags for arm32 since there's a ton of variation out there # Ensure no unaligned access on ARM targets
ifeq ($(ZT_ARCHITECTURE),3) ifeq ($(ZT_ARCHITECTURE),3)
override CFLAGS+=-march=armv5te -mfloat-abi=soft -marm -mno-unaligned-access override DEFS+=-DZT_NO_TYPE_PUNNING
override CXXFLAGS+=-march=armv5te -mfloat-abi=soft -marm -mno-unaligned-access endif
ifeq ($(ZT_ARCHITECTURE),4)
override DEFS+=-DZT_NO_TYPE_PUNNING override DEFS+=-DZT_NO_TYPE_PUNNING
endif endif
# Define this to build a static binary, which is needed to make this runnable on a few ancient Linux distros # Static builds, which are currently done for a number of Linux targets
ifeq ($(ZT_STATIC),1) ifeq ($(ZT_STATIC),1)
override LDFLAGS+=-static 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=armv6kz -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -mno-unaligned-access -marm
override CXXFLAGS+=-march=armv6kz -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -mno-unaligned-access -marm
endif
endif
endif endif
all: one all: one