From e44d48f6726cf6ddaf94fac8b94c61d2afb68e32 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Thu, 9 Apr 2026 11:48:20 -0400 Subject: [PATCH] Re-enable FEATURE_CORPROFILER for tvOS to match iOS/MacCatalyst PR #126550 disabled FEATURE_CORPROFILER for tvOS but left iOS, MacCatalyst, and Android commented out (profiler still enabled). There is no reason to single out tvOS from its sibling Apple mobile platforms. They should be treated as a package deal. The uncommented 'AND NOT CLR_CMAKE_TARGET_TVOS' line removed profiler fields from the Thread struct on tvOS, making the hardcoded OFFSETOF__Thread__m_pInterpThreadContext in asmconstants.h wrong (0x2b8 vs actual 0x228), breaking all 3 tvOS legs in unified-build. Comment out the tvOS line to match iOS/MacCatalyst/Android, keeping the profiler enabled until all mobile platforms disable it together. Fixes internal unified-build tvOS failures on main (build 2946990). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/coreclr/clrfeatures.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/coreclr/clrfeatures.cmake b/src/coreclr/clrfeatures.cmake index 55d3a3c070ca3b..f2016caa66954a 100644 --- a/src/coreclr/clrfeatures.cmake +++ b/src/coreclr/clrfeatures.cmake @@ -52,7 +52,8 @@ if(NOT DEFINED FEATURE_CORPROFILER) # AND NOT CLR_CMAKE_TARGET_ANDROID # AND NOT CLR_CMAKE_TARGET_MACCATALYST # AND NOT CLR_CMAKE_TARGET_IOS - AND NOT CLR_CMAKE_TARGET_TVOS) + # AND NOT CLR_CMAKE_TARGET_TVOS + ) set(FEATURE_CORPROFILER 1) endif() endif()