Skip to content

Commit 226293d

Browse files
Merge pull request #1896 from microsoft/dev/auto-sync/microsoft/release-branch.go1.25
Update submodule to latest `release-branch.go1.25` in `microsoft/release-branch.go1.25`
2 parents 0cc1b27 + f1dd51e commit 226293d

File tree

6 files changed

+79
-43
lines changed

6 files changed

+79
-43
lines changed

MICROSOFT_REVISION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
go1.25.1
1+
go1.25.2

go

Submodule go updated 72 files

patches/0001-Vendor-external-dependencies.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,10 +1945,10 @@ index 410eb8648a710a..3ffe43e5bf0008 100644
19451945
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
19461946
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
19471947
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
1948-
index 6d92542e31b652..9b7613a62b5a31 100644
1948+
index 641d1a325a5c07..9bfef9e125e8d3 100644
19491949
--- a/src/go/build/deps_test.go
19501950
+++ b/src/go/build/deps_test.go
1951-
@@ -519,6 +519,24 @@ var depsRules = `
1951+
@@ -521,6 +521,24 @@ var depsRules = `
19521952
< crypto/internal/fips140/rsa
19531953
< FIPS < crypto/fips140;
19541954

@@ -1973,7 +1973,7 @@ index 6d92542e31b652..9b7613a62b5a31 100644
19731973
crypto !< FIPS;
19741974

19751975
# CRYPTO is core crypto algorithms - no cgo, fmt, net.
1976-
@@ -530,13 +548,12 @@ var depsRules = `
1976+
@@ -532,13 +550,12 @@ var depsRules = `
19771977
FIPS, internal/godebug, embed,
19781978
crypto/internal/boring/sig,
19791979
crypto/internal/boring/syso,
@@ -1991,18 +1991,18 @@ index 6d92542e31b652..9b7613a62b5a31 100644
19911991
< crypto/internal/boring
19921992
< crypto/boring
19931993
< crypto/aes,
1994-
@@ -557,6 +574,10 @@ var depsRules = `
1994+
@@ -559,6 +576,10 @@ var depsRules = `
19951995

19961996
# CRYPTO-MATH is crypto that exposes math/big APIs - no cgo, net; fmt now ok.
19971997

19981998
+ math/big, github.com/golang-fips/openssl/v2 < github.com/golang-fips/openssl/v2/bbig;
19991999
+ math/big, github.com/microsoft/go-crypto-darwin/xcrypto < github.com/microsoft/go-crypto-darwin/bbig;
20002000
+ math/big, github.com/microsoft/go-crypto-winnative/cng < github.com/microsoft/go-crypto-winnative/cng/bbig;
20012001
+
2002-
CRYPTO, FMT, math/big
2002+
CRYPTO, FMT, math/big, internal/saferio
20032003
< crypto/internal/boring/bbig
20042004
< crypto/internal/fips140cache
2005-
@@ -866,7 +887,7 @@ var buildIgnore = []byte("\n//go:build ignore")
2005+
@@ -868,7 +889,7 @@ var buildIgnore = []byte("\n//go:build ignore")
20062006

