aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-11-18 21:56:54 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-11-19 17:02:35 +0100
commit5bfba1e1c94c3fbce7fba33cf0749e5f1bb07572 (patch)
treea2ff47fb10be662251f144fc99285d8ae3050447
parentui: re-add systray popup menu tunnel list, but behind submenu if too big (diff)
downloadwireguard-windows-5bfba1e1c94c3fbce7fba33cf0749e5f1bb07572.tar.xz
wireguard-windows-5bfba1e1c94c3fbce7fba33cf0749e5f1bb07572.zip
build: bump golang version to 1.15.5
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--build.bat2
-rw-r--r--go-patches/0001-cmd-link-recognize-arm-header-of-PE-objects.patch4
-rw-r--r--go-patches/0002-cmd-link-deal-with-ADDR32NB-relocations-the-same-way.patch4
-rw-r--r--go-patches/0003-cmd-link-ignore-SEH-marking-on-PE-objects.patch4
-rw-r--r--go-patches/0004-cmd-link-do-not-mark-resource-section-as-writable.patch4
-rw-r--r--go-patches/0005-cmd-link-handle-grouped-resource-sections.patch4
-rw-r--r--go-patches/0006-Revert-release-branch.go1.15-runtime-detect-services.patch (renamed from go-patches/0007-Revert-release-branch.go1.15-runtime-detect-services.patch)18
-rw-r--r--go-patches/0007-runtime-do-not-explicitly-exit-on-ctrl-handler.patch (renamed from go-patches/0008-runtime-do-not-explicitly-exit-on-ctrl-handler.patch)8
-rw-r--r--go-patches/0008-runtime-allow-callback-functions-with-up-to-8-argume.patch (renamed from go-patches/0009-runtime-allow-callback-functions-with-up-to-8-argume.patch)6
9 files changed, 27 insertions, 27 deletions
diff --git a/build.bat b/build.bat
index 8f4024d5..7cc51f08 100644
--- a/build.bat
+++ b/build.bat
@@ -13,7 +13,7 @@ if exist .deps\prepared goto :render
rmdir /s /q .deps 2> NUL
mkdir .deps || goto :error
cd .deps || goto :error
- call :download go.zip https://dl.google.com/go/go1.15.4.windows-amd64.zip 3593204e3851be577e4209900ece031b36f1e9ce1671f3f3221c9af7a090a941 || goto :error
+ call :download go.zip https://dl.google.com/go/go1.15.5.windows-amd64.zip 1d24be3a200201a74be25e4134fbec467750e834e84e9c7789a9fc13248c5507 || goto :error
rem Mirror of https://github.com/mstorsjo/llvm-mingw/releases/download/20201020/llvm-mingw-20201020-msvcrt-x86_64.zip
call :download llvm-mingw-msvcrt.zip https://download.wireguard.com/windows-toolchain/distfiles/llvm-mingw-20201020-msvcrt-x86_64.zip 2e46593245090df96d15e360e092f0b62b97e93866e0162dca7f93b16722b844 || goto :error
rem Mirror of https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-portable-Q16-x64.zip
diff --git a/go-patches/0001-cmd-link-recognize-arm-header-of-PE-objects.patch b/go-patches/0001-cmd-link-recognize-arm-header-of-PE-objects.patch
index 8a1df6b6..e534d603 100644
--- a/go-patches/0001-cmd-link-recognize-arm-header-of-PE-objects.patch
+++ b/go-patches/0001-cmd-link-recognize-arm-header-of-PE-objects.patch
@@ -1,7 +1,7 @@
-From 2b3975549a043f66ad1580b0330c2bf47916f042 Mon Sep 17 00:00:00 2001
+From fde4a13eb5eba28ac546b10752b38a80f389cc5a Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 8 Nov 2020 02:48:09 +0100
-Subject: [PATCH 1/9] cmd/link: recognize arm header of PE objects
+Subject: [PATCH 1/8] cmd/link: recognize arm header of PE objects
The linker recognizes headers for 386 and amd64 PE objects, but not arm
objects. This is easily overlooked, since its the same as the 386 header
diff --git a/go-patches/0002-cmd-link-deal-with-ADDR32NB-relocations-the-same-way.patch b/go-patches/0002-cmd-link-deal-with-ADDR32NB-relocations-the-same-way.patch
index 97764070..d47b079d 100644
--- a/go-patches/0002-cmd-link-deal-with-ADDR32NB-relocations-the-same-way.patch
+++ b/go-patches/0002-cmd-link-deal-with-ADDR32NB-relocations-the-same-way.patch
@@ -1,7 +1,7 @@
-From b82dc55e45ee47e0df9604593c34d41654db45c8 Mon Sep 17 00:00:00 2001
+From a0a59fc25f4d8aef3c7bce38c84f04c504745f0e Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 8 Nov 2020 03:09:42 +0100
-Subject: [PATCH 2/9] cmd/link: deal with ADDR32NB relocations the same way as
+Subject: [PATCH 2/8] cmd/link: deal with ADDR32NB relocations the same way as
ADDR32 on arm
As far as I can tell, the addend is the same for both of these, and in
diff --git a/go-patches/0003-cmd-link-ignore-SEH-marking-on-PE-objects.patch b/go-patches/0003-cmd-link-ignore-SEH-marking-on-PE-objects.patch
index 39102b65..4bc72361 100644
--- a/go-patches/0003-cmd-link-ignore-SEH-marking-on-PE-objects.patch
+++ b/go-patches/0003-cmd-link-ignore-SEH-marking-on-PE-objects.patch
@@ -1,7 +1,7 @@
-From b3b6bbb7094e9d1f8c73a13bdf2461dea5072265 Mon Sep 17 00:00:00 2001
+From e8142ab5e3b3a513683a8e3792e6197644547981 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 8 Nov 2020 03:20:36 +0100
-Subject: [PATCH 3/9] cmd/link: ignore SEH marking on PE objects
+Subject: [PATCH 3/8] cmd/link: ignore SEH marking on PE objects
Microsoft's linker looks at whether all input objects have an empty
section called @feat.00. If all of them do, then it enables SEH;
diff --git a/go-patches/0004-cmd-link-do-not-mark-resource-section-as-writable.patch b/go-patches/0004-cmd-link-do-not-mark-resource-section-as-writable.patch
index 925fd8cd..7ecf78af 100644
--- a/go-patches/0004-cmd-link-do-not-mark-resource-section-as-writable.patch
+++ b/go-patches/0004-cmd-link-do-not-mark-resource-section-as-writable.patch
@@ -1,7 +1,7 @@
-From 3d9d47826907f8836cf4f364e45b8e2580dbc470 Mon Sep 17 00:00:00 2001
+From 8255e115f325a58fd4746741f9f35c2f54d70d63 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 8 Nov 2020 11:11:27 +0100
-Subject: [PATCH 4/9] cmd/link: do not mark resource section as writable
+Subject: [PATCH 4/8] cmd/link: do not mark resource section as writable
Resources are immutable, and all other linkers set this section to be
read-only and not read-write. Fix this oversight by rmoving the writable
diff --git a/go-patches/0005-cmd-link-handle-grouped-resource-sections.patch b/go-patches/0005-cmd-link-handle-grouped-resource-sections.patch
index 6a2e3e7e..787eb408 100644
--- a/go-patches/0005-cmd-link-handle-grouped-resource-sections.patch
+++ b/go-patches/0005-cmd-link-handle-grouped-resource-sections.patch
@@ -1,7 +1,7 @@
-From 98ed6f945dbc81a238d079353cab576941f7bb79 Mon Sep 17 00:00:00 2001
+From 5d5d74f35dd3375cda8ef2ba8257547aad107ecb Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 8 Nov 2020 11:57:42 +0100
-Subject: [PATCH 5/9] cmd/link: handle grouped resource sections
+Subject: [PATCH 5/8] cmd/link: handle grouped resource sections
The Go PE linker does not support enough generalized PE logic to
properly handle .rsrc sections gracefully. Instead a few things are
diff --git a/go-patches/0007-Revert-release-branch.go1.15-runtime-detect-services.patch b/go-patches/0006-Revert-release-branch.go1.15-runtime-detect-services.patch
index 3077a41b..933a8a36 100644
--- a/go-patches/0007-Revert-release-branch.go1.15-runtime-detect-services.patch
+++ b/go-patches/0006-Revert-release-branch.go1.15-runtime-detect-services.patch
@@ -1,7 +1,7 @@
-From 82dfc8240f58880ec59a98ed9403d9997571573a Mon Sep 17 00:00:00 2001
+From e6b4c1b3beb4f843ed40abead27c8132d29a0db8 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 11 Sep 2020 13:04:11 +0200
-Subject: [PATCH 7/9] Revert "[release-branch.go1.15] runtime: detect services
+Subject: [PATCH 6/8] Revert "[release-branch.go1.15] runtime: detect services
in signal handler"
This reverts commit b1253d24e159129c778377c3a2a0bde15904a417.
@@ -10,10 +10,10 @@ This reverts commit b1253d24e159129c778377c3a2a0bde15904a417.
1 file changed, 4 insertions(+), 69 deletions(-)
diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
-index 9aadd993f2..125bf0b225 100644
+index 769197db46..a584ada702 100644
--- a/src/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
-@@ -37,10 +37,7 @@ const (
+@@ -36,10 +36,7 @@ const (
//go:cgo_import_dynamic runtime._SetThreadContext SetThreadContext%2 "kernel32.dll"
//go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll"
//go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll"
@@ -24,7 +24,7 @@ index 9aadd993f2..125bf0b225 100644
//go:cgo_import_dynamic runtime._ResumeThread ResumeThread%1 "kernel32.dll"
//go:cgo_import_dynamic runtime._SetConsoleCtrlHandler SetConsoleCtrlHandler%2 "kernel32.dll"
//go:cgo_import_dynamic runtime._SetErrorMode SetErrorMode%1 "kernel32.dll"
-@@ -89,10 +86,7 @@ var (
+@@ -87,10 +84,7 @@ var (
_SetThreadContext,
_LoadLibraryW,
_LoadLibraryA,
@@ -35,7 +35,7 @@ index 9aadd993f2..125bf0b225 100644
_QueryPerformanceCounter,
_QueryPerformanceFrequency,
_ResumeThread,
-@@ -136,8 +130,7 @@ var (
+@@ -134,8 +128,7 @@ var (
// Load ntdll.dll manually during startup, otherwise Mingw
// links wrong printf function to cgo executable (see issue
// 12030 for details).
@@ -45,7 +45,7 @@ index 9aadd993f2..125bf0b225 100644
// These are from non-kernel32.dll, so we prefer to LoadLibraryEx them.
_timeBeginPeriod,
-@@ -266,7 +259,6 @@ func loadOptionalSyscalls() {
+@@ -262,7 +255,6 @@ func loadOptionalSyscalls() {
throw("ntdll.dll not found")
}
_NtWaitForSingleObject = windowsFindfunc(n32, []byte("NtWaitForSingleObject\000"))
@@ -53,7 +53,7 @@ index 9aadd993f2..125bf0b225 100644
if GOARCH == "arm" {
_QueryPerformanceCounter = windowsFindfunc(k32, []byte("QueryPerformanceCounter\000"))
-@@ -1061,63 +1053,6 @@ func usleep(us uint32) {
+@@ -1003,63 +995,6 @@ func usleep(us uint32) {
onosstack(usleep2Addr, 10*us)
}
@@ -117,7 +117,7 @@ index 9aadd993f2..125bf0b225 100644
func ctrlhandler1(_type uint32) uint32 {
var s uint32
-@@ -1133,9 +1068,9 @@ func ctrlhandler1(_type uint32) uint32 {
+@@ -1075,9 +1010,9 @@ func ctrlhandler1(_type uint32) uint32 {
if sigsend(s) {
return 1
}
diff --git a/go-patches/0008-runtime-do-not-explicitly-exit-on-ctrl-handler.patch b/go-patches/0007-runtime-do-not-explicitly-exit-on-ctrl-handler.patch
index a937b11e..038f5d8e 100644
--- a/go-patches/0008-runtime-do-not-explicitly-exit-on-ctrl-handler.patch
+++ b/go-patches/0007-runtime-do-not-explicitly-exit-on-ctrl-handler.patch
@@ -1,7 +1,7 @@
-From a9e2ff1fa414106c130907ac993600bd3adcd6cd Mon Sep 17 00:00:00 2001
+From af4eb34d920c0c727041ebf587e0de608068ed59 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 14 Jul 2020 01:41:03 -0600
-Subject: [PATCH 8/9] runtime: do not explicitly exit on ctrl handler
+Subject: [PATCH 7/8] runtime: do not explicitly exit on ctrl handler
The default ctrl+c handler should process exits in situations where it
makes sense, like console apps, but not in situations where it doesn't,
@@ -29,10 +29,10 @@ Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
1 file changed, 5 deletions(-)
diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
-index 125bf0b225..46f4a23e5b 100644
+index a584ada702..a62e941229 100644
--- a/src/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
-@@ -1068,11 +1068,6 @@ func ctrlhandler1(_type uint32) uint32 {
+@@ -1010,11 +1010,6 @@ func ctrlhandler1(_type uint32) uint32 {
if sigsend(s) {
return 1
}
diff --git a/go-patches/0009-runtime-allow-callback-functions-with-up-to-8-argume.patch b/go-patches/0008-runtime-allow-callback-functions-with-up-to-8-argume.patch
index 20e835dc..48188173 100644
--- a/go-patches/0009-runtime-allow-callback-functions-with-up-to-8-argume.patch
+++ b/go-patches/0008-runtime-allow-callback-functions-with-up-to-8-argume.patch
@@ -1,7 +1,7 @@
-From f85bc709bd30286a310a6a98d4ab42cbadd94315 Mon Sep 17 00:00:00 2001
+From 5a7c808cbacb8c0477395c5656c1eba3ef38cd6e Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 10 Nov 2020 21:42:36 +0100
-Subject: [PATCH 9/9] runtime: allow callback functions with up to 8 arguments
+Subject: [PATCH 8/8] runtime: allow callback functions with up to 8 arguments
on windows/arm
Previously, windows/arm programs would abort when trying to use
@@ -15,7 +15,7 @@ Change-Id: I15a6a3168237fd8bb1128cc2c11ff2d900d665d2
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/runtime/sys_windows_arm.s b/src/runtime/sys_windows_arm.s
-index e6c61a4e42..7bfeb7614f 100644
+index 256b5ff7f0..049c69ec88 100644
--- a/src/runtime/sys_windows_arm.s
+++ b/src/runtime/sys_windows_arm.s
@@ -315,10 +315,14 @@ GLOBL runtime·cbctxts(SB), NOPTR, $4