[Buildroot] [git commit] package/go: update patch for go-bootstrap fix
Yann E. MORIN
yann.morin.1998 at free.fr
Sat Jun 4 11:15:05 UTC 2022
commit: https://git.buildroot.net/buildroot/commit/?id=bc3de65655d10d8a4d2d09f37051014c933eacfd
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Add a patch to fix a build failure due to the target GOARCH being used while
bootstrapping the Go compiler with the go-bootstrap compiler.
Uses the host architecture variable instead.
This commit updates the patch with improvements from the upstream PR.
PR: https://github.com/golang/go/pull/52362
Signed-off-by: Christian Stewart <christian at paral.in>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
...trap-set-environment-before-generating-bu.patch | 119 ---------------------
...dist-use-gohostarch-for-ssa-rewrite-check.patch | 95 ++++++++++++++++
2 files changed, 95 insertions(+), 119 deletions(-)
diff --git a/package/go/0002-build-bootstrap-set-environment-before-generating-bu.patch b/package/go/0002-build-bootstrap-set-environment-before-generating-bu.patch
deleted file mode 100644
index 5a6b694857..0000000000
--- a/package/go/0002-build-bootstrap-set-environment-before-generating-bu.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 4d43f7c4dd06e6f62be446996019d4505af54764 Mon Sep 17 00:00:00 2001
-From: Christian Stewart <christian at paral.in>
-Date: Thu, 14 Apr 2022 13:34:26 -0700
-Subject: [PATCH] build: bootstrap: set environment before generating buildcfg
-
-The GOOS and GOARCH environment variables should be unset before calling
-mkbuildcfg. This change fixes a build failure when GOARCH=riscv64.
-
-Building Go toolchain1 using go-1.4-bootstrap-20171003.
-src/cmd/compile/internal/ssa/rewriteRISCV64.go:4814
-invalid operation: y << x (shift count type int64, must be unsigned integer)
-
-There is a build issue with go1.4 with the riscv64 code: however, why is the
-riscv64 code being compiled at all?
-
-GOARCH is set when calling mkbuildcfg, so go1.4 is trying to compile riscv64.
-
-[Buildroot]: submitted to upstream:
-
- - https://github.com/golang/go/issues/52583
- - https://go-review.googlesource.com/c/go/+/400376
- - GitHub-Pull-Request: golang/go#52362
-
-Signed-off-by: Christian Stewart <christian at paral.in>
----
- src/cmd/dist/buildtool.go | 56 ++++++++++++++++++++-------------------
- 1 file changed, 29 insertions(+), 27 deletions(-)
-
-diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
-index f1f3d50b6f..dabf01cf84 100644
---- a/src/cmd/dist/buildtool.go
-+++ b/src/cmd/dist/buildtool.go
-@@ -116,9 +116,6 @@ func bootstrapBuildTools() {
- }
- xprintf("Building Go toolchain1 using %s.\n", goroot_bootstrap)
-
-- mkbuildcfg(pathf("%s/src/internal/buildcfg/zbootstrap.go", goroot))
-- mkobjabi(pathf("%s/src/cmd/internal/objabi/zbootstrap.go", goroot))
--
- // Use $GOROOT/pkg/bootstrap as the bootstrap workspace root.
- // We use a subdirectory of $GOROOT/pkg because that's the
- // space within $GOROOT where we store all generated objects.
-@@ -130,6 +127,34 @@ func bootstrapBuildTools() {
- base := pathf("%s/src/bootstrap", workspace)
- xmkdirall(base)
-
-+ // Set up environment for invoking Go 1.4 go command.
-+ // GOROOT points at Go 1.4 GOROOT,
-+ // GOPATH points at our bootstrap workspace,
-+ // GOBIN is empty, so that binaries are installed to GOPATH/bin,
-+ // and GOOS, GOHOSTOS, GOARCH, and GOHOSTOS are empty,
-+ // so that Go 1.4 builds whatever kind of binary it knows how to build.
-+ // Restore GOROOT, GOPATH, and GOBIN when done.
-+ // Don't bother with GOOS, GOHOSTOS, GOARCH, and GOHOSTARCH,
-+ // because setup will take care of those when bootstrapBuildTools returns.
-+
-+ defer os.Setenv("GOROOT", os.Getenv("GOROOT"))
-+ os.Setenv("GOROOT", goroot_bootstrap)
-+
-+ defer os.Setenv("GOPATH", os.Getenv("GOPATH"))
-+ os.Setenv("GOPATH", workspace)
-+
-+ defer os.Setenv("GOBIN", os.Getenv("GOBIN"))
-+ os.Setenv("GOBIN", "")
-+
-+ os.Setenv("GOOS", "")
-+ os.Setenv("GOHOSTOS", "")
-+ os.Setenv("GOARCH", "")
-+ os.Setenv("GOHOSTARCH", "")
-+
-+ // Create the build config files.
-+ mkbuildcfg(pathf("%s/src/internal/buildcfg/zbootstrap.go", goroot))
-+ mkobjabi(pathf("%s/src/cmd/internal/objabi/zbootstrap.go", goroot))
-+
- // Copy source code into $GOROOT/pkg/bootstrap and rewrite import paths.
- writefile("module bootstrap\n", pathf("%s/%s", base, "go.mod"), 0)
- for _, dir := range bootstrapDirs {
-@@ -176,30 +201,6 @@ func bootstrapBuildTools() {
- })
- }
-
-- // Set up environment for invoking Go 1.4 go command.
-- // GOROOT points at Go 1.4 GOROOT,
-- // GOPATH points at our bootstrap workspace,
-- // GOBIN is empty, so that binaries are installed to GOPATH/bin,
-- // and GOOS, GOHOSTOS, GOARCH, and GOHOSTOS are empty,
-- // so that Go 1.4 builds whatever kind of binary it knows how to build.
-- // Restore GOROOT, GOPATH, and GOBIN when done.
-- // Don't bother with GOOS, GOHOSTOS, GOARCH, and GOHOSTARCH,
-- // because setup will take care of those when bootstrapBuildTools returns.
--
-- defer os.Setenv("GOROOT", os.Getenv("GOROOT"))
-- os.Setenv("GOROOT", goroot_bootstrap)
--
-- defer os.Setenv("GOPATH", os.Getenv("GOPATH"))
-- os.Setenv("GOPATH", workspace)
--
-- defer os.Setenv("GOBIN", os.Getenv("GOBIN"))
-- os.Setenv("GOBIN", "")
--
-- os.Setenv("GOOS", "")
-- os.Setenv("GOHOSTOS", "")
-- os.Setenv("GOARCH", "")
-- os.Setenv("GOHOSTARCH", "")
--
- // Run Go 1.4 to build binaries. Use -gcflags=-l to disable inlining to
- // workaround bugs in Go 1.4's compiler. See discussion thread:
- // https://groups.google.com/d/msg/golang-dev/Ss7mCKsvk8w/Gsq7VYI0AwAJ
-@@ -221,6 +222,7 @@ func bootstrapBuildTools() {
- cmd = append(cmd, "-toolexec="+tool)
- }
- cmd = append(cmd, "bootstrap/cmd/...")
-+
- run(base, ShowOutput|CheckExit, cmd...)
-
- // Copy binaries into tool binary directory.
---
-2.35.1
-
diff --git a/package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch b/package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch
new file mode 100644
index 0000000000..2346208640
--- /dev/null
+++ b/package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch
@@ -0,0 +1,95 @@
+From 38d841a18ab0bcb63554fed6b38012e504599891 Mon Sep 17 00:00:00 2001
+From: Christian Stewart <christian at paral.in>
+Date: Wed, 1 Jun 2022 20:52:12 +0000
+Subject: [PATCH] cmd/dist: use gohostarch for ssa rewrite check
+
+Fix a build failure when bootstrapping the Go compiler with go-bootstrap 1.4
+while the environment contains GOARCH=riscv64.
+
+Building Go toolchain1 using go-1.4-bootstrap-20171003.
+src/cmd/compile/internal/ssa/rewriteRISCV64.go:4814
+invalid operation: y << x (shift count type int64, must be unsigned integer)
+
+This is because:
+
+ - buildtool.go:198: calls bootstrapRewriteFile(src)
+ - bootstrapRewriteFile: buildtool.go:283 calls:
+ - isUnneededSSARewriteFile: checks os.Getenv("GOARCH")
+ - isUnneededSSARewriteFile: returns "", false
+ - bootstrapRewriteFile: calls bootstrapFixImports
+ - boostrapFixImports: generates code go1.4 cannot compile
+
+Instead of checking "GOARCH" in the environment, use the gohostarch variable.
+
+Change-Id: Ie9c190498555c4068461fead6278a62e924062c6
+GitHub-Last-Rev: 300d7a7fea0a67c696970fd271e2ce709674a658
+GitHub-Pull-Request: golang/go#52362
+Reviewed-on: https://go-review.googlesource.com/c/go/+/400376
+Reviewed-by: Bryan Mills <bcmills at google.com>
+TryBot-Result: Gopher Robot <gobot at golang.org>
+Reviewed-by: Dmitri Shuralyov <dmitshur at google.com>
+Auto-Submit: Bryan Mills <bcmills at google.com>
+Run-TryBot: Bryan Mills <bcmills at google.com>
+Reviewed-by: Joel Sing <joel at sing.id.au>
+Run-TryBot: Joel Sing <joel at sing.id.au>
+---
+ src/cmd/dist/buildtool.go | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
+index 036f8c52fa..2d8ace52d8 100644
+--- a/src/cmd/dist/buildtool.go
++++ b/src/cmd/dist/buildtool.go
+@@ -16,7 +16,6 @@ import (
+ "os"
+ "path/filepath"
+ "regexp"
+- "runtime"
+ "strings"
+ )
+
+@@ -239,11 +238,11 @@ var ssaRewriteFileSubstring = filepath.FromSlash("src/cmd/compile/internal/ssa/r
+
+ // isUnneededSSARewriteFile reports whether srcFile is a
+ // src/cmd/compile/internal/ssa/rewriteARCHNAME.go file for an
+-// architecture that isn't for the current runtime.GOARCH.
++// architecture that isn't for the given GOARCH.
+ //
+ // When unneeded is true archCaps is the rewrite base filename without
+ // the "rewrite" prefix or ".go" suffix: AMD64, 386, ARM, ARM64, etc.
+-func isUnneededSSARewriteFile(srcFile string) (archCaps string, unneeded bool) {
++func isUnneededSSARewriteFile(srcFile, goArch string) (archCaps string, unneeded bool) {
+ if !strings.Contains(srcFile, ssaRewriteFileSubstring) {
+ return "", false
+ }
+@@ -258,13 +257,10 @@ func isUnneededSSARewriteFile(srcFile string) (archCaps string, unneeded bool) {
+ archCaps = fileArch
+ fileArch = strings.ToLower(fileArch)
+ fileArch = strings.TrimSuffix(fileArch, "splitload")
+- if fileArch == os.Getenv("GOHOSTARCH") {
++ if fileArch == goArch {
+ return "", false
+ }
+- if fileArch == strings.TrimSuffix(runtime.GOARCH, "le") {
+- return "", false
+- }
+- if fileArch == strings.TrimSuffix(os.Getenv("GOARCH"), "le") {
++ if fileArch == strings.TrimSuffix(goArch, "le") {
+ return "", false
+ }
+ return archCaps, true
+@@ -273,9 +269,9 @@ func isUnneededSSARewriteFile(srcFile string) (archCaps string, unneeded bool) {
+ func bootstrapRewriteFile(srcFile string) string {
+ // During bootstrap, generate dummy rewrite files for
+ // irrelevant architectures. We only need to build a bootstrap
+- // binary that works for the current runtime.GOARCH.
++ // binary that works for the current gohostarch.
+ // This saves 6+ seconds of bootstrap.
+- if archCaps, ok := isUnneededSSARewriteFile(srcFile); ok {
++ if archCaps, ok := isUnneededSSARewriteFile(srcFile, gohostarch); ok {
+ return fmt.Sprintf(`// Code generated by go tool dist; DO NOT EDIT.
+
+ package ssa
+--
+2.35.1
+
More information about the buildroot
mailing list