Skip to content

[compiler-rt][MSVC] Update check to include clang-cl #150108

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
merged 1 commit into from
Jul 23, 2025
Merged

[compiler-rt][MSVC] Update check to include clang-cl #150108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 compiler-rt/lib/builtins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,8 @@ set(aarch64_SOURCES
aarch64/fp_mode.c
)

# Append sources specific to AArch64 targets that aren't supported by MSVC.
if(NOT MSVC)
# Append sources specific to AArch64 targets that aren't supported by cl.exe
if(CLANG_CL OR NOT MSVC)
Copy link
Member

Choose a reason for hiding this comment

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

I wasn’t aware of the cmake variable CLANG_CL - is that set in all supported cmake versions? Otherwise I think the common way is e.g. to check CMAKE_C_COMPILER_ID MATCHES "Clang" or something like that.

Copy link
Collaborator

Choose a reason for hiding this comment

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

It's set by llvm/cmake/modules/CheckCompilerVersion.cmake.

But I don't think it's the right thing, in any case. The issue here isn't whether you're using a compiler in cl emulation mode, the issue is that Windows COFF requires different assembler directives. The correct check for that is something like WIN32 OR CYGWIN.

Copy link
Contributor

Choose a reason for hiding this comment

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

The assembly in emupac.cpp uses "portable" assembly directives (portable in the sense that clang supports them in all object formats). The fact that my compile command from #149823 (comment) worked is evidence of that. So I think the condition in the PR is correct.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh, I read the condition backwards.

I guess this is okay.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the reviews 👍
Apologies for rushing the original PR in without testing my assumptions of clang-cl!

list(APPEND aarch64_SOURCES
aarch64/emupac.cpp
)
Expand Down
Loading