Add OS/architecture specific CLRDEBUGINFO resource (#82863)

Mike McLaughlin · web-flow · commit e303a45140f8 · 2023-03-01T20:26:55.000-08:00
Issue: #78282
diff --git a/src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt
@@ -181,6 +181,16 @@ target_compile_definitions(coreclr_static PUBLIC CORECLR_EMBEDDED)
 if(CLR_CMAKE_TARGET_WIN32)
     set(CLRDEBUGINFO_RESOURCE_PATH ${CMAKE_CURRENT_BINARY_DIR}/clr_debug_resource.bin)
 
+    if(CLR_CMAKE_TARGET_ARCH_AMD64)
+        set(CLRDEBUGINFO_RESOURCE_NAME CLRDEBUGINFOWINDOWSAMD64)
+    elseif(CLR_CMAKE_TARGET_ARCH_I386)
+        set(CLRDEBUGINFO_RESOURCE_NAME CLRDEBUGINFOWINDOWSX86)
+    elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
+        set(CLRDEBUGINFO_RESOURCE_NAME CLRDEBUGINFOWINDOWSARM64)
+    elseif(CLR_CMAKE_TARGET_ARCH_ARM)
+        set(CLRDEBUGINFO_RESOURCE_NAME CLRDEBUGINFOWINDOWSARM)
+    endif(CLR_CMAKE_TARGET_ARCH_AMD64)
+
     add_custom_target(
         clr_debug_resources
         DEPENDS mscordaccore mscordbi
diff --git a/src/coreclr/dlls/mscoree/coreclr/dump_helper_resource.rc.in b/src/coreclr/dlls/mscoree/coreclr/dump_helper_resource.rc.in
@@ -10,4 +10,5 @@ MINIDUMP_AUXILIARY_PROVIDER RCDATA  { "mscordaccore.dll\0" }
 
 #endif
 
+@CLRDEBUGINFO_RESOURCE_NAME@ RCDATA "@CLRDEBUGINFO_RESOURCE_PATH@"
 CLRDEBUGINFO RCDATA "@CLRDEBUGINFO_RESOURCE_PATH@"

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@ MINIDUMP_AUXILIARY_PROVIDER RCDATA { "mscordaccore.dll\0" }`
`10`	`10`
`11`	`11`	`#endif`
`12`	`12`
	`13`	`+@CLRDEBUGINFO_RESOURCE_NAME@ RCDATA "@CLRDEBUGINFO_RESOURCE_PATH@"`
`13`	`14`	`CLRDEBUGINFO RCDATA "@CLRDEBUGINFO_RESOURCE_PATH@"`