Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libwg-go: update golang version

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-08-26 11:08:45 -06:00
parent 535c611f2d
commit bc74d4d7f8
2 changed files with 94 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/tools/libwg-go/Makefile
View File

@ -23,7 +23,7 @@ default: $(DESTDIR)/libwg-go.so
GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m)) GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m))
GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]') GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
GOBUILDVERSION := 1.10.2 GOBUILDVERSION := 1.11
GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH) GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH)

140
app/tools/libwg-go/goruntime-boottime-over-monotonic.diff
View File

@ -1,7 +1,28 @@
diff -ru b/src/runtime/sys_linux_386.s a/src/runtime/sys_linux_386.s From 6f345a38d9533db388009d91d29981673dcf95b4 Mon Sep 17 00:00:00 2001
--- b/src/runtime/sys_linux_386.s 2018-04-30 22:26:39.000000000 +0200 From: Jason A. Donenfeld <Jason@zx2c4.com>
+++ a/src/runtime/sys_linux_386.s 2018-05-09 17:09:42.319531743 +0200 Date: Fri, 04 May 2018 03:48:23 +0200
@@ -287,13 +287,13 @@ Subject: [PATCH] runtime: use CLOCK_BOOTTIME in nanotime on Linux
This makes timers account for having expired while a computer was
asleep, which is quite common on mobile devices. Note that BOOTTIME is
identical to MONOTONIC, except that it takes into account time spent
in suspend. In Linux 4.17, the kernel will actually make MONOTONIC act
like BOOTTIME anyway, so this switch will additionally unify the
timer behavior across kernels.
BOOTTIME was introduced into Linux 2.6.39-rc1 with 70a08cca1227d in
2011.
Fixes #24595
Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321
---
diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index 8d5a4ff..bfad064 100644
--- a/src/runtime/sys_linux_386.s
+++ b/src/runtime/sys_linux_386.s
@@ -285,13 +285,13 @@
LEAL 8(SP), BX // &ts (struct timespec) LEAL 8(SP), BX // &ts (struct timespec)
MOVL BX, 4(SP) MOVL BX, 4(SP)
@ -17,11 +38,12 @@ diff -ru b/src/runtime/sys_linux_386.s a/src/runtime/sys_linux_386.s
LEAL 8(SP), CX LEAL 8(SP), CX
INVOKE_SYSCALL INVOKE_SYSCALL
diff -ru b/src/runtime/sys_linux_amd64.s a/src/runtime/sys_linux_amd64.s diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
--- b/src/runtime/sys_linux_amd64.s 2018-04-30 22:26:39.000000000 +0200 index 62d8024..8510be4 100644
+++ a/src/runtime/sys_linux_amd64.s 2018-05-09 17:09:42.319531743 +0200 --- a/src/runtime/sys_linux_amd64.s
@@ -258,7 +258,7 @@ +++ b/src/runtime/sys_linux_amd64.s
MOVQ runtime·__vdso_clock_gettime_sym(SB), AX @@ -257,7 +257,7 @@
MOVQ runtime·vdsoClockgettimeSym(SB), AX
CMPQ AX, $0 CMPQ AX, $0
JEQ fallback JEQ fallback
- MOVL $1, DI // CLOCK_MONOTONIC - MOVL $1, DI // CLOCK_MONOTONIC
@ -29,34 +51,55 @@ diff -ru b/src/runtime/sys_linux_amd64.s a/src/runtime/sys_linux_amd64.s
LEAQ 0(SP), SI LEAQ 0(SP), SI
CALL AX CALL AX
MOVQ 0(SP), AX // sec MOVQ 0(SP), AX // sec
diff -ru b/src/runtime/sys_linux_arm64.s a/src/runtime/sys_linux_arm64.s diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
--- b/src/runtime/sys_linux_arm64.s 2018-04-30 22:26:39.000000000 +0200 index aa39732..d29cb88 100644
+++ a/src/runtime/sys_linux_arm64.s 2018-05-09 17:12:47.844591628 +0200 --- a/src/runtime/sys_linux_arm.s
@@ -201,7 +201,7 @@ +++ b/src/runtime/sys_linux_arm.s
RET @@ -11,7 +11,7 @@
#include "textflag.h"
TEXT runtime·nanotime(SB),NOSPLIT,$24-8 #define CLOCK_REALTIME 0
- MOVW $1, R0 // CLOCK_MONOTONIC -#define CLOCK_MONOTONIC 1
+ MOVW $7, R0 // CLOCK_BOOTTIME +#define CLOCK_BOOTTIME 7
MOVD RSP, R1
MOVD $SYS_clock_gettime, R8
SVC
diff -ru b/src/runtime/sys_linux_arm.s a/src/runtime/sys_linux_arm.s
--- b/src/runtime/sys_linux_arm.s 2018-04-30 22:26:39.000000000 +0200
+++ a/src/runtime/sys_linux_arm.s 2018-05-09 17:13:18.983281049 +0200
@@ -235,7 +235,7 @@
// int64 nanotime(void) // for EABI, as we don't support OABI
TEXT runtime·nanotime(SB),NOSPLIT,$32 #define SYS_BASE 0x0
- MOVW $1, R0 // CLOCK_MONOTONIC @@ -287,7 +287,7 @@
+ MOVW $7, R0 // CLOCK_BOOTTIME SUB $24, R13 // Space for results
MOVW $8(R13), R1 // timespec BIC $0x7, R13 // Align for C code
MOVW $SYS_clock_gettime, R7
SWI $0 - MOVW $CLOCK_MONOTONIC, R0
diff -ru b/src/runtime/sys_linux_mips64x.s a/src/runtime/sys_linux_mips64x.s + MOVW $CLOCK_BOOTTIME, R0
--- b/src/runtime/sys_linux_mips64x.s 2018-04-30 22:26:39.000000000 +0200 MOVW $8(R13), R1 // timespec
+++ a/src/runtime/sys_linux_mips64x.s 2018-05-09 17:09:42.321531721 +0200 MOVW runtime·vdsoClockgettimeSym(SB), R11
@@ -197,7 +197,7 @@ CMP $0, R11
diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s
index c6afd76..24294e8 100644
--- a/src/runtime/sys_linux_arm64.s
+++ b/src/runtime/sys_linux_arm64.s
@@ -13,7 +13,7 @@
#define AT_FDCWD -100
#define CLOCK_REALTIME 0
-#define CLOCK_MONOTONIC 1
+#define CLOCK_BOOTTIME 7
#define SYS_exit 93
#define SYS_read 63
@@ -243,7 +243,7 @@
BIC $15, R1
MOVD R1, RSP
- MOVW $CLOCK_MONOTONIC, R0
+ MOVW $CLOCK_BOOTTIME, R0
MOVD runtime·vdsoClockgettimeSym(SB), R2
CBZ R2, fallback
BL (R2)
diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
index 8e64f1c..521062f 100644
--- a/src/runtime/sys_linux_mips64x.s
+++ b/src/runtime/sys_linux_mips64x.s
@@ -185,7 +185,7 @@
RET RET
TEXT runtime·nanotime(SB),NOSPLIT,$16 TEXT runtime·nanotime(SB),NOSPLIT,$16
@ -65,10 +108,11 @@ diff -ru b/src/runtime/sys_linux_mips64x.s a/src/runtime/sys_linux_mips64x.s
MOVV $0(R29), R5 MOVV $0(R29), R5
MOVV $SYS_clock_gettime, R2 MOVV $SYS_clock_gettime, R2
SYSCALL SYSCALL
diff -ru b/src/runtime/sys_linux_mipsx.s a/src/runtime/sys_linux_mipsx.s diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
--- b/src/runtime/sys_linux_mipsx.s 2018-04-30 22:26:39.000000000 +0200 index a6bca3b..920ed9a 100644
+++ a/src/runtime/sys_linux_mipsx.s 2018-05-09 17:09:42.321531721 +0200 --- a/src/runtime/sys_linux_mipsx.s
@@ -202,7 +202,7 @@ +++ b/src/runtime/sys_linux_mipsx.s
@@ -189,7 +189,7 @@
RET RET
TEXT runtime·nanotime(SB),NOSPLIT,$8-8 TEXT runtime·nanotime(SB),NOSPLIT,$8-8
@ -77,10 +121,11 @@ diff -ru b/src/runtime/sys_linux_mipsx.s a/src/runtime/sys_linux_mipsx.s
MOVW $4(R29), R5 MOVW $4(R29), R5
MOVW $SYS_clock_gettime, R2 MOVW $SYS_clock_gettime, R2
SYSCALL SYSCALL
diff -ru b/src/runtime/sys_linux_ppc64x.s a/src/runtime/sys_linux_ppc64x.s diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
--- b/src/runtime/sys_linux_ppc64x.s 2018-04-30 22:26:39.000000000 +0200 index 483cb8e..11f3c49 100644
+++ a/src/runtime/sys_linux_ppc64x.s 2018-05-09 17:09:42.322531710 +0200 --- a/src/runtime/sys_linux_ppc64x.s
@@ -176,7 +176,7 @@ +++ b/src/runtime/sys_linux_ppc64x.s
@@ -164,7 +164,7 @@
RET RET
TEXT runtime·nanotime(SB),NOSPLIT,$16 TEXT runtime·nanotime(SB),NOSPLIT,$16
@ -89,10 +134,11 @@ diff -ru b/src/runtime/sys_linux_ppc64x.s a/src/runtime/sys_linux_ppc64x.s
MOVD $0(R1), R4 MOVD $0(R1), R4
SYSCALL $SYS_clock_gettime SYSCALL $SYS_clock_gettime
MOVD 0(R1), R3 // sec MOVD 0(R1), R3 // sec
diff -ru b/src/runtime/sys_linux_s390x.s a/src/runtime/sys_linux_s390x.s diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
--- b/src/runtime/sys_linux_s390x.s 2018-04-30 22:26:39.000000000 +0200 index 1ff110c..e9049e0 100644
+++ a/src/runtime/sys_linux_s390x.s 2018-05-09 17:09:42.322531710 +0200 --- a/src/runtime/sys_linux_s390x.s
@@ -188,7 +188,7 @@ +++ b/src/runtime/sys_linux_s390x.s
@@ -176,7 +176,7 @@
RET RET
TEXT runtime·nanotime(SB),NOSPLIT,$16 TEXT runtime·nanotime(SB),NOSPLIT,$16