Skip to content

Commit c07d830

Browse files
jkoritzinskyjkoritzinsky
authored
Delete CMake infrastructure for crossgen1 and remove dead code directories (#57614)
1 parent 57e1c23 commit c07d830

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+12
-25004
lines changed

‎src/coreclr/binder/CMakeLists.txt‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,11 @@ set(BINDER_HEADERS
6161
inc/contextentry.hpp
6262
)
6363

64-
set(BINDER_CROSSGEN_SOURCES
65-
${BINDER_COMMON_SOURCES}
66-
)
67-
68-
set(BINDER_CROSSGEN_HEADERS
69-
${BINDER_COMMON_HEADERS}
70-
)
71-
7264
if (CLR_CMAKE_TARGET_WIN32)
7365
list(APPEND BINDER_SOURCES ${BINDER_HEADERS})
74-
list(APPEND BINDER_CROSSGEN_SOURCES ${BINDER_CROSSGEN_HEADERS})
7566
endif(CLR_CMAKE_TARGET_WIN32)
7667

7768
convert_to_absolute_path(BINDER_SOURCES ${BINDER_SOURCES})
78-
convert_to_absolute_path(BINDER_CROSSGEN_SOURCES ${BINDER_CROSSGEN_SOURCES})
7969

8070
add_library_clr(v3binder_obj
8171
OBJECT
@@ -84,11 +74,3 @@ add_library_clr(v3binder_obj
8474
add_dependencies(v3binder_obj eventing_headers)
8575
add_library(v3binder INTERFACE)
8676
target_sources(v3binder INTERFACE $<TARGET_OBJECTS:v3binder_obj>)
87-
88-
add_library_clr(v3binder_crossgen
89-
STATIC
90-
${BINDER_CROSSGEN_SOURCES}
91-
)
92-
add_dependencies(v3binder_crossgen eventing_headers)
93-
set_target_properties(v3binder_crossgen PROPERTIES CROSSGEN_COMPONENT TRUE)
94-

‎src/coreclr/clrdefinitions.cmake‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
include(${CMAKE_CURRENT_LIST_DIR}/clrfeatures.cmake)
22

33
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>:DACCESS_COMPILE>)
4-
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:CROSSGEN_COMPILE>)
5-
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:CROSS_COMPILE>)
6-
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:FEATURE_NATIVE_IMAGE_GENERATION>)
7-
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:SELF_NO_HOST>)
84

95
if (CLR_CMAKE_TARGET_ARCH_ARM64)
106
if (CLR_CMAKE_TARGET_UNIX)
@@ -58,11 +54,11 @@ if(CLR_CMAKE_HOST_WIN32)
5854
endif(CLR_CMAKE_HOST_WIN32)
5955

6056
if (NOT (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX))
61-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:EnC_SUPPORTED>)
57+
add_compile_definitions(EnC_SUPPORTED)
6258
endif()
6359
if(CLR_CMAKE_TARGET_ARCH_AMD64 OR (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_WIN32))
6460
if(CLR_CMAKE_TARGET_WIN32)
65-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_ENC_SUPPORTED>)
61+
add_compile_definitions(FEATURE_ENC_SUPPORTED)
6662
endif(CLR_CMAKE_TARGET_WIN32)
6763
endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_WIN32))
6864

@@ -85,7 +81,7 @@ if(CLR_CMAKE_TARGET_UNIX OR NOT CLR_CMAKE_TARGET_ARCH_I386)
8581
add_definitions(-DFEATURE_INSTANTIATINGSTUB_AS_IL)
8682
endif()
8783

88-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_CODE_VERSIONING>)
84+
add_compile_definitions(FEATURE_CODE_VERSIONING)
8985
add_definitions(-DFEATURE_COLLECTIBLE_TYPES)
9086

