Skip to content

Update submodule to latest master in microsoft/main #2678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bot-for-go merged 2 commits into from
Oct 30, 2026
Merged

Update submodule to latest master in microsoft/main #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d993769
Update submodule to latest master (9c8f4b0a): cmd/internal/obj/wasm: …
bot-for-go[bot] Oct 30, 2026
45ce9a4
resolve 3-way merge conflicts
gdams Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go
Open in desktop
Submodule go updated 148 files
41 changes: 23 additions & 18 deletions patches/0002-Add-crypto-backends.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ index 522140f02cb5b4b7d850da43b63701c2c6298420..72193f056298941739753ba5e3d8d98a
"internal/types/errors",
"internal/unsafeheader",
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 534f48a10d863179cb1db26337ecc244719ebb1a..dbe5f8cb7c2e676e0cc63f9888c7072927b6791c 100644
index 1d3868f993bfde8625146cd8f6b36e9d165f3f6e..bfdcd2bd9979766bd4f4d5fc05592926a71162ff 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -160,10 +160,12 @@ func (t *tester) run() {
@@ -163,11 +163,13 @@ func (t *tester) run() {
}
}

Expand All @@ -307,25 +307,30 @@ index 534f48a10d863179cb1db26337ecc244719ebb1a..dbe5f8cb7c2e676e0cc63f9888c70729
if t.rebuild {
t.out("Building packages and commands.")
// Force rebuild the whole toolchain.
- goInstall(toolenv(), gorootBinGo, append([]string{"-a"}, toolchain...)...)
+ goInstall(toolenv(), gorootBinGo, append([]string{"-a"}, append(tags, toolchain...)...)...)
rebuildSpan := startSpan("rebuild toolchain")
- goInstall(toolenv(), gorootBinGo, append(append(maybeTraceFlag("rebuildToolchain"), "-a"), toolchain...)...)
+ goInstall(toolenv(), gorootBinGo, slices.Concat(append(maybeTraceFlag("rebuildToolchain"), "-a"), tags, toolchain)...)
rebuildSpan.done()
}

if !t.listMode {
@@ -180,9 +182,9 @@ func (t *tester) run() {
// and virtualization we usually start with a clean GOCACHE, so we would
@@ -186,13 +188,13 @@ func (t *tester) run() {
// end up rebuilding large parts of the standard library that aren't
// otherwise relevant to the actual set of packages under test.
- goInstall(toolenv(), gorootBinGo, toolchain...)
- goInstall(toolenv(), gorootBinGo, toolchain...)
- goInstall(toolenv(), gorootBinGo, toolsToInstall...)
+ goInstall(toolenv(), gorootBinGo, append(tags, toolchain...)...)
+ goInstall(toolenv(), gorootBinGo, append(tags, toolchain...)...)
+ goInstall(toolenv(), gorootBinGo, append(tags, "cmd")...)
toolchain1Span := startSpan("toolchain1")
- goInstall(toolenv(), gorootBinGo, append(maybeTraceFlag("toolchain1"), toolchain...)...)
+ goInstall(toolenv(), gorootBinGo, slices.Concat(maybeTraceFlag("toolchain1"), tags, toolchain)...)
toolchain1Span.done()
toolchain2Span := startSpan("toolchain2")
- goInstall(toolenv(), gorootBinGo, append(maybeTraceFlag("toolchain2"), toolchain...)...)
+ goInstall(toolenv(), gorootBinGo, slices.Concat(maybeTraceFlag("toolchain2"), tags, toolchain)...)
toolchain2Span.done()
toolsSpan := startSpan("tools")
- goInstall(toolenv(), gorootBinGo, append(maybeTraceFlag("tools"), toolsToInstall...)...)
+ goInstall(toolenv(), gorootBinGo, slices.Concat(maybeTraceFlag("tools"), tags, toolsToInstall)...)
toolsSpan.done()
}
}

@@ -706,7 +708,7 @@ func (t *tester) registerTests() {
@@ -729,7 +731,7 @@ func (t *tester) registerTests() {
})

// Check that all crypto packages compile (and test correctly, in longmode) with fips.
Expand All @@ -334,7 +339,7 @@ index 534f48a10d863179cb1db26337ecc244719ebb1a..dbe5f8cb7c2e676e0cc63f9888c70729
// Test standard crypto packages with fips140=on.
t.registerTest("GOFIPS140=latest go test crypto/...", &goTest{
variant: "gofips140",
@@ -770,7 +772,9 @@ func (t *tester) registerTests() {
@@ -793,7 +795,9 @@ func (t *tester) registerTests() {
}

// Test ios/amd64 for the iOS simulator.
Expand All @@ -345,7 +350,7 @@ index 534f48a10d863179cb1db26337ecc244719ebb1a..dbe5f8cb7c2e676e0cc63f9888c70729
t.registerTest("GOOS=ios on darwin/amd64",
&goTest{
variant: "amd64ios",
@@ -1334,12 +1338,11 @@ func (t *tester) registerCgoTests(heading string) {
@@ -1357,12 +1361,11 @@ func (t *tester) registerCgoTests(heading string) {
// a C linker warning on Linux.
// in function `bio_ip_and_port_to_socket_and_addr':
// warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
Expand All @@ -359,7 +364,7 @@ index 534f48a10d863179cb1db26337ecc244719ebb1a..dbe5f8cb7c2e676e0cc63f9888c70729
// Static linking tests
if goos != "android" && p != "netbsd/arm" && !t.msan && !t.asan {
// TODO(#56629): Why does this fail on netbsd-arm?
@@ -1844,3 +1847,26 @@ func goexperiments(exps ...string) string {
@@ -1874,3 +1877,26 @@ func goexperiments(exps ...string) string {
return existing + strings.Join(exps, ",")

}
Expand Down
Loading
Loading