ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-02 16:52:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added s390x arch flags to makefile and ZeroTierOne.h for ticket #950

Browse Source
This commit is contained in:
Joseph Henry 2019-06-11 10:54:06 -07:00
parent 848f822171
commit ebadc6f203
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ZeroTierOne.h
View File

@ -1096,7 +1096,8 @@ enum ZT_Architecture
ZT_ARCHITECTURE_SPARC64 = 12, ZT_ARCHITECTURE_SPARC64 = 12,
ZT_ARCHITECTURE_DOTNET_CLR = 13, ZT_ARCHITECTURE_DOTNET_CLR = 13,
ZT_ARCHITECTURE_JAVA_JVM = 14, ZT_ARCHITECTURE_JAVA_JVM = 14,
ZT_ARCHITECTURE_WEB = 15 ZT_ARCHITECTURE_WEB = 15,
ZT_ARCHITECTURE_S390X = 16
}; };
/** /**

3
make-linux.mk
View File

@ -224,6 +224,9 @@ ifeq ($(CC_MACH),mips64el)
ZT_ARCHITECTURE=6 ZT_ARCHITECTURE=6
override DEFS+=-DZT_NO_TYPE_PUNNING override DEFS+=-DZT_NO_TYPE_PUNNING
endif endif
ifeq ($(CC_MACH),s390x)
ZT_ARCHITECTURE=16
endif
# Fail if system architecture could not be determined # Fail if system architecture could not be determined
ifeq ($(ZT_ARCHITECTURE),999) ifeq ($(ZT_ARCHITECTURE),999)