diff options
Diffstat (limited to 'tunnel')
| -rw-r--r-- | tunnel/tools/libwg-go/Makefile | 6 | ||||
| -rw-r--r-- | tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff | 36 | ||||
| m--------- | tunnel/tools/wireguard-tools | 0 |
3 files changed, 21 insertions, 21 deletions
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile index c52acf7e..fafcd72d 100644 --- a/tunnel/tools/libwg-go/Makefile +++ b/tunnel/tools/libwg-go/Makefile @@ -20,11 +20,11 @@ export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME)) export GOOS := android export CGO_ENABLED := 1 -GO_VERSION := 1.14.4 +GO_VERSION := 1.15.2 GO_PLATFORM := $(shell uname -s | tr '[:upper:]' '[:lower:]')-$(NDK_GO_ARCH_MAP_$(shell uname -m)) GO_TARBALL := go$(GO_VERSION).$(GO_PLATFORM).tar.gz -GO_HASH_darwin-amd64 := 3fa7ed8dc44fdd50c0bfe72676250cceca527d59950aef20af906a670cf88de2 -GO_HASH_linux-amd64 := aed845e4185a0b2a3c3d5e1d0a35491702c55889192bb9c30e67a3de6849c067 +GO_HASH_darwin-amd64 := 9bd39600d9fa1fa4a5ccce8761d249f7421cffe671376f791293c4138f3d7c62 +GO_HASH_linux-amd64 := b49fda1ca29a1946d6bb2a5a6982cf07ccd2aba849289508ee0f9918f6bb4552 default: $(DESTDIR)/libwg-go.so diff --git a/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff index f7918fbe..63d68797 100644 --- a/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff +++ b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff @@ -1,6 +1,6 @@ -From e44f456f1d0e429e08afed64a161175ff493f3ac Mon Sep 17 00:00:00 2001 +From 1d1ba1da11afd73008c0e942db7621697055a6b6 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> -Date: Wed, 27 Feb 2019 05:05:44 +0100 +Date: Tue, 15 Sep 2020 13:39:22 +0200 Subject: [PATCH] runtime: use CLOCK_BOOTTIME in nanotime on Linux This makes timers account for having expired while a computer was @@ -28,10 +28,10 @@ Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s -index 1b28098ad9..46b7071ed8 100644 +index 5b9b638ad7..448ad8b2e6 100644 --- a/src/runtime/sys_linux_386.s +++ b/src/runtime/sys_linux_386.s -@@ -317,13 +317,13 @@ noswitch: +@@ -339,13 +339,13 @@ noswitch: LEAL 8(SP), BX // &ts (struct timespec) MOVL BX, 4(SP) @@ -48,10 +48,10 @@ index 1b28098ad9..46b7071ed8 100644 INVOKE_SYSCALL diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s -index 58d3bc54b4..4bb9bde3d0 100644 +index fe9c6bce85..4836a7c774 100644 --- a/src/runtime/sys_linux_amd64.s +++ b/src/runtime/sys_linux_amd64.s -@@ -293,7 +293,7 @@ noswitch: +@@ -311,7 +311,7 @@ noswitch: MOVQ runtime·vdsoClockgettimeSym(SB), AX CMPQ AX, $0 JEQ fallback @@ -61,7 +61,7 @@ index 58d3bc54b4..4bb9bde3d0 100644 CALL AX MOVQ 0(SP), AX // sec diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s -index e103da56dc..0b872b90a6 100644 +index 475f52344c..bb567abcf4 100644 --- a/src/runtime/sys_linux_arm.s +++ b/src/runtime/sys_linux_arm.s @@ -11,7 +11,7 @@ @@ -73,7 +73,7 @@ index e103da56dc..0b872b90a6 100644 // for EABI, as we don't support OABI #define SYS_BASE 0x0 -@@ -345,7 +345,7 @@ noswitch: +@@ -366,7 +366,7 @@ noswitch: SUB $24, R13 // Space for results BIC $0x7, R13 // Align for C code @@ -83,7 +83,7 @@ index e103da56dc..0b872b90a6 100644 MOVW runtime·vdsoClockgettimeSym(SB), R2 CMP $0, R2 diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s -index b9588cec30..e444d50df4 100644 +index 198a5bacef..9715387f36 100644 --- a/src/runtime/sys_linux_arm64.s +++ b/src/runtime/sys_linux_arm64.s @@ -13,7 +13,7 @@ @@ -95,7 +95,7 @@ index b9588cec30..e444d50df4 100644 #define SYS_exit 93 #define SYS_read 63 -@@ -297,7 +297,7 @@ noswitch: +@@ -319,7 +319,7 @@ noswitch: BIC $15, R1 MOVD R1, RSP @@ -105,10 +105,10 @@ index b9588cec30..e444d50df4 100644 CBZ R2, fallback diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s -index 723cfe43d9..edd7a195eb 100644 +index afad056d06..2c9162b903 100644 --- a/src/runtime/sys_linux_mips64x.s +++ b/src/runtime/sys_linux_mips64x.s -@@ -278,7 +278,7 @@ noswitch: +@@ -304,7 +304,7 @@ noswitch: AND $~15, R1 // Align for C code MOVV R1, R29 @@ -118,10 +118,10 @@ index 723cfe43d9..edd7a195eb 100644 MOVV runtime·vdsoClockgettimeSym(SB), R25 diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s -index 15893a7a28..f3edf9a83a 100644 +index fab2ab3892..f9af103594 100644 --- a/src/runtime/sys_linux_mipsx.s +++ b/src/runtime/sys_linux_mipsx.s -@@ -235,7 +235,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$8-12 +@@ -238,7 +238,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$8-12 RET TEXT runtime·nanotime1(SB),NOSPLIT,$8-8 @@ -131,13 +131,13 @@ index 15893a7a28..f3edf9a83a 100644 MOVW $SYS_clock_gettime, R2 SYSCALL diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s -index 8629fe3233..2402e2623a 100644 +index fd69ee70a5..ff6bc8355b 100644 --- a/src/runtime/sys_linux_ppc64x.s +++ b/src/runtime/sys_linux_ppc64x.s -@@ -233,7 +233,7 @@ fallback: +@@ -249,7 +249,7 @@ fallback: JMP finish - TEXT runtime·nanotime1(SB),NOSPLIT,$16 + TEXT runtime·nanotime1(SB),NOSPLIT,$16-8 - MOVD $1, R3 // CLOCK_MONOTONIC + MOVD $7, R3 // CLOCK_BOOTTIME @@ -157,5 +157,5 @@ index c15a1d5364..f52c4d5098 100644 MOVW $SYS_clock_gettime, R1 SYSCALL -- -2.25.1 +2.28.0 diff --git a/tunnel/tools/wireguard-tools b/tunnel/tools/wireguard-tools -Subproject 9a0d65e2afbd6e418c883e0de8555b4fac29f1d +Subproject 7a321ce808ef9cec1f45cce92befcc9e170d3aa |