dotnet · jkoritzinsky · Jul 18, 2023 · Mar 16, 2023 · Mar 17, 2023 · Mar 24, 2023
diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -278,17 +278,17 @@
       Category="clr" />
   </ItemGroup>
 
-  <!-- Build the cross-arch tools of CoreCLR for the same target architecture as an unsanitized build whenever we build a sanitized coreclr build. -->
-  <ItemGroup Condition="'$(ClrRuntimeBuildSubsets)' != '' and '$(CrossBuild)' != 'true' and '$(EnableNativeSanitizers)' != ''">
+  <!-- Build the debugging components of CoreCLR for the same target architecture as an unsanitized build whenever we build a sanitized coreclr build. -->
+  <ItemGroup Condition="'$(ClrRuntimeBuildSubsets)' != '' and '$(EnableNativeSanitizers)' != ''">
     <ProjectToBuild
       Include="$(CoreClrProjectRoot)runtime.proj"
       AdditionalProperties="%(AdditionalProperties);
-                            ClrCrossComponentsSubset=true;
+                            ClrDebugSubset=true;
                             HostArchitecture=$(BuildArchitecture);
                             PgoInstrument=false;
                             NoPgoOptimize=true;
-                            CrossBuild=false;
-                            CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1"
+                            CrossBuild=$(CrossBuild);
+                            BuildSubdirectory=unsanitized"
       UndefineProperties="EnableNativeSanitizers"
       Category="clr" />
   </ItemGroup>
@@ -311,7 +311,7 @@
                             PgoInstrument=false;
                             NoPgoOptimize=true;
                             TargetOS=linux;
-                            CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1" Category="clr" />
+                            CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1 -DBUILD_DEBUGGER_CROSS_COMPONENTS=1" Category="clr" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+alpinedac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86'">
@@ -323,7 +323,7 @@
                             PgoInstrument=false;
                             NoPgoOptimize=true;
                             TargetOS=alpine;
-                            CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1" Category="clr" />
+                            CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1 -DBUILD_DEBUGGER_CROSS_COMPONENTS=1" Category="clr" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+crossdacpack+'))">

diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd
@@ -71,6 +71,7 @@ set __Ninja=1
 set __RequestedBuildComponents=
 set __OutputRid=
 set __ExplicitHostArch=
+set __SubDir=
 
 :Arg_Loop
 if "%1" == "" goto ArgsDone
