Merge pull request dotnet/coreclr#9770 from adityamandaleeka/card_bundles_unix_2
authorAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>
Wed, 1 Mar 2017 18:29:32 +0000 (10:29 -0800)
committerGitHub <noreply@github.com>
Wed, 1 Mar 2017 18:29:32 +0000 (10:29 -0800)
Implement second-level card tables for non-Windows platforms

Commit migrated from https://github.com/dotnet/coreclr/commit/4a0a82a8dabaabb1e9a82af944d70aed210838a3

1  2 
src/coreclr/clrdefinitions.cmake
src/coreclr/src/gc/gc.cpp
src/coreclr/src/gc/gc.h
src/coreclr/src/gc/gccommon.cpp
src/coreclr/src/gc/gcinterface.h
src/coreclr/src/gc/gcpriv.h
src/coreclr/src/vm/gcheaputilities.cpp
src/coreclr/src/vm/gcheaputilities.h
src/coreclr/src/vm/gchelpers.cpp
src/coreclr/src/vm/jitinterface.h

@@@ -182,8 -189,10 +182,9 @@@ if(CLR_CMAKE_PLATFORM_UNIX_AMD64
  endif (CLR_CMAKE_PLATFORM_UNIX_AMD64)
  add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS)
  if(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND NOT WIN32)
+   add_definitions(-DFEATURE_MANUALLY_MANAGED_CARD_BUNDLES)
    add_definitions(-DFEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP)
  endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND NOT WIN32)
 -add_definitions(-DFEATURE_VERSIONING)
  if(WIN32)
      add_definitions(-DFEATURE_VERSIONING_LOG)
  endif(WIN32)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge