From ebadc6f2030aa9cd335fa7a6b65e97c7dc24477a Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 11 Jun 2019 10:54:06 -0700 Subject: [PATCH] Added s390x arch flags to makefile and ZeroTierOne.h for ticket #950 --- include/ZeroTierOne.h | 3 ++- make-linux.mk | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 324036bd2..746009898 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 dc238c4f2..d0745fe9a 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)