From 1bf93c9a6ff7a67e645eeb53b618250e1e4f38fa Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Fri, 15 Sep 2023 04:08:12 +0800
Subject: [PATCH] update from upstream

---
 golang-compiler.mk | 3 ++-
 golang-package.mk  | 3 ++-
 golang-values.mk   | 3 ++-
 golang/Makefile    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/golang-compiler.mk b/golang-compiler.mk
index b4b4762..77a125a 100644
--- a/golang-compiler.mk
+++ b/golang-compiler.mk
@@ -57,9 +57,10 @@ define GoCompiler/Default/Install/Bin
 
 	$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),api)
 
+	$(INSTALL_DATA) -p "$(1)/go.env" "$(2)/lib/go-$(3)/"
 	$(INSTALL_DATA) -p "$(1)/VERSION" "$(2)/lib/go-$(3)/"
 
-	for file in AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE PATENTS README.md SECURITY.md; do \
+	for file in CONTRIBUTING.md LICENSE PATENTS README.md SECURITY.md; do \
 		if [ -f "$(1)/$$$$file" ]; then \
 			$(INSTALL_DATA) -p "$(1)/$$$$file" "$(2)/share/go-$(3)/" ; \
 		fi ; \
diff --git a/golang-package.mk b/golang-package.mk
index 20a9937..a9eef17 100644
--- a/golang-package.mk
+++ b/golang-package.mk
@@ -215,7 +215,8 @@ GO_PKG_BUILD_VARS= \
 	GOPATH="$(GO_PKG_BUILD_DIR)" \
 	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
 	GOMODCACHE="$(GO_MOD_CACHE_DIR)" \
-	GOENV=off
+	GOENV=off \
+	GOTOOLCHAIN=local
 
 GO_PKG_VARS= \
 	$(GO_PKG_TARGET_VARS) \
diff --git a/golang-values.mk b/golang-values.mk
index ef77c8d..990063e 100644
--- a/golang-values.mk
+++ b/golang-values.mk
@@ -28,6 +28,7 @@ unexport \
   GOFLAGS \
   GOOS \
   GOPATH \
+  GOTOOLCHAIN \
   GOROOT \
   GOTMPDIR \
   GOWORK
@@ -215,7 +216,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \
   \
   aix_ppc64 \
   \
-  linux_ppc64le linux_riscv64 linux_s390x
+  linux_loong64 linux_ppc64le linux_riscv64 linux_s390x
 
 # From https://go.dev/src/cmd/go/internal/work/init.go
 go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm),,shared)
diff --git a/golang/Makefile b/golang/Makefile
index 6fbd529..5e3d1d6 100644
--- a/golang/Makefile
+++ b/golang/Makefile
@@ -272,7 +272,7 @@ $(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$(
 PKG_GO_ZBOOTSTRAP_MODS:= \
 	s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \
 	s/defaultGOAMD64 = `[^`]*`/defaultGOAMD64 = `$(or $(GO_AMD64),v1)`/; \
-	s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),5)`/; \
+	s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),7)`/; \
 	s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \
 	s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \
 	s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `$(or $(GO_PPC64),power8)`/;