diff --git a/go b/go index f5cdf47454..012d142e78 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit f5cdf4745455415c7a43cfc7d925214d4511489b +Subproject commit 012d142e780071688dfb651874393818c0aed625 diff --git a/patches/0008-Implement-ms_tls_config_schannel-experiment.patch b/patches/0008-Implement-ms_tls_config_schannel-experiment.patch index ee7f9013ab..b9c7cb465f 100644 --- a/patches/0008-Implement-ms_tls_config_schannel-experiment.patch +++ b/patches/0008-Implement-ms_tls_config_schannel-experiment.patch @@ -525,7 +525,7 @@ index 00000000000000..c38f52f42fa26b + } +} diff --git a/src/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go -index 3db1365a971349..e82298dd26c997 100644 +index 2bfb645e2c8e60..5edb2a19c1316e 100644 --- a/src/crypto/tls/tls_test.go +++ b/src/crypto/tls/tls_test.go @@ -24,6 +24,7 @@ import ( @@ -611,14 +611,13 @@ index 00000000000000..a2dbc6187da2a0 +const MS_TLS_Config_Schannel = true +const MS_TLS_Config_SchannelInt = 1 diff --git a/src/internal/goexperiment/flags.go b/src/internal/goexperiment/flags.go -index 5f09ad11a701e2..ca710118b41336 100644 +index 48f3c8f4060be8..8e16ada8b435b7 100644 --- a/src/internal/goexperiment/flags.go +++ b/src/internal/goexperiment/flags.go -@@ -154,4 +154,12 @@ type Flags struct { - - // GenericMethods enables use of generic methods. - GenericMethods bool -+ +@@ -55,6 +55,14 @@ package goexperiment + // + // If you change this struct definition, run "go generate". + type Flags struct { + // MS_TLS_Config_Schannel enables the filtering and ordering of cipher + // suites according to the Windows Schannel settings. + // @@ -626,7 +625,10 @@ index 5f09ad11a701e2..ca710118b41336 100644 + // versions, very few cipher suites are implemented by both Windows and Go, + // so it's unlikely the resulting TLS configuration will be usable. + MS_TLS_Config_Schannel bool - } ++ + FieldTrack bool + PreemptibleLoops bool + StaticLockRanking bool diff --git a/src/internal/syscall/windows/security_windows.go b/src/internal/syscall/windows/security_windows.go index f0ab52ac819baf..d6ef32c0e5c089 100644 --- a/src/internal/syscall/windows/security_windows.go diff --git a/patches/0012-fix-TestFortran.patch b/patches/0012-fix-TestFortran.patch new file mode 100644 index 0000000000..cc5dcc5a25 --- /dev/null +++ b/patches/0012-fix-TestFortran.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: bot-for-go[bot] <199222863+bot-for-go[bot]@users.noreply.github.com> +Date: Tue, 16 Jun 2026 10:01:42 +0200 +Subject: [PATCH] fix TestFortran + +--- + src/cmd/cgo/internal/testfortran/fortran_test.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cmd/cgo/internal/testfortran/fortran_test.go b/src/cmd/cgo/internal/testfortran/fortran_test.go +index 1decd138bc4a31..243b7aeded79f4 100644 +--- a/src/cmd/cgo/internal/testfortran/fortran_test.go ++++ b/src/cmd/cgo/internal/testfortran/fortran_test.go +@@ -47,7 +47,7 @@ func TestFortran(t *testing.T) { + switch runtime.GOOS { + case "darwin": + libExt = "dylib" +- case "aix", "openbsd": ++ case "windows", "aix", "openbsd": + libExt = "a" + } + libName := "libgfortran." + libExt