From c0c284fed3acba76f05bedc6bf6fb33e61b9f34a Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Tue, 20 Sep 2022 21:42:17 +0000
Subject: [PATCH 1/4] Merged PR 7872414: [Git2Git] Merged PR 7872347: BUILD
 BREAK FIX: Use the X86 wyhash32 code for ARM32

We're using this in UnicodeStorage!

Retrieved from https://microsoft.visualstudio.com os.2020 OS official/rs_we_adept_e4d2 828282c76d559ae2dbbee4288796a939e7f869f8

Related work items: MSFT-41396187
---
 src/inc/til/hash.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/inc/til/hash.h b/src/inc/til/hash.h
index 49e9e577957..03862072325 100644
--- a/src/inc/til/hash.h
+++ b/src/inc/til/hash.h
@@ -17,8 +17,8 @@
 #define TIL_HASH_X64
 #elif defined(_M_ARM64) || defined(_M_ARM64EC)
 #define TIL_HASH_ARM64
-#elif defined(_M_IX86)
-#define TIL_HASH_X86
+#elif defined(_M_IX86) || defined(_M_ARM)
+#define TIL_HASH_32BIT
 #else
 #error "Unsupported architecture for til::hash"
 #endif
@@ -59,7 +59,7 @@ namespace til
         }
 
     private:
-#if defined(TIL_HASH_X86)
+#if defined(TIL_HASH_32BIT)
 
         static uint32_t _wyr24(const uint8_t* p, uint32_t k) noexcept
         {
@@ -109,7 +109,7 @@ namespace til
             return seed ^ see1;
         }
 
-#else // defined(TIL_HASH_X86)
+#else // defined(TIL_HASH_32BIT)
 
         static uint64_t _wyr3(const uint8_t* p, size_t k) noexcept
         {
@@ -201,7 +201,7 @@ namespace til
             return _wymix(s1 ^ len, _wymix(a ^ s1, b ^ seed));
         }
 
-#endif // defined(TIL_HASH_X86)
+#endif // defined(TIL_HASH_32BIT)
 
         size_t _hash = 0;
     };

From bcf2422c4df174be3ca204cb18085c820d86b3aa Mon Sep 17 00:00:00 2001
From: Dan Albrecht <Dan-Albrecht@users.noreply.github.com>
Date: Thu, 20 Oct 2022 11:49:27 -0700
Subject: [PATCH 2/4] Remove vestigial submodule entry (#14248)

Remove vestigial submodule entry

## References
#12778 removed the actual WIL submodule, but there was still an entry left in the `.gitmodules` file that was causing me confusion about an orphaned submodule directory I had in an old copy of the repo.

## Validation Steps Performed
 - Official validation checks passed
 - Build still works locally after a `git clean -fdx`
---
 .gitmodules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 8063d9d0154..94c5e259626 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "dep/gsl"]
 	path = dep/gsl
 	url = https://github.com/microsoft/gsl
-[submodule "dep/wil"]
-	path = dep/wil
-	url = https://github.com/microsoft/wil

From f88ef02c98efdfa91e54730337896f5351827a4e Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Thu, 20 Oct 2022 20:07:00 +0000
Subject: [PATCH 3/4] Merged PR 8014375: [Git2Git] Build fixes on top of
 bfd480b88

This pull request introduces a number of source files to ut_til/sources.

Retrieved from https://microsoft.visualstudio.com os.2020 OS official/rs_we_adept_e4d2 35865f47ced9103b02b06a1eb8d43d26b420af99
---
 src/til/ut_til/sources | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/til/ut_til/sources b/src/til/ut_til/sources
index 662f3b1bc65..85ca3ebd738 100644
--- a/src/til/ut_til/sources
+++ b/src/til/ut_til/sources
@@ -16,17 +16,29 @@ SOURCES = \
     $(SOURCES) \
     BaseTests.cpp \
     BitmapTests.cpp \
+    CoalesceTests.cpp \
     ColorTests.cpp \
+    EnumSetTests.cpp \
+    HashTests.cpp \
+    MathTests.cpp \
+    mutex.cpp \
     OperatorTests.cpp \
     PointTests.cpp \
-    MathTests.cpp \
     RectangleTests.cpp \
+    ReplaceTests.cpp \
     RunLengthEncodingTests.cpp \
     SizeTests.cpp \
+    SmallVectorTests.cpp \
     SomeTests.cpp \
+    StaticMapTests.cpp \
+    string.cpp \
     u8u16convertTests.cpp \
     DefaultResource.rc \
 
+# These tests are disabled because of a missing symbol.
+#    SPSCTests.cpp \
+#    throttled_func.cpp \
+
 INCLUDES = \
     .. \
     $(INCLUDES) \

From b674ac5c19f247451b10b89c10cfde670cd4b239 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Fri, 21 Oct 2022 19:19:34 +0200
Subject: [PATCH 4/4] Fix a test failure in HashTests (#14277)

744ca24 broke `HashTests` as it renamed a preprocessor definition.
---
 src/til/ut_til/HashTests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/til/ut_til/HashTests.cpp b/src/til/ut_til/HashTests.cpp
index 4b8ba380740..69b34f925f9 100644
--- a/src/til/ut_til/HashTests.cpp
+++ b/src/til/ut_til/HashTests.cpp
@@ -36,7 +36,7 @@ class HashTests
         for (const auto& t : tests)
         {
             const auto actual = til::hasher{ t.seed }.write(t.input).finalize();
-#if defined(TIL_HASH_X86)
+#if defined(TIL_HASH_32BIT)
             VERIFY_ARE_EQUAL(t.expected32, actual);
 #else
             VERIFY_ARE_EQUAL(t.expected64, actual);