9187
if(CLR_CMAKE_TARGET_WIN32)
@@ -103,7 +99,7 @@ if(FEATURE_DBGIPC)
10399
endif(FEATURE_DBGIPC)
104100
add_definitions(-DFEATURE_DEFAULT_INTERFACES)
105101
if(FEATURE_EVENT_TRACE)
106-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_EVENT_TRACE>)
102+
add_compile_definitions(FEATURE_EVENT_TRACE)
107103
add_definitions(-DFEATURE_PERFTRACING)
108104
else(FEATURE_EVENT_TRACE)
109105
add_custom_target(eventing_headers) # add a dummy target to avoid checking for FEATURE_EVENT_TRACE in multiple places
@@ -132,7 +128,7 @@ if (CLR_CMAKE_TARGET_WIN32 AND (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_
132128
add_definitions(-DFEATURE_INTEROP_DEBUGGING)
133129
endif (CLR_CMAKE_TARGET_WIN32 AND (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM64))
134130
if(FEATURE_INTERPRETER)
135-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_INTERPRETER>)
131+
add_compile_definitions(FEATURE_INTERPRETER)
136132
endif(FEATURE_INTERPRETER)
137133
add_definitions(-DFEATURE_ISYM_READER)
138134
if (CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_WIN32)
@@ -143,21 +139,16 @@ add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS)
143139
if(FEATURE_MERGE_JIT_AND_ENGINE)
144140
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_FEATURE_MERGE_JIT_AND_ENGINE>>>:FEATURE_MERGE_JIT_AND_ENGINE>)
145141
endif(FEATURE_MERGE_JIT_AND_ENGINE)
146-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_MULTICOREJIT>)
142+
add_compile_definitions(FEATURE_MULTICOREJIT)
147143
if(CLR_CMAKE_TARGET_UNIX)
148144
add_definitions(-DFEATURE_PAL_ANSI)
149145
endif(CLR_CMAKE_TARGET_UNIX)
150146
if(CLR_CMAKE_TARGET_LINUX AND CLR_CMAKE_HOST_LINUX)
151147
add_definitions(-DFEATURE_PERFMAP)
152148
endif(CLR_CMAKE_TARGET_LINUX AND CLR_CMAKE_HOST_LINUX)
153149
if(CLR_CMAKE_TARGET_FREEBSD)
154-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_PERFMAP>)
150+
add_compile_definitions(FEATURE_PERFMAP)
155151
endif(CLR_CMAKE_TARGET_FREEBSD)
156-
if(FEATURE_PREJIT)
157-
add_definitions(-DFEATURE_PREJIT)
158-
else()
159-
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:FEATURE_PREJIT>)
160-
endif(FEATURE_PREJIT)
161152

162153
if(FEATURE_COMWRAPPERS)
163154
add_compile_definitions(FEATURE_COMWRAPPERS)
@@ -167,14 +158,13 @@ if(FEATURE_OBJCMARSHAL)
167158
add_compile_definitions(FEATURE_OBJCMARSHAL)
168159
endif()
169160

170-
add_compile_definitions($<$<AND:$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>,$<NOT:$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>>>:FEATURE_PROFAPI_ATTACH_DETACH>)
161+
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>>:FEATURE_PROFAPI_ATTACH_DETACH>)
171162

172163
add_definitions(-DFEATURE_READYTORUN)
173164

174-
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:FEATURE_READYTORUN_COMPILER>)
175165
set(FEATURE_READYTORUN 1)
176166

177-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_REJIT>)
167+
add_compile_definitions(FEATURE_REJIT)
178168

