[Buildroot] [PATCH v5 3/4] package/go: bump to version 1.20.4
Christian Stewart
christian at aperture.us
Wed May 3 02:23:02 UTC 2023
The latest Go release, version 1.20, arrives six months after Go 1.19. Most of
its changes are in the implementation of the toolchain, runtime, and libraries.
https://go.dev/doc/go1.20
https://go.dev/doc/devel/release#go1.20.4
https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved
Signed-off-by: Christian Stewart <christian at aperture.us>
---
v1 -> v2:
- drop unnecessary change to config.in.host
v2 -> v3:
- bump to go 1.20.1
- add note about fixed cves
v3 -> v4:
- rebase on updated go1.19.x version
- remove notes about cves (fixed in previous 1.19.x version)
- update to go 1.20.2
v4 -> v5:
- security update to go 1.20.4
Signed-off-by: Christian Stewart <christian at aperture.us>
---
...03-runtime-support-riscv64-SV57-mode.patch | 65 -------------------
package/go/go.hash | 2 +-
package/go/go.mk | 4 +-
3 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 package/go/0003-runtime-support-riscv64-SV57-mode.patch
diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch
deleted file mode 100644
index f51c2ca093..0000000000
--- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001
-From: Dmitry Vyukov <dvyukov at google.com>
-Date: Fri, 27 May 2022 18:55:35 +0200
-Subject: [PATCH] runtime: support riscv64 SV57 mode
-
-Riscv64 has SV57 mode when user-space VA is 56 bits.
-Linux kernel recently got support for this mode and Go binaries started crashing as:
-
-runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1
-packed=0xffff5908a9400001 -> node=0xffff5908a940
-
-Adjust lfstack code to use only 8 top bits of pointers on riscv64.
-
-For context see:
-https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ
-
-Update #54104
-
-Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25
-Signed-off-by: Christian Stewart <christian at paral.in>
----
-
-Upstream: https://go-review.googlesource.com/c/go/+/409055/4
----
- src/runtime/lfstack_64bit.go | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go
-index 154130cf63..39fa647b9e 100644
---- a/src/runtime/lfstack_64bit.go
-+++ b/src/runtime/lfstack_64bit.go
-@@ -36,12 +36,21 @@ const (
- // We use one bit to distinguish between the two ranges.
- aixAddrBits = 57
- aixCntBits = 64 - aixAddrBits + 3
-+
-+ // Riscv64 SV57 mode gives 56 bits of userspace VA.
-+ // lfstack code supports it, but broader support for SV57 mode is incomplete,
-+ // and there may be other issues (see #54104).
-+ riscv64AddrBits = 56
-+ riscv64CntBits = 64 - riscv64AddrBits + 3
- )
-
- func lfstackPack(node *lfnode, cnt uintptr) uint64 {
- if GOARCH == "ppc64" && GOOS == "aix" {
- return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<<aixCntBits-1))
- }
-+ if GOARCH == "riscv64" {
-+ return uint64(uintptr(unsafe.Pointer(node)))<<(64-riscv64AddrBits) | uint64(cnt&(1<<riscv64CntBits-1))
-+ }
- return uint64(uintptr(unsafe.Pointer(node)))<<(64-addrBits) | uint64(cnt&(1<<cntBits-1))
- }
-
-@@ -54,5 +63,8 @@ func lfstackUnpack(val uint64) *lfnode {
- if GOARCH == "ppc64" && GOOS == "aix" {
- return (*lfnode)(unsafe.Pointer(uintptr((val >> aixCntBits << 3) | 0xa<<56)))
- }
-+ if GOARCH == "riscv64" {
-+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3)))
-+ }
- return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3)))
- }
---
-2.35.1
-
diff --git a/package/go/go.hash b/package/go/go.hash
index 5488ed9710..3167ccc523 100644
--- a/package/go/go.hash
+++ b/package/go/go.hash
@@ -1,3 +1,3 @@
# From https://go.dev/dl
-sha256 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f go1.19.8.src.tar.gz
+sha256 9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6 go1.20.4.src.tar.gz
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE
diff --git a/package/go/go.mk b/package/go/go.mk
index c8ad1a8dc6..c1c088a81d 100644
--- a/package/go/go.mk
+++ b/package/go/go.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GO_VERSION = 1.19.8
+GO_VERSION = 1.20.4
GO_SITE = https://storage.googleapis.com/golang
GO_SOURCE = go$(GO_VERSION).src.tar.gz
@@ -151,7 +151,7 @@ define HOST_GO_INSTALL_CMDS
cp -a $(@D)/lib $(HOST_GO_ROOT)/
mkdir -p $(HOST_GO_ROOT)/pkg
- cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/
+ cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/
cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/
# The Go sources must be installed to the host/ tree for the Go stdlib.
--
2.40.1
More information about the buildroot
mailing list