From 06125c48bc7aa8f45bdfcd71cbd692e254bd0377 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 30 Nov 2021 15:35:18 -0500 Subject: [PATCH 1/5] Another build speedup. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index deaa94da1..d48c96bfc 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong dh $@ --with systemd override_dh_auto_build: - make -j4 + make -j`nproc` override_dh_systemd_start: dh_systemd_start --restart-after-upgrade From e37c9055b316493a4c7715c68a83ed4b07ed6ce9 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 30 Nov 2021 19:54:17 -0500 Subject: [PATCH 2/5] ARM flags --- make-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index 25a2fe617..4435e7683 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -286,8 +286,8 @@ ifeq ($(ZT_ARCHITECTURE),3) override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm ZT_USE_ARM32_NEON_ASM_CRYPTO=0 else - override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -mstructure-size-boundary=8 -marm -mno-unaligned-access - override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -fexceptions -mstructure-size-boundary=8 -marm -mno-unaligned-access + override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6 -mcpu=arm1176jzf-s -mstructure-size-boundary=8 -marm -mno-unaligned-access + override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6 -mcpu=arm1176jzf-s -fexceptions -mstructure-size-boundary=8 -marm -mno-unaligned-access ZT_USE_ARM32_NEON_ASM_CRYPTO=0 endif endif From 5ce0019ee5e189cba5979d7772f5921a0f7f440a Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 1 Dec 2021 10:40:01 -0500 Subject: [PATCH 3/5] ARM wrestling. --- make-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index 4435e7683..d9174508c 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -286,8 +286,8 @@ ifeq ($(ZT_ARCHITECTURE),3) override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm ZT_USE_ARM32_NEON_ASM_CRYPTO=0 else - override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6 -mcpu=arm1176jzf-s -mstructure-size-boundary=8 -marm -mno-unaligned-access - override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6 -mcpu=arm1176jzf-s -fexceptions -mstructure-size-boundary=8 -marm -mno-unaligned-access + override CFLAGS+=-mfloat-abi=hard -march=armv6kz+fp -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s + override CXXFLAGS+=-mfloat-abi=hard -march=armv6kz+fp -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s ZT_USE_ARM32_NEON_ASM_CRYPTO=0 endif endif From 5c3a2357ef7818655f01e3067c4f2970722e406e Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 1 Dec 2021 17:01:57 -0500 Subject: [PATCH 4/5] VERSION 1.8.4 From eac56a2e25bbd27f77505cbd0c21b86abdfbd36b Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 1 Dec 2021 17:27:55 -0500 Subject: [PATCH 5/5] Build fix in ARM flags for Snap builds. --- make-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index d9174508c..ca304db7f 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -286,8 +286,8 @@ ifeq ($(ZT_ARCHITECTURE),3) override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm ZT_USE_ARM32_NEON_ASM_CRYPTO=0 else - override CFLAGS+=-mfloat-abi=hard -march=armv6kz+fp -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s - override CXXFLAGS+=-mfloat-abi=hard -march=armv6kz+fp -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s + override CFLAGS+=-mfloat-abi=hard -march=armv6kz -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s + override CXXFLAGS+=-mfloat-abi=hard -march=armv6kz -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s ZT_USE_ARM32_NEON_ASM_CRYPTO=0 endif endif