Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/msvc
diff options
context:
space:
mode:
authorJonathan Chambers <joncham@gmail.com>2017-11-08 17:01:15 +0300
committerAleksey Kliger (λgeek) <akliger@gmail.com>2017-11-09 23:56:06 +0300
commitee20fc0ad93fa1422f222e83a2ecaaaf90280407 (patch)
treea6db5681d4540efcf340bdcff306929817839ea4 /msvc
parente348c56a016412da275adcaa8d21446d0fcb026e (diff)
Remove Boehm specific code path in GC aware hash tables as it can now push/mark roots.
Diffstat (limited to 'msvc')
-rw-r--r--msvc/libmonoruntime-common.targets4
-rw-r--r--msvc/libmonoruntime-common.targets.filters12
2 files changed, 8 insertions, 8 deletions
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">