diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-06-11 11:01:20 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-06-11 11:01:20 -0700 |
| commit | cf046a4039f9e58323531e399ee9e8e21710f3e8 (patch) | |
| tree | 7fd25be0eee634a879cdecb65a2580b0614932b8 | |
| parent | 700cc92083bfe0727c4a1ce0f8716dcbdd510da3 (diff) | |
| parent | 2eb9c0924a96bd1570df28e517b0deca714b566c (diff) | |
| download | infinitytier-cf046a4039f9e58323531e399ee9e8e21710f3e8.tar.gz infinitytier-cf046a4039f9e58323531e399ee9e8e21710f3e8.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
| -rw-r--r-- | include/ZeroTierOne.h | 3 | ||||
| -rw-r--r-- | make-linux.mk | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 324036bd..74600989 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -1096,7 +1096,8 @@ enum ZT_Architecture ZT_ARCHITECTURE_SPARC64 = 12, ZT_ARCHITECTURE_DOTNET_CLR = 13, ZT_ARCHITECTURE_JAVA_JVM = 14, - ZT_ARCHITECTURE_WEB = 15 + ZT_ARCHITECTURE_WEB = 15, + ZT_ARCHITECTURE_S390X = 16 }; /** diff --git a/make-linux.mk b/make-linux.mk index dc238c4f..d0745fe9 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -224,6 +224,9 @@ ifeq ($(CC_MACH),mips64el) ZT_ARCHITECTURE=6 override DEFS+=-DZT_NO_TYPE_PUNNING endif +ifeq ($(CC_MACH),s390x) + ZT_ARCHITECTURE=16 +endif # Fail if system architecture could not be determined ifeq ($(ZT_ARCHITECTURE),999) |