Skip to content

Commit

Permalink
Merge pull request #1033 from microsoft/dev/auto-sync/microsoft/relea…
Browse files Browse the repository at this point in the history
…se-branch.go1.21

Update submodule to latest `release-branch.go1.21` in `microsoft/release-branch.go1.21`
  • Loading branch information
microsoft-golang-review-bot authored Sep 6, 2023
2 parents 75a1398 + e3e7db1 commit a8380d9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion MICROSOFT_REVISION

This file was deleted.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
go1.21.0
go1.21.1
2 changes: 1 addition & 1 deletion go
Submodule go updated 112 files
14 changes: 7 additions & 7 deletions patches/0004-Add-OpenSSL-crypto-backend.patch
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Subject: [PATCH] Add OpenSSL crypto backend
create mode 100644 src/internal/goexperiment/exp_opensslcrypto_on.go

diff --git a/src/cmd/api/boring_test.go b/src/cmd/api/boring_test.go
index a9ec6e6bfefb76..01765f01736ccb 100644
index f0e3575637c62a..0e9aceeb832d3b 100644
--- a/src/cmd/api/boring_test.go
+++ b/src/cmd/api/boring_test.go
@@ -2,7 +2,7 @@
Expand All @@ -53,13 +53,13 @@ index a9ec6e6bfefb76..01765f01736ccb 100644
-//go:build boringcrypto
+//go:build boringcrypto || goexperiment.opensslcrypto

package api
package main

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index f148fb97b5f62d..a0525bf42e3c18 100644
index 36a20e8b2a8d37..d3c2293cd9671e 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -1178,12 +1178,11 @@ func (t *tester) registerCgoTests(heading string) {
@@ -1204,12 +1204,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 Down Expand Up @@ -106,10 +106,10 @@ index 4aaf46b5d0f0dc..e2ac54f96db1e8 100644

go list -f '{{.Dir}}' vendor/golang.org/x/net/http2/hpack
diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index 91e2d5149ce4da..63b92ba9b3d89a 100644
index d9e5774b6021d1..6a433d2ec7d45f 100644
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -1146,6 +1146,7 @@ var hostobj []Hostobj
@@ -1151,6 +1151,7 @@ var hostobj []Hostobj
// These packages can use internal linking mode.
// Others trigger external mode.
var internalpkg = []string{
Expand Down Expand Up @@ -602,7 +602,7 @@ index e474b8be318c84..ee90dede95cd4d 100644
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 4e4c0fa9f11f5b..7d32c7c63795d6 100644
index f213bd91903a71..b494e234d1fe1e 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -425,6 +425,8 @@ var depsRules = `
Expand Down
6 changes: 3 additions & 3 deletions patches/0005-Add-CNG-crypto-backend.patch
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Subject: [PATCH] Add CNG crypto backend
create mode 100644 src/internal/goexperiment/exp_cngcrypto_on.go

diff --git a/src/cmd/api/boring_test.go b/src/cmd/api/boring_test.go
index 01765f01736ccb..7598da96946b9f 100644
index 0e9aceeb832d3b..aecf81b09c8ad3 100644
--- a/src/cmd/api/boring_test.go
+++ b/src/cmd/api/boring_test.go
@@ -2,7 +2,7 @@
Expand All @@ -65,7 +65,7 @@ index 01765f01736ccb..7598da96946b9f 100644
-//go:build boringcrypto || goexperiment.opensslcrypto
+//go:build boringcrypto || goexperiment.opensslcrypto || goexperiment.cngcrypto

package api
package main

diff --git a/src/cmd/go/go_boring_test.go b/src/cmd/go/go_boring_test.go
index 5376227f74cfaa..492ccf79d66b45 100644
Expand Down Expand Up @@ -1048,7 +1048,7 @@ index ee90dede95cd4d..88246d9a2e2442 100644
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 7d32c7c63795d6..6146e20c7b027e 100644
index b494e234d1fe1e..dc92957a4ff1a1 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -425,6 +425,10 @@ var depsRules = `
Expand Down

0 comments on commit a8380d9

Please sign in to comment.