cmd/compile: update types2.Info.FileVersions API to match go/types

[gostls13.git] / src / cmd / dist / buildtool.go

diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
index 5e026f7bed858aabafccb4c21f34cfb06d4dc30c..3232896f262564f66d0565854eb249fd01e3e0af 100644 (file)
--- a/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@ -31,6 +31,7 @@ import (
 // include all packages within subdirectories as well.
 // These will be imported during bootstrap as bootstrap/name, like bootstrap/math/big.
 var bootstrapDirs = []string{
+       "cmp",
        "cmd/asm",
        "cmd/asm/internal/...",
        "cmd/cgo",
@@ -61,15 +62,23 @@ var bootstrapDirs = []string{
        "debug/pe",
        "go/build/constraint",
        "go/constant",
+       "go/version",
        "internal/abi",
        "internal/coverage",
+       "cmd/internal/cov/covcmd",
        "internal/bisect",
        "internal/buildcfg",
        "internal/goarch",
        "internal/godebugs",
        "internal/goexperiment",
        "internal/goroot",
+       "internal/gover",
        "internal/goversion",
+       // internal/lazyregexp is provided by Go 1.17, which permits it to
+       // be imported by other packages in this list, but is not provided
+       // by the Go 1.17 version of gccgo. It's on this list only to
+       // support gccgo, and can be removed if we require gccgo 14 or later.
+       "internal/lazyregexp",
        "internal/pkgbits",
        "internal/platform",
        "internal/profile",
@@ -80,10 +89,8 @@ var bootstrapDirs = []string{
        "internal/unsafeheader",
        "internal/xcoff",
        "internal/zstd",
-       "math/big",
        "math/bits",
        "sort",
-       "strconv",
 }
 
 // File prefixes that are ignored by go/build anyway, and cause
@@ -126,7 +133,6 @@ func bootstrapBuildTools() {
 
        mkbuildcfg(pathf("%s/src/internal/buildcfg/zbootstrap.go", goroot))
        mkobjabi(pathf("%s/src/cmd/internal/objabi/zbootstrap.go", goroot))
-       mkzosarch("", pathf("%s/src/internal/platform/zosarch.go", goroot))
 
        // Use $GOROOT/pkg/bootstrap as the bootstrap workspace root.
        // We use a subdirectory of $GOROOT/pkg because that's the