Forráskód Böngészése

Merge branch 'dev' of https://github.com/zerotier/zerotierone into dev

Joseph Henry 3 éve
szülő
commit
6cddb94509
3 módosított fájl, 7 hozzáadás és 2 törlés
  1. 1 1
      dockerbuild/Dockerfile.alpine
  2. 2 1
      include/ZeroTierOne.h
  3. 4 0
      make-linux.mk

+ 1 - 1
dockerbuild/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM alpine:3.11.3
+FROM alpine:3.15
 
 ARG go_pkg_url
 

+ 2 - 1
include/ZeroTierOne.h

@@ -1079,7 +1079,8 @@ enum ZT_Architecture
 	ZT_ARCHITECTURE_DOTNET_CLR = 13,
 	ZT_ARCHITECTURE_JAVA_JVM = 14,
 	ZT_ARCHITECTURE_WEB = 15,
-	ZT_ARCHITECTURE_S390X = 16
+	ZT_ARCHITECTURE_S390X = 16,
+	ZT_ARCHITECTURE_LOONGARCH64 = 17
 };
 
 /**

+ 4 - 0
make-linux.mk

@@ -252,6 +252,10 @@ endif
 ifeq ($(CC_MACH),riscv64)
 	ZT_ARCHITECTURE=0
 endif
+ifeq ($(CC_MACH),loongarch64)
+	ZT_ARCHITECTURE=17
+	override DEFS+=-DZT_NO_TYPE_PUNNING
+endif
 
 # Fail if system architecture could not be determined
 ifeq ($(ZT_ARCHITECTURE),999)