diff options
author | Jonathan Chambers <joncham@gmail.com> | 2019-11-22 20:03:23 +0300 |
---|---|---|
committer | Zoltan Varga <vargaz@gmail.com> | 2019-11-22 20:03:23 +0300 |
commit | cc137237d86b0553e844dc34c9a3cbc5b20782c0 (patch) | |
tree | 15916aff0cc2f69939401e7f591cbedd31027f50 /msvc/libgc.targets | |
parent | 0fed03ed63ed4ea742c4511d8edc3bc1c6f4044f (diff) |
Replace embedded libgc with Unity fork of recent Boehm (bdwgc) (#16832)
* Initial commit to migrate libgc to bdwgc.
* Fix submodule url
* Don't force Boehm as runtime wrapper. Was just for testing locally.
* Build bdwgc as single object file. Helps with performance.
* Bump bdwgc submodule.
* Attempt to fix windows MSVC based build.
* Remove any references to GC_INSIDE_DLL as we manually managed threads on Windows.
* Allow building boehm on Windows amd64.
* Allow building boehm with msvc.
* Bump bdwgc to fix line endings
* Use LF for sh, am, m4, and ac files in bdwgc
* Bump bdwgc & libatomic_ops with fix for cygwin
* Bump bdwgc to fix mono-boehm being generated as libtool wrapper script.
* Link the static boehm library.
* Revert "Link the static boehm library."
This reverts commit 1f90d81d08308a61c890743cd79d8f6bb791bc99.
* Use --export-all-symbols on cygwin/mingw to fix issues with boehm causing mono symbols not to be exported.
* Fix
Diffstat (limited to 'msvc/libgc.targets')
-rw-r--r-- | msvc/libgc.targets | 137 |
1 files changed, 4 insertions, 133 deletions
diff --git a/msvc/libgc.targets b/msvc/libgc.targets index 2dfb0bbb30f..4f997363ce8 100644 --- a/msvc/libgc.targets +++ b/msvc/libgc.targets @@ -3,148 +3,19 @@ <PropertyGroup> <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild> <ExcludeBoehmGCFromBuild>true</ExcludeBoehmGCFromBuild> - <ExcludeBoehmGCFromBuild Condition="'$(MONO_TARGET_GC)'=='boehm' And '$(Platform)'=='Win32'">false</ExcludeBoehmGCFromBuild> + <ExcludeBoehmGCFromBuild Condition="'$(MONO_TARGET_GC)'=='boehm'">false</ExcludeBoehmGCFromBuild> </PropertyGroup> <ItemGroup Label="libmonogc_la_sources"> - <ClCompile Include="$(MonoSourceLocation)\libgc\allchblk.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\alloc.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\blacklst.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\checksums.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\dbg_mlc.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\dyn_load.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\finalize.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\gc_dlopen.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\gcj_mlc.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\headers.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\malloc.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\mallocx.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\mark.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\mark_rts.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\misc.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\new_hblk.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\obj_map.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\os_dep.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\pcr_interface.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\ptr_chck.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\real_malloc.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\reclaim.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\solaris_pthreads.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\solaris_threads.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\specific.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\stubborn.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\typd_mlc.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\backgraph.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\win32_threads.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\pthread_support.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\pthread_stop_world.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\darwin_stop_world.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\openbsd_stop_world.c"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\libgc\mach_dep.c"> + <ClCompile Include="$(MonoSourceLocation)\external\bdwgc\extra\gc.c"> <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gcconfig.h"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_priv.h"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_hdrs.h"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc.h"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_gcj.h"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_mark.h"> - <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_locks.h"> + <ClInclude Include="$(MonoSourceLocation)\external\bdwgc\include\gc.h"> <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild> </ClInclude> </ItemGroup> <ItemGroup> - <None Include="$(MonoSourceLocation)\libgc\Makefile.am" /> + <None Include="$(MonoSourceLocation)\external\bdwgc\Makefile.am" /> </ItemGroup> </Project>
\ No newline at end of file |