Fix arm64 MacOS and Linux Managed Debugging (#104847)

mikelle-rogers · Mikelle Rogers · web-flow · commit 283de5b5adf0 · 2024-07-13T11:15:31.000-04:00
* check to see if XSTATE is defined on ARM64

* fix for the linux arm32 case

---------

Co-authored-by: Mikelle Rogers &lt;mikellerogers@Mikelles-MacBook-Pro.local&gt;
diff --git a/src/coreclr/debug/inc/common.h b/src/coreclr/debug/inc/common.h
@@ -92,7 +92,7 @@ ULONG32 ContextSizeForFlags(ULONG32 flags)
     else
 #endif // TARGET_X86
     {
-#if !defined(CROSS_COMPILE) && !defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
+#if !defined(CROSS_COMPILE) && !defined(TARGET_WINDOWS) && (defined(TARGET_AMD64) || defined(TARGET_ARM64))
         if ((flags & CONTEXT_XSTATE) == CONTEXT_XSTATE)
         {
             return sizeof(T_CONTEXT);

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ ULONG32 ContextSizeForFlags(ULONG32 flags)`
`92`	`92`	`else`
`93`	`93`	`#endif // TARGET_X86`
`94`	`94`	`{`
`95`		`-#if !defined(CROSS_COMPILE) && !defined(TARGET_WINDOWS) && defined(TARGET_AMD64)`
	`95`	`+#if !defined(CROSS_COMPILE) && !defined(TARGET_WINDOWS) && (defined(TARGET_AMD64) \|\| defined(TARGET_ARM64))`
`96`	`96`	`if ((flags & CONTEXT_XSTATE) == CONTEXT_XSTATE)`
`97`	`97`	`{`
`98`	`98`	`return sizeof(T_CONTEXT);`