From ee20fc0ad93fa1422f222e83a2ecaaaf90280407 Mon Sep 17 00:00:00 2001
From: Jonathan Chambers <joncham@gmail.com>
Date: Wed, 8 Nov 2017 09:01:15 -0500
Subject: Remove Boehm specific code path in GC aware hash tables as it can now
 push/mark roots.

---
 msvc/libmonoruntime-common.targets         |  4 ++--
 msvc/libmonoruntime-common.targets.filters | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'msvc')

diff --git a/msvc/libmonoruntime-common.targets b/msvc/libmonoruntime-common.targets
index 381f4f7bf16..9cf6f249da5 100644
--- a/msvc/libmonoruntime-common.targets
+++ b/msvc/libmonoruntime-common.targets
@@ -69,7 +69,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.h" />
@@ -185,8 +187,6 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc-stats.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\monitor.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c" />
   </ItemGroup>
   <ItemGroup Label="boehm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\boehm-gc.c" />
diff --git a/msvc/libmonoruntime-common.targets.filters b/msvc/libmonoruntime-common.targets.filters
index ed6eb918e58..a3ac5643453 100644
--- a/msvc/libmonoruntime-common.targets.filters
+++ b/msvc/libmonoruntime-common.targets.filters
@@ -196,9 +196,15 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
@@ -504,12 +510,6 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\monitor.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup Label="boehm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\boehm-gc.c">
-- 
cgit v1.2.3