From 44970de72e3dad6203cc6186cc573b348a4f7929 Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Tue, 18 Jul 2023 14:00:45 -0700 Subject: [PATCH 1/3] adding clrgc variant with regions enabled --- src/coreclr/gc/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/coreclr/gc/CMakeLists.txt b/src/coreclr/gc/CMakeLists.txt index 71d6c42f6adec..d405ce1ce3f0b 100644 --- a/src/coreclr/gc/CMakeLists.txt +++ b/src/coreclr/gc/CMakeLists.txt @@ -104,6 +104,14 @@ list(APPEND GC_SOURCES ${GC_HEADERS}) convert_to_absolute_path(GC_SOURCES ${GC_SOURCES}) +# clrgcr is build with standalone+regions +add_library_clr(clrgcr SHARED ${GC_SOURCES}) +add_dependencies(clrgcr eventing_headers) +target_link_libraries(clrgcr PRIVATE ${GC_LINK_LIBRARIES}) +target_compile_definitions(clrgcr PRIVATE -DUSE_REGIONS) +install_clr(TARGETS clrgcr DESTINATIONS . COMPONENT runtime) + +# clrgc is build with standalone+segments add_library_clr(clrgc SHARED ${GC_SOURCES}) add_dependencies(clrgc eventing_headers) target_link_libraries(clrgc PRIVATE ${GC_LINK_LIBRARIES}) From 4f2628d0ebd756c2f8772da3927f97a1e2e4c28a Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Tue, 18 Jul 2023 14:42:32 -0700 Subject: [PATCH 2/3] only build regions for 64 bit platforms --- src/coreclr/gc/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/coreclr/gc/CMakeLists.txt b/src/coreclr/gc/CMakeLists.txt index d405ce1ce3f0b..97c9d47edf2f6 100644 --- a/src/coreclr/gc/CMakeLists.txt +++ b/src/coreclr/gc/CMakeLists.txt @@ -105,11 +105,13 @@ list(APPEND GC_SOURCES ${GC_HEADERS}) convert_to_absolute_path(GC_SOURCES ${GC_SOURCES}) # clrgcr is build with standalone+regions -add_library_clr(clrgcr SHARED ${GC_SOURCES}) -add_dependencies(clrgcr eventing_headers) -target_link_libraries(clrgcr PRIVATE ${GC_LINK_LIBRARIES}) -target_compile_definitions(clrgcr PRIVATE -DUSE_REGIONS) -install_clr(TARGETS clrgcr DESTINATIONS . COMPONENT runtime) +if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64) + add_library_clr(clrgcr SHARED ${GC_SOURCES}) + add_dependencies(clrgcr eventing_headers) + target_link_libraries(clrgcr PRIVATE ${GC_LINK_LIBRARIES}) + target_compile_definitions(clrgcr PRIVATE -DUSE_REGIONS) + install_clr(TARGETS clrgcr DESTINATIONS . COMPONENT runtime) +endif (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64) # clrgc is build with standalone+segments add_library_clr(clrgc SHARED ${GC_SOURCES}) From ac0163f5aa60e96bfae168d0969b2016b5ae5766 Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:10:11 -0700 Subject: [PATCH 3/3] rename to clrgcexp for experimental --- src/coreclr/gc/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/coreclr/gc/CMakeLists.txt b/src/coreclr/gc/CMakeLists.txt index 97c9d47edf2f6..12426bd27dc33 100644 --- a/src/coreclr/gc/CMakeLists.txt +++ b/src/coreclr/gc/CMakeLists.txt @@ -104,13 +104,13 @@ list(APPEND GC_SOURCES ${GC_HEADERS}) convert_to_absolute_path(GC_SOURCES ${GC_SOURCES}) -# clrgcr is build with standalone+regions +# clrgcexp is build with standalone+regions if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64) - add_library_clr(clrgcr SHARED ${GC_SOURCES}) - add_dependencies(clrgcr eventing_headers) - target_link_libraries(clrgcr PRIVATE ${GC_LINK_LIBRARIES}) - target_compile_definitions(clrgcr PRIVATE -DUSE_REGIONS) - install_clr(TARGETS clrgcr DESTINATIONS . COMPONENT runtime) + add_library_clr(clrgcexp SHARED ${GC_SOURCES}) + add_dependencies(clrgcexp eventing_headers) + target_link_libraries(clrgcexp PRIVATE ${GC_LINK_LIBRARIES}) + target_compile_definitions(clrgcexp PRIVATE -DUSE_REGIONS) + install_clr(TARGETS clrgcexp DESTINATIONS . COMPONENT runtime) endif (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64) # clrgc is build with standalone+segments