diff options
| author | Joseph Henry <josephjah@gmail.com> | 2019-06-11 10:54:06 -0700 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2019-06-11 10:54:06 -0700 |
| commit | ebadc6f2030aa9cd335fa7a6b65e97c7dc24477a (patch) | |
| tree | 3edc3f9e937b5802fa7cca86cff6a74b817956b1 | |
| parent | 848f822171a41f78eef7ee0dcab99a6ec53d634a (diff) | |
| download | infinitytier-ebadc6f2030aa9cd335fa7a6b65e97c7dc24477a.tar.gz infinitytier-ebadc6f2030aa9cd335fa7a6b65e97c7dc24477a.zip | |
Added s390x arch flags to makefile and ZeroTierOne.h for ticket #950
| -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) |