@@ -130,6 +131,7 @@ if [!__PassThroughArgs!]==[] (
 if /i "%1" == "-hostarch"            (set __HostArch=%2&set __ExplicitHostArch=1&shift&shift&goto Arg_Loop)
 if /i "%1" == "-os"                  (set __TargetOS=%2&shift&shift&goto Arg_Loop)
 if /i "%1" == "-outputrid"           (set __OutputRid=%2&shift&shift&goto Arg_Loop)
+if /i "%1" == "-subdir"              (set __SubDir=%2&shift&shift&goto Arg_Loop)
 
 if /i "%1" == "-cmakeargs"           (set __CMakeArgs=%2 %__CMakeArgs%&set __remainingArgs="!__remainingArgs:*%2=!"&shift&shift&goto Arg_Loop)
 if /i "%1" == "-configureonly"       (set __ConfigureOnly=1&set __BuildNative=1&shift&goto Arg_Loop)
@@ -217,8 +219,15 @@ set "__ArtifactsIntermediatesDir=%__RepoRootDir%\artifacts\obj\coreclr\"
 if "%__Ninja%"=="0" (set "__IntermediatesDir=%__IntermediatesDir%\ide")
 set "__PackagesBinDir=%__BinDir%\.nuget"
 
-if "%__ExplicitHostArch%" == "1" set __BinDir=%__BinDir%\%__HostArch%
-if "%__ExplicitHostArch%" == "1" set __IntermediatesDir=%__IntermediatesDir%\%__HostArch%
+if "%__ExplicitHostArch%" == "1" (
+    set __BinDir=%__BinDir%\%__HostArch%
+    set __IntermediatesDir=%__IntermediatesDir%\%__HostArch%
+)
+
+if NOT "%__SubDir%"=="" (
+    set __BinDir=%__BinDir%\%__SubDir%
+    set __IntermediatesDir=%__IntermediatesDir%\%__SubDir%
+)
 
 REM Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash
 set "__CMakeBinDir=%__BinDir%"
@@ -318,6 +327,9 @@ for /f "delims=" %%a in ("-%__RequestedBuildComponents%-") do (
     if not "!string:-crosscomponents-=!"=="!string!" (
         set __CMakeTarget=!__CMakeTarget! crosscomponents
     )
+    if not "!string:-debug-=!"=="!string!" (
+        set __CMakeTarget=!__CMakeTarget! debug
+    )
 )
 if "!__CMakeTarget!" == "" (
     set __CMakeTarget=install

diff --git a/src/coreclr/build-runtime.sh b/src/coreclr/build-runtime.sh
@@ -23,7 +23,7 @@ usage_list+=("-pgoinstrument: generate instrumented code for profile guided opti
 usage_list+=("-skipcrossarchnative: Skip building cross-architecture native binaries.")
 usage_list+=("-staticanalyzer: use scan_build static analyzer.")
 usage_list+=("-component: Build individual components instead of the full project. Available options are 'hosts', 'jit', 'runtime', 'paltests', 'alljits', 'iltools', 'nativeaot', and 'spmi'. Can be specified multiple times.")
-usage_list+=("-forcearchdir: Append a directory with the name of the host architecture to the intermediate and output paths.")
+usage_list+=("-subdir: Append a directory with the provided name to the obj and bin paths.")
 
 setup_dirs_local()
 {
@@ -54,6 +54,11 @@ handle_arguments_local() {
             __RequestedBuildComponents="$__RequestedBuildComponents $2"
             __ShiftArgs=1
             ;;
+
+        subdir|-subdir)
+            __SubDir="$2"
+            __ShiftArgs=1
+            ;;
 
         *)
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
@@ -100,6 +105,7 @@ __UseNinja=0
 __VerboseBuild=0
 __CMakeArgs=""
 __RequestedBuildComponents=""
+__SubDir=""
 
 source "$__ProjectRoot"/_build-commons.sh
 
@@ -121,6 +127,11 @@ if [[ "$__ExplicitHostArch" == 1 ]]; then
     __BinDir="$__BinDir/$__HostArch"
 fi
 
+if [[ -n "$__SubDir" ]]; then
+    __IntermediatesDir="$__IntermediatesDir/$__SubDir"
+    __BinDir="$__BinDir/$__SubDir"
+fi
+
 # CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set.
 # This is needed by CLI to function.
 if [[ -z "$HOME" ]]; then

diff --git a/src/coreclr/components.cmake b/src/coreclr/components.cmake
@@ -7,6 +7,7 @@ add_component(paltests paltests_install)
 add_component(iltools)
 add_component(nativeaot)
 add_component(spmi)
+add_component(debug)
 
 # Define coreclr_all as the fallback component and make every component depend on this component.
 # iltools and paltests should be minimal subsets, so don't add a dependency on coreclr_misc
@@ -19,6 +20,9 @@ add_dependencies(runtime coreclr_misc)
 # The runtime build requires the clrjit and iltools builds
 add_dependencies(runtime jit iltools)
 
+# The runtime build requires the debugger tools builds
+add_dependencies(runtime debug)
+
 add_dependencies(runtime hosts)
 
 # The cross-components build is separate, so we don't need to add a dependency on coreclr_misc

diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake
@@ -6,40 +6,34 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
         COMPONENT crosscomponents
     )
 
-    if (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64)
+    if (CLR_CMAKE_TARGET_OSX AND ARCH_TARGET_NAME STREQUAL arm64)
         install_clr (TARGETS
             clrjit_universal_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
             DESTINATIONS .
             COMPONENT crosscomponents
         )
-    elseif (CLR_CMAKE_TARGET_UNIX)
+    elseif (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64)
         install_clr (TARGETS
-            clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
+            clrjit_universal_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
             DESTINATIONS .
             COMPONENT crosscomponents
         )
-    else()
+    elseif (CLR_CMAKE_TARGET_UNIX)
         install_clr (TARGETS
-            clrjit_win_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
+            clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
             DESTINATIONS .
             COMPONENT crosscomponents
         )
-    endif()
-
-    if (CLR_CMAKE_HOST_ARCH STREQUAL CLR_CMAKE_TARGET_ARCH)
+    else()
         install_clr (TARGETS
-            mscordaccore
-            mscordbi
+            clrjit_win_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
             DESTINATIONS .
             COMPONENT crosscomponents
         )
     endif()
 endif()
 
-# We support the DAC as a cross-component for a few specific cases:
-# - Same OS and architecture, sanitized runtime with unsanitized DAC
-# - Windows Host OS, any target OS, different architectures with the same bitness
-if((NOT CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_APPLE AND NOT FEATURE_CROSSBITNESS) OR (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS AND CLR_CMAKE_HOST_ARCH STREQUAL CLR_CMAKE_TARGET_ARCH))
+if(NOT CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_APPLE AND NOT FEATURE_CROSSBITNESS)
     install_clr (TARGETS
         mscordaccore
         mscordbi

diff --git a/src/coreclr/dlls/mscordac/CMakeLists.txt b/src/coreclr/dlls/mscordac/CMakeLists.txt
@@ -194,7 +194,7 @@ endif(CLR_CMAKE_HOST_UNIX)
 target_link_libraries(mscordaccore PRIVATE ${COREDAC_LIBRARIES})
 
 # add the install targets
-install_clr(TARGETS mscordaccore DESTINATIONS . sharedFramework COMPONENT runtime)
+install_clr(TARGETS mscordaccore DESTINATIONS . sharedFramework COMPONENT debug)
 
 if(CLR_CMAKE_HOST_WIN32)
     set(LONG_NAME_HOST_ARCH ${CLR_CMAKE_HOST_ARCH})

diff --git a/src/coreclr/dlls/mscordbi/CMakeLists.txt b/src/coreclr/dlls/mscordbi/CMakeLists.txt
@@ -126,4 +126,4 @@ elseif(CLR_CMAKE_HOST_UNIX)
 endif(CLR_CMAKE_HOST_WIN32)
 
 # add the install targets
-install_clr(TARGETS mscordbi DESTINATIONS . sharedFramework COMPONENT runtime)
+install_clr(TARGETS mscordbi DESTINATIONS . sharedFramework COMPONENT debug)
diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj
@@ -40,6 +40,7 @@
       <_CoreClrBuildArg Condition="'$(HostArchitecture)' != ''" Include="-hostarch $(HostArchitecture)" />
       <_CoreClrBuildArg Condition="'$(EnableNativeSanitizers)' != ''" Include="-fsanitize $(EnableNativeSanitizers)" />
       <_CoreClrBuildArg Include="-outputrid $(OutputRid)" />
+      <_CoreClrBuildArg Condition="'$(BuildSubdirectory)' != ''" Include="-subdir $(BuildSubdirectory)" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(ClrFullNativeBuild)' != 'true'">
@@ -52,6 +53,7 @@
       <_CoreClrBuildArg Condition="'$(ClrNativeAotSubset)' == 'true'" Include="-component nativeaot" />
       <_CoreClrBuildArg Condition="'$(ClrSpmiSubset)' == 'true'" Include="-component spmi" />
       <_CoreClrBuildArg Condition="'$(ClrCrossComponentsSubset)' == 'true'" Include="-component crosscomponents" />
+      <_CoreClrBuildArg Condition="'$(ClrDebugSubset)' == 'true'" Include="-component debug" />
     </ItemGroup>
 
     <PropertyGroup>

diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
@@ -85,14 +85,18 @@
       <!-- CoreRun is not used for testing anymore, but we still use it for benchmarking and profiling -->
       <RuntimeFiles Include="$(CoreCLRArtifactsPath)\corerun*" />
       <RuntimeFiles Include="$(CoreCLRArtifactsPath)\PDB\corerun*" />
-      <!-- If the build has native sanitizers, copy over the non-sanitized diagnostic binaries so they can be loaded by a debugger -->
+    </ItemGroup>
+    <!-- If the build has native sanitizers, copy over the non-sanitized diagnostic binaries so they can be loaded by a debugger -->
+    <ItemGroup Condition="'$(EnableNativeSanitizers)' != ''">
       <RuntimeFiles Remove="$(CoreCLRArtifactsPath)\sharedFramework\*mscordaccore*" />
       <RuntimeFiles Remove="$(CoreCLRArtifactsPath)\sharedFramework\*mscordbi*" />
       <RuntimeFiles Remove="$(CoreCLRArtifactsPath)\sharedFramework\PDB\*mscordaccore*" />
       <RuntimeFiles Remove="$(CoreCLRArtifactsPath)\sharedFramework\PDB\*mscordbi*" />
-      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\$(TargetArchitecture)\sharedFramework\*" IsNative="true" />
-      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\$(TargetArchitecture)\PDB\*mscordaccore*" IsNative="true" />
-      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\$(TargetArchitecture)\PDB\*mscordbi*" IsNative="true" />
+      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\$(TargetArchitecture)\unsanitized\sharedFramework\*" IsNative="true" />
+      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\$(TargetArchitecture)\unsanitized\PDB\*mscordaccore*" IsNative="true" />
+      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\$(TargetArchitecture)\unsanitized\PDB\*mscordbi*" IsNative="true" />
+    </ItemGroup>
+    <ItemGroup>
       <ReferenceCopyLocalPaths Include="@(RuntimeFiles)" />
     </ItemGroup>
     <ItemGroup Condition="'$(SwapNativeForIL)' == 'true'">

diff --git a/src/tests/Common/Directory.Build.targets b/src/tests/Common/Directory.Build.targets
@@ -63,7 +63,7 @@
       <SanitizedDiagnosticTools Include="$(LibPrefix)mscordbi$(LibSuffix)" />
       <SanitizedDiagnosticTools Include="$(LibPrefix)dbgshim$(LibSuffix)" />
       <RunTimeArtifactsExcludeFiles Include="@(SanitizedDiagnosticTools->'%(FileName)%(Extension)')" />
-      <RunTimeArtifactsIncludeFolders Include="$(TargetArchitecture)/" TargetDir="/" />
+      <RunTimeArtifactsIncludeFolders Include="$(TargetArchitecture)/unsanitized/" TargetDir="/" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(MinimalCoreRoot)' == 'true'">