From f0a48a4dd57c67e3e7fb24292e602c62870ddc87 Mon Sep 17 00:00:00 2001
From: microsoft-golang-bot <microsoft-golang-bot@users.noreply.github.com>
Date: Thu, 5 Oct 2023 19:08:18 +0000
Subject: [PATCH 1/3] Update submodule to latest release-branch.go1.21
 (26b5783b): [release-branch.go1.21] go1.21.2

---
 VERSION | 2 +-
 go      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 06e64096a77..c348e390ebf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-go1.21.1
\ No newline at end of file
+go1.21.2
\ No newline at end of file
diff --git a/go b/go
index 2c1e5b05fe3..26b5783b723 160000
--- a/go
+++ b/go
@@ -1 +1 @@
-Subproject commit 2c1e5b05fe39fc5e6c730dd60e82946b8e67c6ba
+Subproject commit 26b5783b72376acd0386f78295e678b9a6bff30e

From 862660b6c2e86b7cf2e2d186da6c38427eee6f97 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 5 Oct 2023 16:08:35 -0700
Subject: [PATCH 2/3] Skip GDB tests: change in tool needs test fix upstream

---
 ...09-Skip-failing-GDB-tests-on-Windows.patch | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 patches/0009-Skip-failing-GDB-tests-on-Windows.patch

diff --git a/patches/0009-Skip-failing-GDB-tests-on-Windows.patch b/patches/0009-Skip-failing-GDB-tests-on-Windows.patch
new file mode 100644
index 00000000000..6f6083a3dc6
--- /dev/null
+++ b/patches/0009-Skip-failing-GDB-tests-on-Windows.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Davis Goodin <dagood@microsoft.com>
+Date: Thu, 5 Oct 2023 16:06:31 -0700
+Subject: [PATCH] Skip failing GDB tests on Windows
+
+---
+ src/runtime/runtime-gdb_test.go | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
+index 8c759bf4066370..5249f87154245f 100644
+--- a/src/runtime/runtime-gdb_test.go
++++ b/src/runtime/runtime-gdb_test.go
+@@ -168,6 +168,9 @@ func TestGdbPythonCgo(t *testing.T) {
+ }
+ 
+ func testGdbPython(t *testing.T, cgo bool) {
++	if runtime.GOOS == "windows" {
++		t.Skip("may encounter unexpected line endings")
++	}
+ 	if cgo {
+ 		testenv.MustHaveCGO(t)
+ 	}
+@@ -399,6 +402,9 @@ func main() {
+ // TestGdbBacktrace tests that gdb can unwind the stack correctly
+ // using only the DWARF debug info.
+ func TestGdbBacktrace(t *testing.T) {
++	if runtime.GOOS == "windows" {
++		t.Skip("may encounter unexpected line endings")
++	}
+ 	if runtime.GOOS == "netbsd" {
+ 		testenv.SkipFlaky(t, 15603)
+ 	}
+@@ -525,6 +531,9 @@ func main() {
+ // TestGdbAutotmpTypes ensures that types of autotmp variables appear in .debug_info
+ // See bug #17830.
+ func TestGdbAutotmpTypes(t *testing.T) {
++	if runtime.GOOS == "windows" {
++		t.Skip("may encounter unexpected line endings")
++	}
+ 	checkGdbEnvironment(t)
+ 	t.Parallel()
+ 	checkGdbVersion(t)
+@@ -598,6 +607,9 @@ func main() {
+ `
+ 
+ func TestGdbConst(t *testing.T) {
++	if runtime.GOOS == "windows" {
++		t.Skip("may encounter unexpected line endings")
++	}
+ 	checkGdbEnvironment(t)
+ 	t.Parallel()
+ 	checkGdbVersion(t)

From 69e0806dd13ef5bc7cce416e2d299b2e260e01a9 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 5 Oct 2023 16:57:35 -0700
Subject: [PATCH 3/3] Add TestMultipleAssign skip

---
 ... 0009-Skip-failing-tests-on-Windows.patch} | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
 rename patches/{0009-Skip-failing-GDB-tests-on-Windows.patch => 0009-Skip-failing-tests-on-Windows.patch} (67%)

diff --git a/patches/0009-Skip-failing-GDB-tests-on-Windows.patch b/patches/0009-Skip-failing-tests-on-Windows.patch
similarity index 67%
rename from patches/0009-Skip-failing-GDB-tests-on-Windows.patch
rename to patches/0009-Skip-failing-tests-on-Windows.patch
index 6f6083a3dc6..8536c77e654 100644
--- a/patches/0009-Skip-failing-GDB-tests-on-Windows.patch
+++ b/patches/0009-Skip-failing-tests-on-Windows.patch
@@ -1,12 +1,27 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Davis Goodin <dagood@microsoft.com>
 Date: Thu, 5 Oct 2023 16:06:31 -0700
-Subject: [PATCH] Skip failing GDB tests on Windows
+Subject: [PATCH] Skip failing tests on Windows
 
 ---
- src/runtime/runtime-gdb_test.go | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ src/cmd/cgo/internal/test/test.go |  3 +++
+ src/runtime/runtime-gdb_test.go   | 12 ++++++++++++
+ 2 files changed, 15 insertions(+)
 
+diff --git a/src/cmd/cgo/internal/test/test.go b/src/cmd/cgo/internal/test/test.go
+index 7da5a856b307a0..1f045ca6f801a4 100644
+--- a/src/cmd/cgo/internal/test/test.go
++++ b/src/cmd/cgo/internal/test/test.go
+@@ -1067,6 +1067,9 @@ func testErrno(t *testing.T) {
+ }
+ 
+ func testMultipleAssign(t *testing.T) {
++	if runtime.GOOS == "windows" {
++		t.Skip("failing starting with 1.21.2: https://github.com/microsoft/go/issues/1059")
++	}
+ 	p := C.CString("234")
+ 	n, m := C.strtol(p, nil, 345), C.strtol(p, nil, 10)
+ 	if runtime.GOOS == "openbsd" {
 diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
 index 8c759bf4066370..5249f87154245f 100644
 --- a/src/runtime/runtime-gdb_test.go