20072007
func findImports(pkg string) ([]string, error) {
20082008
vpkg := pkg
@@ -2011,7 +2011,7 @@ index 6d92542e31b652..9b7613a62b5a31 100644
20112011
vpkg = "vendor/" + pkg
20122012
}
20132013
dir := filepath.Join(Default.GOROOT, "src", vpkg)
2014-
@@ -876,7 +897,7 @@ func findImports(pkg string) ([]string, error) {
2014+
@@ -878,7 +899,7 @@ func findImports(pkg string) ([]string, error) {
20152015
}
20162016
var imports []string
20172017
var haveImport = map[string]bool{}

patches/0003-Implement-crypto-internal-backend.patch

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ desired goexperiments and build tags.
5555
src/internal/buildcfg/exp.go | 54 +++
5656
src/runtime/runtime_boring.go | 5 +
5757
src/syscall/exec_linux_test.go | 2 +-
58-
46 files changed, 2318 insertions(+), 22 deletions(-)
58+
46 files changed, 2317 insertions(+), 23 deletions(-)
5959
create mode 100644 src/cmd/go/systemcrypto_test.go
6060
create mode 100644 src/crypto/internal/backend/backend_test.go
6161
create mode 100644 src/crypto/internal/backend/bbig/big.go
@@ -160,7 +160,7 @@ index 0e32e0769ee2e2..eda2d576acc6c6 100644
160160
if doReplacement {
161161
if testCompiler == "" {
162162
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
163-
index 9a7951726f6f04..a09cdd9550cbab 100644
163+
index 024050c2dd70c4..f91bf0a7c4ad1c 100644
164164
--- a/src/cmd/dist/build.go
165165
+++ b/src/cmd/dist/build.go
166166
@@ -1387,6 +1387,80 @@ func toolenv() []string {
@@ -261,7 +261,7 @@ index 9a7951726f6f04..a09cdd9550cbab 100644
261261
if debug {
262262
run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
263263
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
264-
index 1e74438f48db39..6c31b623897048 100644
264+
index aa09d1eba34be8..c6926516f485f4 100644
265265
--- a/src/cmd/dist/test.go
266266
+++ b/src/cmd/dist/test.go
267267
@@ -156,10 +156,12 @@ func (t *tester) run() {
@@ -291,7 +291,7 @@ index 1e74438f48db39..6c31b623897048 100644
291291
}
292292
}
293293

294-
@@ -750,11 +752,18 @@ func (t *tester) registerTests() {
294+
@@ -749,11 +751,18 @@ func (t *tester) registerTests() {
295295
variant: "jsonv2",
296296
env: []string{"GOEXPERIMENT=jsonv2"},
297297
pkg: "encoding/json/...",
@@ -311,7 +311,7 @@ index 1e74438f48db39..6c31b623897048 100644
311311
t.registerTest("GOOS=ios on darwin/amd64",
312312
&goTest{
313313
variant: "amd64ios",
314-
@@ -864,14 +873,21 @@ func (t *tester) registerTests() {
314+
@@ -863,14 +872,21 @@ func (t *tester) registerTests() {
315315

316316
// Test internal linking of PIE binaries where it is supported.
317317
if t.internalLinkPIE() && !disablePIE {
@@ -334,7 +334,7 @@ index 1e74438f48db39..6c31b623897048 100644
334334
})
335335
t.registerTest("internal linking, -buildmode=pie",
336336
&goTest{
337-
@@ -879,9 +895,10 @@ func (t *tester) registerTests() {
337+
@@ -878,9 +894,10 @@ func (t *tester) registerTests() {
338338
timeout: 60 * time.Second,
339339
buildmode: "pie",
340340
ldflags: "-linkmode=internal",
@@ -346,7 +346,7 @@ index 1e74438f48db39..6c31b623897048 100644
346346
})
347347
// Also test a cgo package.
348348
if t.cgoEnabled && t.internalLink() && !disablePIE {
349-
@@ -898,15 +915,22 @@ func (t *tester) registerTests() {
349+
@@ -897,15 +914,22 @@ func (t *tester) registerTests() {
350350

351351
if t.extLink() && !t.compileOnly {
352352
if goos != "android" { // Android does not support non-PIE linking
@@ -370,7 +370,7 @@ index 1e74438f48db39..6c31b623897048 100644
370370
})
371371
}
372372
if t.externalLinkPIE() && !disablePIE {
373-
@@ -985,7 +1009,9 @@ func (t *tester) registerTests() {
373+
@@ -984,7 +1008,9 @@ func (t *tester) registerTests() {
374374
t.registerRaceTests()
375375
}
376376

@@ -382,18 +382,18 @@ index 1e74438f48db39..6c31b623897048 100644
382382
// where they get distributed to multiple machines.
383383
// See issues 20141 and 31834.
384384
diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
385-
index e4ee9bd1e8d2ec..3bdb6b4d31fe46 100644
385+
index 3e691abe41f702..b799031d598892 100644
386386
--- a/src/cmd/go/go_test.go
387387
+++ b/src/cmd/go/go_test.go
388-
@@ -13,6 +13,7 @@ import (
388+
@@ -14,6 +14,7 @@ import (
389389
"fmt"
390390
"go/format"
391391
"internal/godebug"
392392
+ "internal/goexperiment"
393393
"internal/platform"
394394
"internal/testenv"
395395
"io"
396-
@@ -110,6 +111,13 @@ func TestMain(m *testing.M) {
396+
@@ -111,6 +112,13 @@ func TestMain(m *testing.M) {
397397
if v := os.Getenv("TESTGO_TOOLCHAIN_VERSION"); v != "" {
398398
work.ToolchainVersion = v
399399
}
@@ -407,7 +407,7 @@ index e4ee9bd1e8d2ec..3bdb6b4d31fe46 100644
407407

408408
if testGOROOT := os.Getenv("TESTGO_GOROOT"); testGOROOT != "" {
409409
// Disallow installs to the GOROOT from which testgo was built.
410-
@@ -1860,6 +1868,9 @@ func TestGenerateUsesBuildContext(t *testing.T) {
410+
@@ -1861,6 +1869,9 @@ func TestGenerateUsesBuildContext(t *testing.T) {
411411
}
412412

413413
func TestGoEnv(t *testing.T) {
@@ -677,7 +677,7 @@ index 2f46a6b44bffe1..69071289e2de81 100644
677677

678678
! go build -o $devnull cmd/buildid
679679
diff --git a/src/cmd/internal/testdir/testdir_test.go b/src/cmd/internal/testdir/testdir_test.go
680-
index c5aa91ba4732e7..9e838fa785af46 100644
680+
index 483a9ec33c6798..fad922e3f844ab 100644
681681
--- a/src/cmd/internal/testdir/testdir_test.go
682682
+++ b/src/cmd/internal/testdir/testdir_test.go
683683
@@ -118,6 +118,13 @@ func Test(t *testing.T) {
@@ -695,7 +695,7 @@ index c5aa91ba4732e7..9e838fa785af46 100644
695695
gorootTestDir: filepath.Join(testenv.GOROOT(t), "test"),
696696
runoutputGate: make(chan bool, *runoutputLimit),
697697
diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go
698-
index d913953944bc43..daa8aa3d964ed0 100644
698+
index 6a684890be0a03..09554a60b23471 100644
699699
--- a/src/cmd/link/internal/ld/main.go
700700
+++ b/src/cmd/link/internal/ld/main.go
701701
@@ -44,6 +44,7 @@ import (
@@ -706,7 +706,7 @@ index d913953944bc43..daa8aa3d964ed0 100644
706706
"strconv"
707707
"strings"
708708
)
709-
@@ -188,7 +189,18 @@ func Main(arch *sys.Arch, theArch Arch) {
709+
@@ -187,7 +188,18 @@ func Main(arch *sys.Arch, theArch Arch) {
710710

711711
buildVersion := buildcfg.Version
712712
if goexperiment := buildcfg.Experiment.String(); goexperiment != "" {
@@ -727,7 +727,7 @@ index d913953944bc43..daa8aa3d964ed0 100644
727727
addstrdata1(ctxt, "runtime.buildVersion="+buildVersion)
728728

729729
diff --git a/src/cmd/link/link_test.go b/src/cmd/link/link_test.go
730-
index 0125ba8e0f56be..2bc0b65f1035ed 100644
730+
index 2fe32600f1d6c7..f84cbdc5ee25f0 100644
731731
--- a/src/cmd/link/link_test.go
732732
+++ b/src/cmd/link/link_test.go
733733
@@ -9,6 +9,7 @@ import (
@@ -2798,10 +2798,10 @@ index 00000000000000..13782a8241b99a
27982798
+ `
27992799
+}
28002800
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
2801-
index 9b7613a62b5a31..1997d90f2f20ba 100644
2801+
index 9bfef9e125e8d3..ba601c2d1d0c6e 100644
28022802
--- a/src/go/build/deps_test.go
28032803
+++ b/src/go/build/deps_test.go
2804-
@@ -350,7 +350,7 @@ var depsRules = `
2804+
@@ -353,7 +353,7 @@ var depsRules = `
28052805
math/big, go/token
28062806
< go/constant;
28072807

@@ -2856,12 +2856,12 @@ index 9b7613a62b5a31..1997d90f2f20ba 100644
28562856
math/big, github.com/microsoft/go-crypto-darwin/xcrypto < github.com/microsoft/go-crypto-darwin/bbig;
28572857
math/big, github.com/microsoft/go-crypto-winnative/cng < github.com/microsoft/go-crypto-winnative/cng/bbig;
28582858

2859-
- CRYPTO, FMT, math/big
2859+
- CRYPTO, FMT, math/big, internal/saferio
28602860
- < crypto/internal/boring/bbig
28612861
+ FMT, math/big, crypto/internal/boring
28622862
+ < crypto/internal/boring/bbig;
28632863
+
2864-
+ CRYPTO, FMT, math/big,
2864+
+ CRYPTO, FMT, math/big, internal/saferio,
28652865
+ github.com/golang-fips/openssl/v2/bbig,
28662866
+ github.com/microsoft/go-crypto-darwin/bbig,
28672867
+ github.com/microsoft/go-crypto-winnative/cng/bbig
@@ -2870,7 +2870,7 @@ index 9b7613a62b5a31..1997d90f2f20ba 100644
28702870
< crypto/rand
28712871
< crypto/ed25519 # depends on crypto/rand.Reader
28722872
diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
2873-
index 6eab28497a3f2e..81296762c7e231 100644
2873+
index 4a26d623ad1424..e110f465ef8812 100644
28742874
--- a/src/internal/buildcfg/exp.go
28752875
+++ b/src/internal/buildcfg/exp.go
28762876
@@ -5,12 +5,15 @@
@@ -2889,7 +2889,7 @@ index 6eab28497a3f2e..81296762c7e231 100644
28892889
)
28902890

28912891
// ExperimentFlags represents a set of GOEXPERIMENT flags relative to a baseline
2892-
@@ -192,6 +195,57 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
2892+
@@ -194,6 +197,57 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
28932893
if flags.BoringCrypto {
28942894
return nil, fmt.Errorf("GOEXPERIMENT boringcrypto is not supported in the Microsoft build of Go")
28952895
}

0 commit comments

Comments
 (0)