qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 16:57:14 -07:00
Code Releases Activity

runtime: move sys.DefaultGoroot to runtime.defaultGOROOT

Browse Source 
The default GOROOT has nothing to do with system details.
Move it next to its one use in package runtime.

This CL is part of a stack adding windows/arm64
support (#36439), intended to land in the Go 1.17 cycle.
This CL is, however, not windows/arm64-specific.
It is cleanup meant to make the port (and future ports) easier.

Change-Id: I1a601fad6335336b4616b834bb21bd8437ee1313
Reviewed-on: https://go-review.googlesource.com/c/go/+/288796
Trust: Russ Cox <rsc@golang.org>
Trust: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Russ Cox 2021-01-27 10:47:38 -05:00
parent 8ac23a1f15
commit a78879ac67
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/link/internal/ld/main.go
View File

@ -116,7 +116,7 @@ func Main(arch *sys.Arch, theArch Arch) {
} }
final := gorootFinal() final := gorootFinal()
addstrdata1(ctxt, "runtime/internal/sys.DefaultGoroot="+final) addstrdata1(ctxt, "runtime.defaultGOROOT="+final)
addstrdata1(ctxt, "cmd/internal/objabi.defaultGOROOT="+final) addstrdata1(ctxt, "cmd/internal/objabi.defaultGOROOT="+final)
// TODO(matloob): define these above and then check flag values here // TODO(matloob): define these above and then check flag values here

4
src/runtime/extern.go
View File

@ -229,6 +229,8 @@ func Callers(skip int, pc []uintptr) int {
return callers(skip, pc) return callers(skip, pc)
} }
var defaultGOROOT string // set by cmd/link
// GOROOT returns the root of the Go tree. It uses the // GOROOT returns the root of the Go tree. It uses the
// GOROOT environment variable, if set at process start, // GOROOT environment variable, if set at process start,
// or else the root used during the Go build. // or else the root used during the Go build.
@ -237,7 +239,7 @@ func GOROOT() string {
if s != "" { if s != "" {
return s return s
} }
return sys.DefaultGoroot return defaultGOROOT
} }
// Version returns the Go tree's version string. // Version returns the Go tree's version string.

4
src/runtime/internal/sys/arch.go
View File

@ -52,7 +52,3 @@ const MinFrameSize = _MinFrameSize
// StackAlign is the required alignment of the SP register. // StackAlign is the required alignment of the SP register.
// The stack must be at least word aligned, but some architectures require more. // The stack must be at least word aligned, but some architectures require more.
const StackAlign = _StackAlign const StackAlign = _StackAlign
// DefaultGoroot is set by the linker for use by package runtime.
// It doesn't really belong in this file or this package.
var DefaultGoroot string