Rename src\coreclr\src\tools\crossgen2 to src\coreclr\src\tools\aot (d…

…otnet#38038)
modi-w · Jun 18, 2020 · 6c1ac32 · 6c1ac32
1 parent c8095c9
commit 6c1ac32
Show file tree

Hide file tree

Showing 193 changed files with 12 additions and 12 deletions.
diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -149,7 +149,7 @@
                              $(CoreClrProjectRoot)src\tools\r2rdump\R2RDump.csproj;
                              $(CoreClrProjectRoot)src\tools\dotnet-pgo\dotnet-pgo.csproj;
                              $(CoreClrProjectRoot)src\tools\r2rtest\R2RTest.csproj" Category="clr" BuildInParallel="true" />
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\crossgen2\crossgen2\crossgen2.csproj" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+clr.packages+'))">

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -90,7 +90,7 @@ if(CLR_CMAKE_TARGET_WIN32)
   add_subdirectory(src/gc/sample)
 endif()
 
-add_subdirectory(src/tools/crossgen2/jitinterface)
+add_subdirectory(src/tools/aot/jitinterface)
 
 # Above projects do not build with these compile options
 # All of the compiler options are specified in file compileoptions.cmake

diff --git a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/gen.bat b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/gen.bat
@@ -1,4 +1,4 @@
 pushd %~dp0
-call ..\..\..\..\..\..\..\dotnet.cmd run -- ThunkInput.txt ..\CorInfoBase.cs ..\..\..\crossgen2\jitinterface\jitinterface.h
+call ..\..\..\..\..\..\..\dotnet.cmd run -- ThunkInput.txt ..\CorInfoBase.cs ..\..\..\aot\jitinterface\jitinterface.h
 call ..\..\..\..\..\..\..\dotnet.cmd run -- InstructionSetGenerator InstructionSetDesc.txt ..\..\Internal\Runtime\ReadyToRunInstructionSet.cs ..\..\Internal\Runtime\ReadyToRunInstructionSetHelper.cs ..\CorInfoInstructionSet.cs ..\..\..\..\inc\corinfoinstructionset.h ..\..\..\..\inc\readytoruninstructionset.h
-popd
+popd
diff --git a/...Framework/ComputedStaticDependencyNode.cs → ...Framework/ComputedStaticDependencyNode.cs b/...Framework/ComputedStaticDependencyNode.cs → ...Framework/ComputedStaticDependencyNode.cs
diff --git a/...cyAnalysisFramework/DependencyAnalyzer.cs → ...cyAnalysisFramework/DependencyAnalyzer.cs b/...cyAnalysisFramework/DependencyAnalyzer.cs → ...cyAnalysisFramework/DependencyAnalyzer.cs
diff --git a/...alysisFramework/DependencyAnalyzerBase.cs → ...alysisFramework/DependencyAnalyzerBase.cs b/...alysisFramework/DependencyAnalyzerBase.cs → ...alysisFramework/DependencyAnalyzerBase.cs
diff --git a/...ndencyAnalysisFramework/DependencyNode.cs → ...ndencyAnalysisFramework/DependencyNode.cs b/...ndencyAnalysisFramework/DependencyNode.cs → ...ndencyAnalysisFramework/DependencyNode.cs
diff --git a/...cyAnalysisFramework/DependencyNodeCore.cs → ...cyAnalysisFramework/DependencyNodeCore.cs b/...cyAnalysisFramework/DependencyNodeCore.cs → ...cyAnalysisFramework/DependencyNodeCore.cs
diff --git a/...DependencyAnalysisFramework/DgmlWriter.cs → ...DependencyAnalysisFramework/DgmlWriter.cs b/...DependencyAnalysisFramework/DgmlWriter.cs → ...DependencyAnalysisFramework/DgmlWriter.cs
diff --git a/...alysisFramework/EventSourceLogStrategy.cs → ...alysisFramework/EventSourceLogStrategy.cs b/...alysisFramework/EventSourceLogStrategy.cs → ...alysisFramework/EventSourceLogStrategy.cs
diff --git a/...AnalysisFramework/FirstMarkLogStrategy.cs → ...AnalysisFramework/FirstMarkLogStrategy.cs b/...AnalysisFramework/FirstMarkLogStrategy.cs → ...AnalysisFramework/FirstMarkLogStrategy.cs
diff --git a/...AnalysisFramework/FullGraphLogStrategy.cs → ...AnalysisFramework/FullGraphLogStrategy.cs b/...AnalysisFramework/FullGraphLogStrategy.cs → ...AnalysisFramework/FullGraphLogStrategy.cs
diff --git a/...mework/IDependencyAnalysisMarkStrategy.cs → ...mework/IDependencyAnalysisMarkStrategy.cs b/...mework/IDependencyAnalysisMarkStrategy.cs → ...mework/IDependencyAnalysisMarkStrategy.cs
diff --git a/...work/IDependencyAnalyzerLogEdgeVisitor.cs → ...work/IDependencyAnalyzerLogEdgeVisitor.cs b/...work/IDependencyAnalyzerLogEdgeVisitor.cs → ...work/IDependencyAnalyzerLogEdgeVisitor.cs
diff --git a/...work/IDependencyAnalyzerLogNodeVisitor.cs → ...work/IDependencyAnalyzerLogNodeVisitor.cs b/...work/IDependencyAnalyzerLogNodeVisitor.cs → ...work/IDependencyAnalyzerLogNodeVisitor.cs
diff --git a/...dencyAnalysisFramework/IDependencyNode.cs → ...dencyAnalysisFramework/IDependencyNode.cs b/...dencyAnalysisFramework/IDependencyNode.cs → ...dencyAnalysisFramework/IDependencyNode.cs
diff --git a/...mpiler.DependencyAnalysisFramework.csproj → ...mpiler.DependencyAnalysisFramework.csproj b/...mpiler.DependencyAnalysisFramework.csproj → ...mpiler.DependencyAnalysisFramework.csproj
diff --git a/...endencyAnalysisFramework/NoLogStrategy.cs → ...endencyAnalysisFramework/NoLogStrategy.cs b/...endencyAnalysisFramework/NoLogStrategy.cs → ...endencyAnalysisFramework/NoLogStrategy.cs
diff --git a/...dencyAnalysisFramework/PerfEventSource.cs → ...dencyAnalysisFramework/PerfEventSource.cs b/...dencyAnalysisFramework/PerfEventSource.cs → ...dencyAnalysisFramework/PerfEventSource.cs
diff --git a/...dyToRun/CodeGen/ReadyToRunObjectWriter.cs → ...dyToRun/CodeGen/ReadyToRunObjectWriter.cs b/...dyToRun/CodeGen/ReadyToRunObjectWriter.cs → ...dyToRun/CodeGen/ReadyToRunObjectWriter.cs
diff --git a/...iler/CompilationModuleGroup.ReadyToRun.cs → ...iler/CompilationModuleGroup.ReadyToRun.cs b/...iler/CompilationModuleGroup.ReadyToRun.cs → ...iler/CompilationModuleGroup.ReadyToRun.cs
diff --git a/...ependencyAnalysis/AllMethodsOnTypeNode.cs → ...ependencyAnalysis/AllMethodsOnTypeNode.cs b/...ependencyAnalysis/AllMethodsOnTypeNode.cs → ...ependencyAnalysis/AllMethodsOnTypeNode.cs
diff --git a/...ndencyAnalysis/ArrayOfEmbeddedDataNode.cs → ...ndencyAnalysis/ArrayOfEmbeddedDataNode.cs b/...ndencyAnalysis/ArrayOfEmbeddedDataNode.cs → ...ndencyAnalysis/ArrayOfEmbeddedDataNode.cs
diff --git a/...cyAnalysis/ArrayOfEmbeddedPointersNode.cs → ...cyAnalysis/ArrayOfEmbeddedPointersNode.cs b/...cyAnalysis/ArrayOfEmbeddedPointersNode.cs → ...cyAnalysis/ArrayOfEmbeddedPointersNode.cs
diff --git a/.../DependencyAnalysis/EmbeddedObjectNode.cs → .../DependencyAnalysis/EmbeddedObjectNode.cs b/.../DependencyAnalysis/EmbeddedObjectNode.cs → .../DependencyAnalysis/EmbeddedObjectNode.cs
diff --git a/...nalysis/EmbeddedPointerIndirectionNode.cs → ...nalysis/EmbeddedPointerIndirectionNode.cs b/...nalysis/EmbeddedPointerIndirectionNode.cs → ...nalysis/EmbeddedPointerIndirectionNode.cs
diff --git a/...endencyAnalysis/ReadyToRun/ArgIterator.cs → ...endencyAnalysis/ReadyToRun/ArgIterator.cs b/...endencyAnalysis/ReadyToRun/ArgIterator.cs → ...endencyAnalysis/ReadyToRun/ArgIterator.cs
diff --git a/...yAnalysis/ReadyToRun/AssemblyTableNode.cs → ...yAnalysis/ReadyToRun/AssemblyTableNode.cs b/...yAnalysis/ReadyToRun/AssemblyTableNode.cs → ...yAnalysis/ReadyToRun/AssemblyTableNode.cs
diff --git a/...ReadyToRun/AttributePresenceFilterNode.cs → ...ReadyToRun/AttributePresenceFilterNode.cs b/...ReadyToRun/AttributePresenceFilterNode.cs → ...ReadyToRun/AttributePresenceFilterNode.cs
diff --git a/...yAnalysis/ReadyToRun/ByteArrayComparer.cs → ...yAnalysis/ReadyToRun/ByteArrayComparer.cs b/...yAnalysis/ReadyToRun/ByteArrayComparer.cs → ...yAnalysis/ReadyToRun/ByteArrayComparer.cs
diff --git a/...ysis/ReadyToRun/CompilerIdentifierNode.cs → ...ysis/ReadyToRun/CompilerIdentifierNode.cs b/...ysis/ReadyToRun/CompilerIdentifierNode.cs → ...ysis/ReadyToRun/CompilerIdentifierNode.cs
diff --git a/...nalysis/ReadyToRun/CopiedCorHeaderNode.cs → ...nalysis/ReadyToRun/CopiedCorHeaderNode.cs b/...nalysis/ReadyToRun/CopiedCorHeaderNode.cs → ...nalysis/ReadyToRun/CopiedCorHeaderNode.cs
diff --git a/...Analysis/ReadyToRun/CopiedFieldRvaNode.cs → ...Analysis/ReadyToRun/CopiedFieldRvaNode.cs b/...Analysis/ReadyToRun/CopiedFieldRvaNode.cs → ...Analysis/ReadyToRun/CopiedFieldRvaNode.cs
diff --git a/.../ReadyToRun/CopiedManagedResourcesNode.cs → .../ReadyToRun/CopiedManagedResourcesNode.cs b/.../ReadyToRun/CopiedManagedResourcesNode.cs → .../ReadyToRun/CopiedManagedResourcesNode.cs
diff --git a/...ysis/ReadyToRun/CopiedMetadataBlobNode.cs → ...ysis/ReadyToRun/CopiedMetadataBlobNode.cs b/...ysis/ReadyToRun/CopiedMetadataBlobNode.cs → ...ysis/ReadyToRun/CopiedMetadataBlobNode.cs
diff --git a/...Analysis/ReadyToRun/CopiedMethodILNode.cs → ...Analysis/ReadyToRun/CopiedMethodILNode.cs b/...Analysis/ReadyToRun/CopiedMethodILNode.cs → ...Analysis/ReadyToRun/CopiedMethodILNode.cs
diff --git a/...adyToRun/CopiedStrongNameSignatureNode.cs → ...adyToRun/CopiedStrongNameSignatureNode.cs b/...adyToRun/CopiedStrongNameSignatureNode.cs → ...adyToRun/CopiedStrongNameSignatureNode.cs
diff --git a/...sis/ReadyToRun/DebugDirectoryEntryNode.cs → ...sis/ReadyToRun/DebugDirectoryEntryNode.cs b/...sis/ReadyToRun/DebugDirectoryEntryNode.cs → ...sis/ReadyToRun/DebugDirectoryEntryNode.cs
diff --git a/...Analysis/ReadyToRun/DebugDirectoryNode.cs → ...Analysis/ReadyToRun/DebugDirectoryNode.cs b/...Analysis/ReadyToRun/DebugDirectoryNode.cs → ...Analysis/ReadyToRun/DebugDirectoryNode.cs
diff --git a/...Analysis/ReadyToRun/DebugInfoTableNode.cs → ...Analysis/ReadyToRun/DebugInfoTableNode.cs b/...Analysis/ReadyToRun/DebugInfoTableNode.cs → ...Analysis/ReadyToRun/DebugInfoTableNode.cs
diff --git a/...lysis/ReadyToRun/DelayLoadHelperImport.cs → ...lysis/ReadyToRun/DelayLoadHelperImport.cs b/...lysis/ReadyToRun/DelayLoadHelperImport.cs → ...lysis/ReadyToRun/DelayLoadHelperImport.cs
diff --git a/...ReadyToRun/DelayLoadHelperMethodImport.cs → ...ReadyToRun/DelayLoadHelperMethodImport.cs b/...ReadyToRun/DelayLoadHelperMethodImport.cs → ...ReadyToRun/DelayLoadHelperMethodImport.cs
diff --git a/...lysis/ReadyToRun/DelegateCtorSignature.cs → ...lysis/ReadyToRun/DelegateCtorSignature.cs b/...lysis/ReadyToRun/DelegateCtorSignature.cs → ...lysis/ReadyToRun/DelegateCtorSignature.cs
diff --git a/...sis/ReadyToRun/DevirtualizationManager.cs → ...sis/ReadyToRun/DevirtualizationManager.cs b/...sis/ReadyToRun/DevirtualizationManager.cs → ...sis/ReadyToRun/DevirtualizationManager.cs
diff --git a/...eadyToRun/ExceptionInfoLookupTableNode.cs → ...eadyToRun/ExceptionInfoLookupTableNode.cs b/...eadyToRun/ExceptionInfoLookupTableNode.cs → ...eadyToRun/ExceptionInfoLookupTableNode.cs
diff --git a/...alysis/ReadyToRun/ExternalMethodImport.cs → ...alysis/ReadyToRun/ExternalMethodImport.cs b/...alysis/ReadyToRun/ExternalMethodImport.cs → ...alysis/ReadyToRun/ExternalMethodImport.cs
diff --git a/...nalysis/ReadyToRun/FieldFixupSignature.cs → ...nalysis/ReadyToRun/FieldFixupSignature.cs b/...nalysis/ReadyToRun/FieldFixupSignature.cs → ...nalysis/ReadyToRun/FieldFixupSignature.cs
diff --git a/...ncyAnalysis/ReadyToRun/GCRefMapBuilder.cs → ...ncyAnalysis/ReadyToRun/GCRefMapBuilder.cs b/...ncyAnalysis/ReadyToRun/GCRefMapBuilder.cs → ...ncyAnalysis/ReadyToRun/GCRefMapBuilder.cs
diff --git a/...ndencyAnalysis/ReadyToRun/GCRefMapNode.cs → ...ndencyAnalysis/ReadyToRun/GCRefMapNode.cs b/...ndencyAnalysis/ReadyToRun/GCRefMapNode.cs → ...ndencyAnalysis/ReadyToRun/GCRefMapNode.cs
diff --git a/...ysis/ReadyToRun/GenericLookupSignature.cs → ...ysis/ReadyToRun/GenericLookupSignature.cs b/...ysis/ReadyToRun/GenericLookupSignature.cs → ...ysis/ReadyToRun/GenericLookupSignature.cs
diff --git a/...pendencyAnalysis/ReadyToRun/HeaderNode.cs → ...pendencyAnalysis/ReadyToRun/HeaderNode.cs b/...pendencyAnalysis/ReadyToRun/HeaderNode.cs → ...pendencyAnalysis/ReadyToRun/HeaderNode.cs
diff --git a/...r/DependencyAnalysis/ReadyToRun/Import.cs → ...r/DependencyAnalysis/ReadyToRun/Import.cs b/...r/DependencyAnalysis/ReadyToRun/Import.cs → ...r/DependencyAnalysis/ReadyToRun/Import.cs
diff --git a/...yAnalysis/ReadyToRun/ImportSectionNode.cs → ...yAnalysis/ReadyToRun/ImportSectionNode.cs b/...yAnalysis/ReadyToRun/ImportSectionNode.cs → ...yAnalysis/ReadyToRun/ImportSectionNode.cs
diff --git a/...sis/ReadyToRun/ImportSectionsTableNode.cs → ...sis/ReadyToRun/ImportSectionsTableNode.cs b/...sis/ReadyToRun/ImportSectionsTableNode.cs → ...sis/ReadyToRun/ImportSectionsTableNode.cs
diff --git a/...endencyAnalysis/ReadyToRun/ImportThunk.cs → ...endencyAnalysis/ReadyToRun/ImportThunk.cs b/...endencyAnalysis/ReadyToRun/ImportThunk.cs → ...endencyAnalysis/ReadyToRun/ImportThunk.cs
diff --git a/...cyAnalysis/ReadyToRun/InliningInfoNode.cs → ...cyAnalysis/ReadyToRun/InliningInfoNode.cs b/...cyAnalysis/ReadyToRun/InliningInfoNode.cs → ...cyAnalysis/ReadyToRun/InliningInfoNode.cs
diff --git a/...ReadyToRun/InstanceEntryPointTableNode.cs → ...ReadyToRun/InstanceEntryPointTableNode.cs b/...ReadyToRun/InstanceEntryPointTableNode.cs → ...ReadyToRun/InstanceEntryPointTableNode.cs
diff --git a/...yAnalysis/ReadyToRun/LocalMethodImport.cs → ...yAnalysis/ReadyToRun/LocalMethodImport.cs b/...yAnalysis/ReadyToRun/LocalMethodImport.cs → ...yAnalysis/ReadyToRun/LocalMethodImport.cs
diff --git a/...s/ReadyToRun/ManifestMetadataTableNode.cs → ...s/ReadyToRun/ManifestMetadataTableNode.cs b/...s/ReadyToRun/ManifestMetadataTableNode.cs → ...s/ReadyToRun/ManifestMetadataTableNode.cs
diff --git a/...s/ReadyToRun/MethodEntryPointTableNode.cs → ...s/ReadyToRun/MethodEntryPointTableNode.cs b/...s/ReadyToRun/MethodEntryPointTableNode.cs → ...s/ReadyToRun/MethodEntryPointTableNode.cs
diff --git a/...alysis/ReadyToRun/MethodFixupSignature.cs → ...alysis/ReadyToRun/MethodFixupSignature.cs b/...alysis/ReadyToRun/MethodFixupSignature.cs → ...alysis/ReadyToRun/MethodFixupSignature.cs
diff --git a/...cyAnalysis/ReadyToRun/MethodGCInfoNode.cs → ...cyAnalysis/ReadyToRun/MethodGCInfoNode.cs b/...cyAnalysis/ReadyToRun/MethodGCInfoNode.cs → ...cyAnalysis/ReadyToRun/MethodGCInfoNode.cs
diff --git a/...cyAnalysis/ReadyToRun/MethodWithGCInfo.cs → ...cyAnalysis/ReadyToRun/MethodWithGCInfo.cs b/...cyAnalysis/ReadyToRun/MethodWithGCInfo.cs → ...cyAnalysis/ReadyToRun/MethodWithGCInfo.cs
diff --git a/...endencyAnalysis/ReadyToRun/ModuleToken.cs → ...endencyAnalysis/ReadyToRun/ModuleToken.cs b/...endencyAnalysis/ReadyToRun/ModuleToken.cs → ...endencyAnalysis/ReadyToRun/ModuleToken.cs
diff --git a/...nalysis/ReadyToRun/ModuleTokenResolver.cs → ...nalysis/ReadyToRun/ModuleTokenResolver.cs b/...nalysis/ReadyToRun/ModuleTokenResolver.cs → ...nalysis/ReadyToRun/ModuleTokenResolver.cs
diff --git a/...ysis/ReadyToRun/NewArrayFixupSignature.cs → ...ysis/ReadyToRun/NewArrayFixupSignature.cs b/...ysis/ReadyToRun/NewArrayFixupSignature.cs → ...ysis/ReadyToRun/NewArrayFixupSignature.cs
diff --git a/...sis/ReadyToRun/NewObjectFixupSignature.cs → ...sis/ReadyToRun/NewObjectFixupSignature.cs b/...sis/ReadyToRun/NewObjectFixupSignature.cs → ...sis/ReadyToRun/NewObjectFixupSignature.cs
diff --git a/...ndencyAnalysis/ReadyToRun/NibbleWriter.cs → ...ndencyAnalysis/ReadyToRun/NibbleWriter.cs b/...ndencyAnalysis/ReadyToRun/NibbleWriter.cs → ...ndencyAnalysis/ReadyToRun/NibbleWriter.cs
diff --git a/...eadyToRun/OwnerCompositeExecutableNode.cs → ...eadyToRun/OwnerCompositeExecutableNode.cs b/...eadyToRun/OwnerCompositeExecutableNode.cs → ...eadyToRun/OwnerCompositeExecutableNode.cs
diff --git a/...nalysis/ReadyToRun/PrecodeHelperImport.cs → ...nalysis/ReadyToRun/PrecodeHelperImport.cs b/...nalysis/ReadyToRun/PrecodeHelperImport.cs → ...nalysis/ReadyToRun/PrecodeHelperImport.cs
diff --git a/...nalysis/ReadyToRun/PrecodeMethodImport.cs → ...nalysis/ReadyToRun/PrecodeMethodImport.cs b/...nalysis/ReadyToRun/PrecodeMethodImport.cs → ...nalysis/ReadyToRun/PrecodeMethodImport.cs
diff --git a/...ncyAnalysis/ReadyToRun/ProfileDataNode.cs → ...ncyAnalysis/ReadyToRun/ProfileDataNode.cs b/...ncyAnalysis/ReadyToRun/ProfileDataNode.cs → ...ncyAnalysis/ReadyToRun/ProfileDataNode.cs
diff --git a/...ysis/ReadyToRun/ProfileDataSectionNode.cs → ...ysis/ReadyToRun/ProfileDataSectionNode.cs b/...ysis/ReadyToRun/ProfileDataSectionNode.cs → ...ysis/ReadyToRun/ProfileDataSectionNode.cs
diff --git a/...s/ReadyToRun/ReadyToRunHelperSignature.cs → ...s/ReadyToRun/ReadyToRunHelperSignature.cs b/...s/ReadyToRun/ReadyToRunHelperSignature.cs → ...s/ReadyToRun/ReadyToRunHelperSignature.cs
diff --git a/...adyToRunInstructionSetSupportSignature.cs → ...adyToRunInstructionSetSupportSignature.cs b/...adyToRunInstructionSetSupportSignature.cs → ...adyToRunInstructionSetSupportSignature.cs
diff --git a/.../ReadyToRun/RuntimeFunctionsGCInfoNode.cs → .../ReadyToRun/RuntimeFunctionsGCInfoNode.cs b/.../ReadyToRun/RuntimeFunctionsGCInfoNode.cs → .../ReadyToRun/RuntimeFunctionsGCInfoNode.cs
diff --git a/...s/ReadyToRun/RuntimeFunctionsTableNode.cs → ...s/ReadyToRun/RuntimeFunctionsTableNode.cs b/...s/ReadyToRun/RuntimeFunctionsTableNode.cs → ...s/ReadyToRun/RuntimeFunctionsTableNode.cs
diff --git a/...ependencyAnalysis/ReadyToRun/Signature.cs → ...ependencyAnalysis/ReadyToRun/Signature.cs b/...ependencyAnalysis/ReadyToRun/Signature.cs → ...ependencyAnalysis/ReadyToRun/Signature.cs
diff --git a/...cyAnalysis/ReadyToRun/SignatureBuilder.cs → ...cyAnalysis/ReadyToRun/SignatureBuilder.cs b/...cyAnalysis/ReadyToRun/SignatureBuilder.cs → ...cyAnalysis/ReadyToRun/SignatureBuilder.cs
diff --git a/...cyAnalysis/ReadyToRun/SignatureContext.cs → ...cyAnalysis/ReadyToRun/SignatureContext.cs b/...cyAnalysis/ReadyToRun/SignatureContext.cs → ...cyAnalysis/ReadyToRun/SignatureContext.cs
diff --git a/...ignatureEmbeddedPointerIndirectionNode.cs → ...ignatureEmbeddedPointerIndirectionNode.cs b/...ignatureEmbeddedPointerIndirectionNode.cs → ...ignatureEmbeddedPointerIndirectionNode.cs
diff --git a/...ndencyAnalysis/ReadyToRun/StringImport.cs → ...ndencyAnalysis/ReadyToRun/StringImport.cs b/...ndencyAnalysis/ReadyToRun/StringImport.cs → ...ndencyAnalysis/ReadyToRun/StringImport.cs
diff --git a/...lysis/ReadyToRun/StringImportSignature.cs → ...lysis/ReadyToRun/StringImportSignature.cs b/...lysis/ReadyToRun/StringImportSignature.cs → ...lysis/ReadyToRun/StringImportSignature.cs
diff --git a/...ysis/ReadyToRun/Target_ARM/ImportThunk.cs → ...ysis/ReadyToRun/Target_ARM/ImportThunk.cs b/...ysis/ReadyToRun/Target_ARM/ImportThunk.cs → ...ysis/ReadyToRun/Target_ARM/ImportThunk.cs
diff --git a/...is/ReadyToRun/Target_ARM64/ImportThunk.cs → ...is/ReadyToRun/Target_ARM64/ImportThunk.cs b/...is/ReadyToRun/Target_ARM64/ImportThunk.cs → ...is/ReadyToRun/Target_ARM64/ImportThunk.cs
diff --git a/...ysis/ReadyToRun/Target_X64/ImportThunk.cs → ...ysis/ReadyToRun/Target_X64/ImportThunk.cs b/...ysis/ReadyToRun/Target_X64/ImportThunk.cs → ...ysis/ReadyToRun/Target_X64/ImportThunk.cs
diff --git a/...ysis/ReadyToRun/Target_X86/ImportThunk.cs → ...ysis/ReadyToRun/Target_X86/ImportThunk.cs b/...ysis/ReadyToRun/Target_X86/ImportThunk.cs → ...ysis/ReadyToRun/Target_X86/ImportThunk.cs
diff --git a/...ncyAnalysis/ReadyToRun/TransitionBlock.cs → ...ncyAnalysis/ReadyToRun/TransitionBlock.cs b/...ncyAnalysis/ReadyToRun/TransitionBlock.cs → ...ncyAnalysis/ReadyToRun/TransitionBlock.cs
diff --git a/...Analysis/ReadyToRun/TypeFixupSignature.cs → ...Analysis/ReadyToRun/TypeFixupSignature.cs b/...Analysis/ReadyToRun/TypeFixupSignature.cs → ...Analysis/ReadyToRun/TypeFixupSignature.cs
diff --git a/...encyAnalysis/ReadyToRun/TypesTableNode.cs → ...encyAnalysis/ReadyToRun/TypesTableNode.cs b/...encyAnalysis/ReadyToRun/TypesTableNode.cs → ...encyAnalysis/ReadyToRun/TypesTableNode.cs
diff --git a/...Analysis/ReadyToRun/Win32ResourcesNode.cs → ...Analysis/ReadyToRun/Win32ResourcesNode.cs b/...Analysis/ReadyToRun/Win32ResourcesNode.cs → ...Analysis/ReadyToRun/Win32ResourcesNode.cs
diff --git a/...yAnalysis/ReadyToRunCodegenNodeFactory.cs → ...yAnalysis/ReadyToRunCodegenNodeFactory.cs b/...yAnalysis/ReadyToRunCodegenNodeFactory.cs → ...yAnalysis/ReadyToRunCodegenNodeFactory.cs
diff --git a/...cyAnalysis/ReadyToRunSymbolNodeFactory.cs → ...cyAnalysis/ReadyToRunSymbolNodeFactory.cs b/...cyAnalysis/ReadyToRunSymbolNodeFactory.cs → ...cyAnalysis/ReadyToRunSymbolNodeFactory.cs
diff --git a/...SortableDependencyNodeCompilerSpecific.cs → ...SortableDependencyNodeCompilerSpecific.cs b/...SortableDependencyNodeCompilerSpecific.cs → ...SortableDependencyNodeCompilerSpecific.cs
diff --git a/...piler/DependencyAnalysis/TypeAndMethod.cs → ...piler/DependencyAnalysis/TypeAndMethod.cs b/...piler/DependencyAnalysis/TypeAndMethod.cs → ...piler/DependencyAnalysis/TypeAndMethod.cs
diff --git a/...ToRun/Compiler/IRootingServiceProvider.cs → ...ToRun/Compiler/IRootingServiceProvider.cs b/...ToRun/Compiler/IRootingServiceProvider.cs → ...ToRun/Compiler/IRootingServiceProvider.cs
diff --git a/...r.ReadyToRun/Compiler/MethodExtensions.cs → ...r.ReadyToRun/Compiler/MethodExtensions.cs b/...r.ReadyToRun/Compiler/MethodExtensions.cs → ...r.ReadyToRun/Compiler/MethodExtensions.cs
diff --git a/...mpiler/NoMethodsCompilationModuleGroup.cs → ...mpiler/NoMethodsCompilationModuleGroup.cs b/...mpiler/NoMethodsCompilationModuleGroup.cs → ...mpiler/NoMethodsCompilationModuleGroup.cs
diff --git a/...er.ReadyToRun/Compiler/PerfEventSource.cs → ...er.ReadyToRun/Compiler/PerfEventSource.cs b/...er.ReadyToRun/Compiler/PerfEventSource.cs → ...er.ReadyToRun/Compiler/PerfEventSource.cs
diff --git a/...mpiler.ReadyToRun/Compiler/ProfileData.cs → ...mpiler.ReadyToRun/Compiler/ProfileData.cs b/...mpiler.ReadyToRun/Compiler/ProfileData.cs → ...mpiler.ReadyToRun/Compiler/ProfileData.cs
diff --git a/.../Compiler/ReadyToRunCodegenCompilation.cs → .../Compiler/ReadyToRunCodegenCompilation.cs b/.../Compiler/ReadyToRunCodegenCompilation.cs → .../Compiler/ReadyToRunCodegenCompilation.cs
diff --git a/...er/ReadyToRunCodegenCompilationBuilder.cs → ...er/ReadyToRunCodegenCompilationBuilder.cs b/...er/ReadyToRunCodegenCompilationBuilder.cs → ...er/ReadyToRunCodegenCompilationBuilder.cs
diff --git a/...r/ReadyToRunCompilationModuleGroupBase.cs → ...r/ReadyToRunCompilationModuleGroupBase.cs b/...r/ReadyToRunCompilationModuleGroupBase.cs → ...r/ReadyToRunCompilationModuleGroupBase.cs
diff --git a/...Run/Compiler/ReadyToRunCompilerContext.cs → ...Run/Compiler/ReadyToRunCompilerContext.cs b/...Run/Compiler/ReadyToRunCompilerContext.cs → ...Run/Compiler/ReadyToRunCompilerContext.cs
diff --git a/...Compiler/ReadyToRunFileLayoutOptimizer.cs → ...Compiler/ReadyToRunFileLayoutOptimizer.cs b/...Compiler/ReadyToRunFileLayoutOptimizer.cs → ...Compiler/ReadyToRunFileLayoutOptimizer.cs
diff --git a/...ReadyToRun/Compiler/ReadyToRunHashCode.cs → ...ReadyToRun/Compiler/ReadyToRunHashCode.cs b/...ReadyToRun/Compiler/ReadyToRunHashCode.cs → ...ReadyToRun/Compiler/ReadyToRunHashCode.cs
diff --git a/...Compiler/ReadyToRunLibraryRootProvider.cs → ...Compiler/ReadyToRunLibraryRootProvider.cs b/...Compiler/ReadyToRunLibraryRootProvider.cs → ...Compiler/ReadyToRunLibraryRootProvider.cs
diff --git a/...ReadyToRunMetadataFieldLayoutAlgorithm.cs → ...ReadyToRunMetadataFieldLayoutAlgorithm.cs b/...ReadyToRunMetadataFieldLayoutAlgorithm.cs → ...ReadyToRunMetadataFieldLayoutAlgorithm.cs
diff --git a/...unSingleAssemblyCompilationModuleGroup.cs → ...unSingleAssemblyCompilationModuleGroup.cs b/...unSingleAssemblyCompilationModuleGroup.cs → ...unSingleAssemblyCompilationModuleGroup.cs
diff --git a/...yToRun/Compiler/ReadyToRunTableManager.cs → ...yToRun/Compiler/ReadyToRunTableManager.cs b/...yToRun/Compiler/ReadyToRunTableManager.cs → ...yToRun/Compiler/ReadyToRunTableManager.cs
diff --git a/...n/Compiler/RuntimeDeterminedTypeHelper.cs → ...n/Compiler/RuntimeDeterminedTypeHelper.cs b/...n/Compiler/RuntimeDeterminedTypeHelper.cs → ...n/Compiler/RuntimeDeterminedTypeHelper.cs
diff --git a/...ler/SingleMethodCompilationModuleGroup.cs → ...ler/SingleMethodCompilationModuleGroup.cs b/...ler/SingleMethodCompilationModuleGroup.cs → ...ler/SingleMethodCompilationModuleGroup.cs
diff --git a/...piler/SystemObjectFieldLayoutAlgorithm.cs → ...piler/SystemObjectFieldLayoutAlgorithm.cs b/...piler/SystemObjectFieldLayoutAlgorithm.cs → ...piler/SystemObjectFieldLayoutAlgorithm.cs
diff --git a/...ILCompiler.ReadyToRun/IBC/IBCDataModel.cs → ...ILCompiler.ReadyToRun/IBC/IBCDataModel.cs b/...ILCompiler.ReadyToRun/IBC/IBCDataModel.cs → ...ILCompiler.ReadyToRun/IBC/IBCDataModel.cs
diff --git a/...LCompiler.ReadyToRun/IBC/IBCDataReader.cs → ...LCompiler.ReadyToRun/IBC/IBCDataReader.cs b/...LCompiler.ReadyToRun/IBC/IBCDataReader.cs → ...LCompiler.ReadyToRun/IBC/IBCDataReader.cs
diff --git a/...Compiler.ReadyToRun/IBC/IBCProfileData.cs → ...Compiler.ReadyToRun/IBC/IBCProfileData.cs b/...Compiler.ReadyToRun/IBC/IBCProfileData.cs → ...Compiler.ReadyToRun/IBC/IBCProfileData.cs
diff --git a/...mpiler.ReadyToRun/IBC/IBCProfileParser.cs → ...mpiler.ReadyToRun/IBC/IBCProfileParser.cs b/...mpiler.ReadyToRun/IBC/IBCProfileParser.cs → ...mpiler.ReadyToRun/IBC/IBCProfileParser.cs
diff --git a/...piler.ReadyToRun/IBC/MIbcProfileParser.cs → ...piler.ReadyToRun/IBC/MIbcProfileParser.cs b/...piler.ReadyToRun/IBC/MIbcProfileParser.cs → ...piler.ReadyToRun/IBC/MIbcProfileParser.cs
diff --git a/...mpiler.ReadyToRun/IBC/ReaderExtensions.cs → ...mpiler.ReadyToRun/IBC/ReaderExtensions.cs b/...mpiler.ReadyToRun/IBC/ReaderExtensions.cs → ...mpiler.ReadyToRun/IBC/ReaderExtensions.cs
diff --git a/...ler.ReadyToRun/IL/ReadyToRunILProvider.cs → ...ler.ReadyToRun/IL/ReadyToRunILProvider.cs b/...ler.ReadyToRun/IL/ReadyToRunILProvider.cs → ...ler.ReadyToRun/IL/ReadyToRunILProvider.cs
diff --git a/...r.ReadyToRun/IL/Stubs/PInvokeILEmitter.cs → ...r.ReadyToRun/IL/Stubs/PInvokeILEmitter.cs b/...r.ReadyToRun/IL/Stubs/PInvokeILEmitter.cs → ...r.ReadyToRun/IL/Stubs/PInvokeILEmitter.cs
diff --git a/...r.ReadyToRun/ILCompiler.ReadyToRun.csproj → ...r.ReadyToRun/ILCompiler.ReadyToRun.csproj b/...r.ReadyToRun/ILCompiler.ReadyToRun.csproj → ...r.ReadyToRun/ILCompiler.ReadyToRun.csproj
diff --git a/...ToRun/Interop/IL/Marshaller.ReadyToRun.cs → ...ToRun/Interop/IL/Marshaller.ReadyToRun.cs b/...ToRun/Interop/IL/Marshaller.ReadyToRun.cs → ...ToRun/Interop/IL/Marshaller.ReadyToRun.cs
diff --git a/...un/JitInterface/CorInfoImpl.ReadyToRun.cs → ...un/JitInterface/CorInfoImpl.ReadyToRun.cs b/...un/JitInterface/CorInfoImpl.ReadyToRun.cs → ...un/JitInterface/CorInfoImpl.ReadyToRun.cs
diff --git a/...JitInterface/UnboxingMethodDescFactory.cs → ...JitInterface/UnboxingMethodDescFactory.cs b/...JitInterface/UnboxingMethodDescFactory.cs → ...JitInterface/UnboxingMethodDescFactory.cs
diff --git a/...ReadyToRun/ObjectWriter/MapFileBuilder.cs → ...ReadyToRun/ObjectWriter/MapFileBuilder.cs b/...ReadyToRun/ObjectWriter/MapFileBuilder.cs → ...ReadyToRun/ObjectWriter/MapFileBuilder.cs
diff --git a/...r.ReadyToRun/ObjectWriter/R2RPEBuilder.cs → ...r.ReadyToRun/ObjectWriter/R2RPEBuilder.cs b/...r.ReadyToRun/ObjectWriter/R2RPEBuilder.cs → ...r.ReadyToRun/ObjectWriter/R2RPEBuilder.cs
diff --git a/...adyToRun/ObjectWriter/RelocationHelper.cs → ...adyToRun/ObjectWriter/RelocationHelper.cs b/...adyToRun/ObjectWriter/RelocationHelper.cs → ...adyToRun/ObjectWriter/RelocationHelper.cs
diff --git a/...ReadyToRun/ObjectWriter/SectionBuilder.cs → ...ReadyToRun/ObjectWriter/SectionBuilder.cs b/...ReadyToRun/ObjectWriter/SectionBuilder.cs → ...ReadyToRun/ObjectWriter/SectionBuilder.cs
diff --git a/...adyToRun/ObjectWriter/TargetExtensions.cs → ...adyToRun/ObjectWriter/TargetExtensions.cs b/...adyToRun/ObjectWriter/TargetExtensions.cs → ...adyToRun/ObjectWriter/TargetExtensions.cs
diff --git a/...Run/Win32Resources/ResourceData.Reader.cs → ...Run/Win32Resources/ResourceData.Reader.cs b/...Run/Win32Resources/ResourceData.Reader.cs → ...Run/Win32Resources/ResourceData.Reader.cs
diff --git a/...ources/ResourceData.ResourcesDataModel.cs → ...ources/ResourceData.ResourcesDataModel.cs b/...ources/ResourceData.ResourcesDataModel.cs → ...ources/ResourceData.ResourcesDataModel.cs
diff --git a/...s/ResourceData.UpdateResourceDataModel.cs → ...s/ResourceData.UpdateResourceDataModel.cs b/...s/ResourceData.UpdateResourceDataModel.cs → ...s/ResourceData.UpdateResourceDataModel.cs
diff --git a/...n32Resources/ResourceData.Win32Structs.cs → ...n32Resources/ResourceData.Win32Structs.cs b/...n32Resources/ResourceData.Win32Structs.cs → ...n32Resources/ResourceData.Win32Structs.cs
diff --git a/...ReadyToRun/Win32Resources/ResourceData.cs → ...ReadyToRun/Win32Resources/ResourceData.cs b/...ReadyToRun/Win32Resources/ResourceData.cs → ...ReadyToRun/Win32Resources/ResourceData.cs
diff --git a/...ler.Reflection.ReadyToRun/Amd64/GcInfo.cs → ...ler.Reflection.ReadyToRun/Amd64/GcInfo.cs b/...ler.Reflection.ReadyToRun/Amd64/GcInfo.cs → ...ler.Reflection.ReadyToRun/Amd64/GcInfo.cs
diff --git a/...eflection.ReadyToRun/Amd64/GcSlotTable.cs → ...eflection.ReadyToRun/Amd64/GcSlotTable.cs b/...eflection.ReadyToRun/Amd64/GcSlotTable.cs → ...eflection.ReadyToRun/Amd64/GcSlotTable.cs
diff --git a/...flection.ReadyToRun/Amd64/GcTransition.cs → ...flection.ReadyToRun/Amd64/GcTransition.cs b/...flection.ReadyToRun/Amd64/GcTransition.cs → ...flection.ReadyToRun/Amd64/GcTransition.cs
diff --git a/....Reflection.ReadyToRun/Amd64/Registers.cs → ....Reflection.ReadyToRun/Amd64/Registers.cs b/....Reflection.ReadyToRun/Amd64/Registers.cs → ....Reflection.ReadyToRun/Amd64/Registers.cs
diff --git a/...Reflection.ReadyToRun/Amd64/UnwindInfo.cs → ...Reflection.ReadyToRun/Amd64/UnwindInfo.cs b/...Reflection.ReadyToRun/Amd64/UnwindInfo.cs → ...Reflection.ReadyToRun/Amd64/UnwindInfo.cs
diff --git a/...er.Reflection.ReadyToRun/Arm/Registers.cs → ...er.Reflection.ReadyToRun/Arm/Registers.cs b/...er.Reflection.ReadyToRun/Arm/Registers.cs → ...er.Reflection.ReadyToRun/Arm/Registers.cs
diff --git a/...r.Reflection.ReadyToRun/Arm/UnwindInfo.cs → ...r.Reflection.ReadyToRun/Arm/UnwindInfo.cs b/...r.Reflection.ReadyToRun/Arm/UnwindInfo.cs → ...r.Reflection.ReadyToRun/Arm/UnwindInfo.cs
diff --git a/....Reflection.ReadyToRun/Arm64/Registers.cs → ....Reflection.ReadyToRun/Arm64/Registers.cs b/....Reflection.ReadyToRun/Arm64/Registers.cs → ....Reflection.ReadyToRun/Arm64/Registers.cs
diff --git a/...Reflection.ReadyToRun/Arm64/UnwindInfo.cs → ...Reflection.ReadyToRun/Arm64/UnwindInfo.cs b/...Reflection.ReadyToRun/Arm64/UnwindInfo.cs → ...Reflection.ReadyToRun/Arm64/UnwindInfo.cs
diff --git a/...mpiler.Reflection.ReadyToRun/DebugInfo.cs → ...mpiler.Reflection.ReadyToRun/DebugInfo.cs b/...mpiler.Reflection.ReadyToRun/DebugInfo.cs → ...mpiler.Reflection.ReadyToRun/DebugInfo.cs
diff --git a/...r.Reflection.ReadyToRun/DebugInfoTypes.cs → ...r.Reflection.ReadyToRun/DebugInfoTypes.cs b/...r.Reflection.ReadyToRun/DebugInfoTypes.cs → ...r.Reflection.ReadyToRun/DebugInfoTypes.cs
diff --git a/...n.ReadyToRun/DisassemblingTypeProvider.cs → ...n.ReadyToRun/DisassemblingTypeProvider.cs b/...n.ReadyToRun/DisassemblingTypeProvider.cs → ...n.ReadyToRun/DisassemblingTypeProvider.cs
diff --git a/...LCompiler.Reflection.ReadyToRun/EHInfo.cs → ...LCompiler.Reflection.ReadyToRun/EHInfo.cs b/...LCompiler.Reflection.ReadyToRun/EHInfo.cs → ...LCompiler.Reflection.ReadyToRun/EHInfo.cs
diff --git a/...iler.Reflection.ReadyToRun/GCInfoTypes.cs → ...iler.Reflection.ReadyToRun/GCInfoTypes.cs b/...iler.Reflection.ReadyToRun/GCInfoTypes.cs → ...iler.Reflection.ReadyToRun/GCInfoTypes.cs
diff --git a/...ompiler.Reflection.ReadyToRun/GCRefMap.cs → ...ompiler.Reflection.ReadyToRun/GCRefMap.cs b/...ompiler.Reflection.ReadyToRun/GCRefMap.cs → ...ompiler.Reflection.ReadyToRun/GCRefMap.cs
diff --git a/...eflection.ReadyToRun/IAssemblyResolver.cs → ...eflection.ReadyToRun/IAssemblyResolver.cs b/...eflection.ReadyToRun/IAssemblyResolver.cs → ...eflection.ReadyToRun/IAssemblyResolver.cs
diff --git a/...n/ILCompiler.Reflection.ReadyToRun.csproj → ...n/ILCompiler.Reflection.ReadyToRun.csproj b/...n/ILCompiler.Reflection.ReadyToRun.csproj → ...n/ILCompiler.Reflection.ReadyToRun.csproj
diff --git a/...lection.ReadyToRun/InliningInfoSection.cs → ...lection.ReadyToRun/InliningInfoSection.cs b/...lection.ReadyToRun/InliningInfoSection.cs → ...lection.ReadyToRun/InliningInfoSection.cs
diff --git a/...ection.ReadyToRun/InliningInfoSection2.cs → ...ection.ReadyToRun/InliningInfoSection2.cs b/...ection.ReadyToRun/InliningInfoSection2.cs → ...ection.ReadyToRun/InliningInfoSection2.cs
diff --git a/...iler.Reflection.ReadyToRun/NativeArray.cs → ...iler.Reflection.ReadyToRun/NativeArray.cs b/...iler.Reflection.ReadyToRun/NativeArray.cs → ...iler.Reflection.ReadyToRun/NativeArray.cs
diff --git a/....Reflection.ReadyToRun/NativeHashtable.cs → ....Reflection.ReadyToRun/NativeHashtable.cs b/....Reflection.ReadyToRun/NativeHashtable.cs → ....Reflection.ReadyToRun/NativeHashtable.cs
diff --git a/...ler.Reflection.ReadyToRun/NativeReader.cs → ...ler.Reflection.ReadyToRun/NativeReader.cs b/...ler.Reflection.ReadyToRun/NativeReader.cs → ...ler.Reflection.ReadyToRun/NativeReader.cs
diff --git a/...ler.Reflection.ReadyToRun/NibbleReader.cs → ...ler.Reflection.ReadyToRun/NibbleReader.cs b/...ler.Reflection.ReadyToRun/NibbleReader.cs → ...ler.Reflection.ReadyToRun/NibbleReader.cs
diff --git a/...flection.ReadyToRun/PEReaderExtensions.cs → ...flection.ReadyToRun/PEReaderExtensions.cs b/...flection.ReadyToRun/PEReaderExtensions.cs → ...flection.ReadyToRun/PEReaderExtensions.cs
diff --git a/...Reflection.ReadyToRun/ReadyToRunHeader.cs → ...Reflection.ReadyToRun/ReadyToRunHeader.cs b/...Reflection.ReadyToRun/ReadyToRunHeader.cs → ...Reflection.ReadyToRun/ReadyToRunHeader.cs
diff --git a/...ion.ReadyToRun/ReadyToRunImportSection.cs → ...ion.ReadyToRun/ReadyToRunImportSection.cs b/...ion.ReadyToRun/ReadyToRunImportSection.cs → ...ion.ReadyToRun/ReadyToRunImportSection.cs
diff --git a/...Reflection.ReadyToRun/ReadyToRunMethod.cs → ...Reflection.ReadyToRun/ReadyToRunMethod.cs b/...Reflection.ReadyToRun/ReadyToRunMethod.cs → ...Reflection.ReadyToRun/ReadyToRunMethod.cs
diff --git a/...Reflection.ReadyToRun/ReadyToRunReader.cs → ...Reflection.ReadyToRun/ReadyToRunReader.cs b/...Reflection.ReadyToRun/ReadyToRunReader.cs → ...Reflection.ReadyToRun/ReadyToRunReader.cs
diff --git a/...eflection.ReadyToRun/ReadyToRunSection.cs → ...eflection.ReadyToRun/ReadyToRunSection.cs b/...eflection.ReadyToRun/ReadyToRunSection.cs → ...eflection.ReadyToRun/ReadyToRunSection.cs
diff --git a/...lection.ReadyToRun/ReadyToRunSignature.cs → ...lection.ReadyToRun/ReadyToRunSignature.cs b/...lection.ReadyToRun/ReadyToRunSignature.cs → ...lection.ReadyToRun/ReadyToRunSignature.cs
diff --git a/...Reflection.ReadyToRun/StringExtensions.cs → ...Reflection.ReadyToRun/StringExtensions.cs b/...Reflection.ReadyToRun/StringExtensions.cs → ...Reflection.ReadyToRun/StringExtensions.cs
diff --git a/....Reflection.ReadyToRun/TransitionBlock.cs → ....Reflection.ReadyToRun/TransitionBlock.cs b/....Reflection.ReadyToRun/TransitionBlock.cs → ....Reflection.ReadyToRun/TransitionBlock.cs
diff --git a/....Reflection.ReadyToRun/x86/CallPattern.cs → ....Reflection.ReadyToRun/x86/CallPattern.cs b/....Reflection.ReadyToRun/x86/CallPattern.cs → ....Reflection.ReadyToRun/x86/CallPattern.cs
diff --git a/...piler.Reflection.ReadyToRun/x86/GcInfo.cs → ...piler.Reflection.ReadyToRun/x86/GcInfo.cs b/...piler.Reflection.ReadyToRun/x86/GcInfo.cs → ...piler.Reflection.ReadyToRun/x86/GcInfo.cs
diff --git a/....Reflection.ReadyToRun/x86/GcSlotTable.cs → ....Reflection.ReadyToRun/x86/GcSlotTable.cs b/....Reflection.ReadyToRun/x86/GcSlotTable.cs → ....Reflection.ReadyToRun/x86/GcSlotTable.cs
diff --git a/...Reflection.ReadyToRun/x86/GcTransition.cs → ...Reflection.ReadyToRun/x86/GcTransition.cs b/...Reflection.ReadyToRun/x86/GcTransition.cs → ...Reflection.ReadyToRun/x86/GcTransition.cs
diff --git a/...iler.Reflection.ReadyToRun/x86/InfoHdr.cs → ...iler.Reflection.ReadyToRun/x86/InfoHdr.cs b/...iler.Reflection.ReadyToRun/x86/InfoHdr.cs → ...iler.Reflection.ReadyToRun/x86/InfoHdr.cs
diff --git a/...er.Reflection.ReadyToRun/x86/Registers.cs → ...er.Reflection.ReadyToRun/x86/Registers.cs b/...er.Reflection.ReadyToRun/x86/Registers.cs → ...er.Reflection.ReadyToRun/x86/Registers.cs
diff --git a/...r.Reflection.ReadyToRun/x86/UnwindInfo.cs → ...r.Reflection.ReadyToRun/x86/UnwindInfo.cs b/...r.Reflection.ReadyToRun/x86/UnwindInfo.cs → ...r.Reflection.ReadyToRun/x86/UnwindInfo.cs
diff --git a/...n/ILCompiler.TypeSystem.ReadyToRun.csproj → ...n/ILCompiler.TypeSystem.ReadyToRun.csproj b/...n/ILCompiler.TypeSystem.ReadyToRun.csproj → ...n/ILCompiler.TypeSystem.ReadyToRun.csproj
diff --git a/...coreclr/src/tools/crossgen2/crossgen2.sln → src/coreclr/src/tools/aot/crossgen2.sln b/...coreclr/src/tools/crossgen2/crossgen2.sln → src/coreclr/src/tools/aot/crossgen2.sln
diff --git a/...crossgen2/crossgen2/CommandLineOptions.cs → ...tools/aot/crossgen2/CommandLineOptions.cs b/...crossgen2/crossgen2/CommandLineOptions.cs → ...tools/aot/crossgen2/CommandLineOptions.cs
diff --git a/.../src/tools/crossgen2/crossgen2/Program.cs → ...oreclr/src/tools/aot/crossgen2/Program.cs b/.../src/tools/crossgen2/crossgen2/Program.cs → ...oreclr/src/tools/aot/crossgen2/Program.cs
diff --git a/...sgen2/crossgen2/Properties/Resources.resx → ...s/aot/crossgen2/Properties/Resources.resx b/...sgen2/crossgen2/Properties/Resources.resx → ...s/aot/crossgen2/Properties/Resources.resx
diff --git a/...ools/crossgen2/crossgen2/crossgen2.csproj → .../src/tools/aot/crossgen2/crossgen2.csproj b/...ools/crossgen2/crossgen2/crossgen2.csproj → .../src/tools/aot/crossgen2/crossgen2.csproj
diff --git a/...ols/crossgen2/jitinterface/CMakeLists.txt → ...src/tools/aot/jitinterface/CMakeLists.txt b/...ols/crossgen2/jitinterface/CMakeLists.txt → ...src/tools/aot/jitinterface/CMakeLists.txt
diff --git a/...ossgen2/jitinterface/corinfoexception.cpp → ...ols/aot/jitinterface/corinfoexception.cpp b/...ossgen2/jitinterface/corinfoexception.cpp → ...ols/aot/jitinterface/corinfoexception.cpp
diff --git a/...crossgen2/jitinterface/corinfoexception.h → ...tools/aot/jitinterface/corinfoexception.h b/...crossgen2/jitinterface/corinfoexception.h → ...tools/aot/jitinterface/corinfoexception.h
diff --git a/.../tools/crossgen2/jitinterface/dllexport.h → ...lr/src/tools/aot/jitinterface/dllexport.h b/.../tools/crossgen2/jitinterface/dllexport.h → ...lr/src/tools/aot/jitinterface/dllexport.h
diff --git a/.../tools/crossgen2/jitinterface/jithost.cpp → ...lr/src/tools/aot/jitinterface/jithost.cpp b/.../tools/crossgen2/jitinterface/jithost.cpp → ...lr/src/tools/aot/jitinterface/jithost.cpp
diff --git a/...s/crossgen2/jitinterface/jitinterface.cpp → ...c/tools/aot/jitinterface/jitinterface.cpp b/...s/crossgen2/jitinterface/jitinterface.cpp → ...c/tools/aot/jitinterface/jitinterface.cpp
diff --git a/...ols/crossgen2/jitinterface/jitinterface.h → ...src/tools/aot/jitinterface/jitinterface.h b/...ols/crossgen2/jitinterface/jitinterface.h → ...src/tools/aot/jitinterface/jitinterface.h
diff --git a/...ols/crossgen2/jitinterface/jitwrapper.cpp → ...src/tools/aot/jitinterface/jitwrapper.cpp b/...ols/crossgen2/jitinterface/jitwrapper.cpp → ...src/tools/aot/jitinterface/jitwrapper.cpp
diff --git a/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.csproj b/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj" />
-    <ProjectReference Include="../crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj" />
+    <ProjectReference Include="../aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj" />
+    <ProjectReference Include="../aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.55" />
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.8.1" />

diff --git a/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.sln b/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-pgo", "dotnet-pgo.csproj", "{7DA4CC22-F01D-4505-845F-57C06E5C3F9F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.ReadyToRun", "..\crossgen2\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj", "{ED3FE303-74EB-43D1-BEA1-14484A14B22E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.ReadyToRun", "..\aot\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj", "{ED3FE303-74EB-43D1-BEA1-14484A14B22E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.ReadyToRun", "..\crossgen2\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj", "{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.ReadyToRun", "..\aot\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj", "{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj
@@ -24,6 +24,6 @@
     <PackageReference Include="System.CommandLine">
       <Version>$(SystemCommandLineVersion)</Version>
     </PackageReference>
-    <ProjectReference Include="..\crossgen2\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj" />
+    <ProjectReference Include="..\aot\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.sln b/src/coreclr/src/tools/r2rdump/R2RDump.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29703.146
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "R2RDump", "R2RDump.csproj", "{00CCF6D0-5905-428E-A2A2-2A6D09D8C257}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.ReadyToRun", "..\crossgen2\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj", "{E2A577E5-7AF3-49B3-BA78-7071B75ED64B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.ReadyToRun", "..\aot\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj", "{E2A577E5-7AF3-49B3-BA78-7071B75ED64B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
@@ -64,7 +64,7 @@
       <Crossgen2File Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)" />
     </ItemGroup>
 
-    <MSBuild Projects="$(CoreClrProjectRoot)src/tools/crossgen2/crossgen2/crossgen2.csproj"
+    <MSBuild Projects="$(CoreClrProjectRoot)src/tools/aot/crossgen2/crossgen2.csproj"
             Targets="Restore"
             Properties="
             Configuration=$(RuntimeConfiguration);
@@ -73,7 +73,7 @@
     <Output TaskParameter="TargetOutputs" ItemName="Crossgen2File" />
     </MSBuild>
 
-    <MSBuild Projects="$(CoreClrProjectRoot)src/tools/crossgen2/crossgen2/crossgen2.csproj"
+    <MSBuild Projects="$(CoreClrProjectRoot)src/tools/aot/crossgen2/crossgen2.csproj"
             Targets="GenerateDepsJsonFile"
             Properties="
             Configuration=$(RuntimeConfiguration);