179169
if (CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_UNIX)
180170
add_definitions(-DFEATURE_REMOTE_PROC_MEM)
@@ -183,19 +173,16 @@ endif (CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_UNIX)
183173
if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64)
184174
add_definitions(-DFEATURE_STUBS_AS_IL)
185175
endif ()
186-
if (FEATURE_NGEN_RELOCS_OPTIMIZATIONS)
187-
add_definitions(-DFEATURE_NGEN_RELOCS_OPTIMIZATIONS)
188-
endif(FEATURE_NGEN_RELOCS_OPTIMIZATIONS)
189176
if (FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION)
190177
add_definitions(-DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION)
191178
endif(FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION)
192179
add_definitions(-DFEATURE_SVR_GC)
193180
add_definitions(-DFEATURE_SYMDIFF)
194-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_TIERED_COMPILATION>)
181+
add_compile_definitions(FEATURE_TIERED_COMPILATION)
195182
if (CLR_CMAKE_TARGET_ARCH_AMD64)
196-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_ON_STACK_REPLACEMENT>)
183+
add_compile_definitions(FEATURE_ON_STACK_REPLACEMENT)
197184
endif (CLR_CMAKE_TARGET_ARCH_AMD64)
198-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_PGO>)
185+
add_compile_definitions(FEATURE_PGO)
199186
if (CLR_CMAKE_TARGET_WIN32)
200187
add_definitions(-DFEATURE_TYPEEQUIVALENCE)
201188
endif(CLR_CMAKE_TARGET_WIN32)

‎src/coreclr/gcinfo/CMakeLists.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ add_library_clr(gcinfo_obj
3232
add_library(gcinfo INTERFACE)
3333
target_sources(gcinfo INTERFACE $<TARGET_OBJECTS:gcinfo_obj>)
3434

35-
add_library_clr(gcinfo_crossgen
36-
STATIC
37-
${GCINFO_SOURCES}
38-
)
39-
40-
set_target_properties(gcinfo_crossgen PROPERTIES CROSSGEN_COMPONENT TRUE)
41-
4235
install (FILES gcinfoencoder.cpp
4336
DESTINATION gcinfo)
4437

‎src/coreclr/jit/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,6 @@ endfunction()
482482

483483
set(JIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
484484

485-
if (FEATURE_MERGE_JIT_AND_ENGINE)
486-
add_subdirectory(crossgen)
487-
endif (FEATURE_MERGE_JIT_AND_ENGINE)
488-
489485
# Creates a static library "clrjit_static" to link into the VM.
490486
add_subdirectory(static)
491487

‎src/coreclr/jit/crossgen/CMakeLists.txt‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/coreclr/md/compiler/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES})
7676
set_target_properties(mdcompiler-dbi PROPERTIES DBI_COMPONENT TRUE)
7777
target_precompile_headers(mdcompiler-dbi PRIVATE stdafx.h)
7878

79-
add_library_clr(mdcompiler_crossgen ${MDCOMPILER_SOURCES})
80-
set_target_properties(mdcompiler_crossgen PROPERTIES CROSSGEN_COMPONENT TRUE)
81-
target_precompile_headers(mdcompiler_crossgen PRIVATE stdafx.h)
82-
8379
add_library_clr(mdcompiler_ppdb ${MDCOMPILER_SOURCES})
8480
target_compile_definitions(mdcompiler_ppdb PRIVATE FEATURE_METADATA_EMIT_ALL FEATURE_METADATA_EMIT_PORTABLE_PDB)
8581
target_precompile_headers(mdcompiler_ppdb PRIVATE stdafx.h)

‎src/coreclr/md/hotdata/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ target_precompile_headers(mdhotdata_full_obj PRIVATE external.h)
3838
add_library(mdhotdata_full INTERFACE)
3939
target_sources(mdhotdata_full INTERFACE $<TARGET_OBJECTS:mdhotdata_full_obj>)
4040

41-
add_library_clr(mdhotdata_crossgen ${MDHOTDATA_SOURCES})
42-
set_target_properties(mdhotdata_crossgen PROPERTIES CROSSGEN_COMPONENT TRUE)
43-
target_precompile_headers(mdhotdata_crossgen PRIVATE external.h)
44-
4541
if(CLR_CMAKE_HOST_WIN32)
4642
add_library_clr(mdhotdata-staticcrt ${MDHOTDATA_SOURCES})
4743
target_precompile_headers(mdhotdata-staticcrt PRIVATE external.h)

‎src/coreclr/tools/crossgen/CMakeLists.txt‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎src/coreclr/tools/crossgen/Native.rc‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)