From 8adc5b1c57b7c145a2607ee6846a6acb0cf452b2 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Mon, 20 Apr 2026 07:38:50 -0700 Subject: [PATCH 1/2] Avoid a duplicate definition of CONTEXT_UNWOUND_TO_CALL if building with the v10.0.28000.0 SDK --- src/coreclr/inc/crosscomp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/coreclr/inc/crosscomp.h b/src/coreclr/inc/crosscomp.h index 4c30eb01ba8ae9..c559747179df78 100644 --- a/src/coreclr/inc/crosscomp.h +++ b/src/coreclr/inc/crosscomp.h @@ -210,7 +210,9 @@ typedef struct _T_DISPATCHER_CONTEXT { #define ARM64_MAX_BREAKPOINTS 8 #define ARM64_MAX_WATCHPOINTS 2 +#ifndef CONTEXT_UNWOUND_TO_CALL #define CONTEXT_UNWOUND_TO_CALL 0x20000000 +#endif typedef union _NEON128 { struct { From 12d868f3a1648156dda65037a58194b981cf2740 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Mon, 20 Apr 2026 07:47:05 -0700 Subject: [PATCH 2/2] Apply the same fix to the LoongArch64 and RiscV64 definitions --- src/coreclr/inc/crosscomp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/coreclr/inc/crosscomp.h b/src/coreclr/inc/crosscomp.h index c559747179df78..5473076a59398a 100644 --- a/src/coreclr/inc/crosscomp.h +++ b/src/coreclr/inc/crosscomp.h @@ -415,7 +415,9 @@ enum #define LOONGARCH64_MAX_BREAKPOINTS 8 #define LOONGARCH64_MAX_WATCHPOINTS 2 +#ifndef CONTEXT_UNWOUND_TO_CALL #define CONTEXT_UNWOUND_TO_CALL 0x20000000 +#endif typedef struct DECLSPEC_ALIGN(16) _T_CONTEXT { @@ -548,7 +550,9 @@ typedef struct _T_KNONVOLATILE_CONTEXT_POINTERS { #define RISCV64_MAX_BREAKPOINTS 8 #define RISCV64_MAX_WATCHPOINTS 2 +#ifndef CONTEXT_UNWOUND_TO_CALL #define CONTEXT_UNWOUND_TO_CALL 0x20000000 +#endif typedef struct DECLSPEC_ALIGN(16) _T_CONTEXT {