Skip to content

Remove support for SOS win-arm .NET Framework hosting #3387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Sep 15, 2022
Merged

Remove support for SOS win-arm .NET Framework hosting #3387

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb718ef
Remove support for SOS win-arm .NET Framework hosting
hoyosjs Sep 15, 2022
720dc56
Revert "Roll to Windows 2019 image to fix arm cross build (#3376)"
hoyosjs Sep 15, 2022
cbaec6d
PR Feedback
hoyosjs Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ jobs:
# Official Build Windows Pool
${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Windows.Amd64.VS2022
demands: ImageOverride -equals windows.vs2022.amd64

# Public Windows Build Pool
${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}:
name: NetCore-Public
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open
demands: ImageOverride -equals windows.vs2022.amd64.open

${{ if and(ne(parameters.dockerImage, ''), ne(parameters.requiresCapPtraceContainer, 'true')) }}:
container: ${{ parameters.dockerImage }}
Expand Down
4 changes: 2 additions & 2 deletions src/SOS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ if(CLR_CMAKE_HOST_WIN32)
add_compile_options(/Zl) # omit default library name in .OBJ

add_subdirectory(runcommand)
if(NOT CLR_CMAKE_TARGET_ARCH_ARM64)
if(NOT CLR_CMAKE_TARGET_ARCH_ARM64 AND NOT CLR_CMAKE_TARGET_ARCH_ARM)
add_subdirectory(SOS.UnitTests/Debuggees/DesktopClrHost)
endif()
endif(NOT CLR_CMAKE_TARGET_ARCH_ARM64 AND NOT CLR_CMAKE_TARGET_ARCH_ARM)
endif(CLR_CMAKE_HOST_WIN32)

add_definitions(-D_SECURE_SCL=0)
Expand Down
4 changes: 2 additions & 2 deletions src/SOS/Strike/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@ if(WIN32)
ntdll.lib
)

if(NOT CLR_CMAKE_HOST_ARCH_ARM64)
if(NOT CLR_CMAKE_HOST_ARCH_ARM64 AND NOT CLR_CMAKE_HOST_ARCH_ARM)
list(APPEND
SOS_LIBRARY
mscoree.lib)
endif(NOT CLR_CMAKE_HOST_ARCH_ARM64)
endif(NOT CLR_CMAKE_HOST_ARCH_ARM64 AND NOT CLR_CMAKE_HOST_ARCH_ARM)

else(WIN32)
add_definitions(-DFEATURE_ENABLE_HARDWARE_EXCEPTIONS)
Expand Down
4 changes: 2 additions & 2 deletions src/SOS/extensions/hostcoreclr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#define DT_LNK 10
#endif

#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_)
#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
Copy link
Contributor

@mikem8361 mikem8361 Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
#if !defined(FEATURE_PAL) && !defined(HOST_ARM64) && !defined(HOST_ARM)

Copy link
Contributor

@mikem8361 mikem8361 Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to use the new defines.

extern HRESULT InitializeDesktopClrHost();
#endif

Expand Down Expand Up @@ -750,7 +750,7 @@ HRESULT InitializeHosting()
return hr;
}
}
#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_)
#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
Copy link
Contributor

@mikem8361 mikem8361 Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
#if !defined(FEATURE_PAL) && !defined(HOST_ARM64) && !defined(HOST_ARM)

hr = InitializeDesktopClrHost();
if (SUCCEEDED(hr))
{
Expand Down