This is an archive of the discontinued LLVM Phabricator instance.

Differential D123187

[Support] [BLAKE3] Fix building for Cygwin
ClosedPublic

Authored by mstorsjo on Apr 6 2022, 12:15 AM.

Details

Reviewers
akyrtzi
Commits
rG9edee89b91f5: [Support] [BLAKE3] Fix building for Cygwin
Summary

Use the windows-gnu assembly files on x86_64 Cygwin too.

This fixes https://github.com/llvm/llvm-project/issues/54685.

Diff Detail

Event Timeline

mstorsjo created this revision.Apr 6 2022, 12:15 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 6 2022, 12:15 AM
Herald added subscribers: dexonsmith, pengfei, hiraditya, mgorny. · View Herald Transcript
mstorsjo requested review of this revision.Apr 6 2022, 12:15 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 6 2022, 12:15 AM
Harbormaster completed remote builds in B158132: Diff 420725.Apr 6 2022, 1:27 AM
akyrtzi accepted this revision.Apr 6 2022, 8:10 AM

LGTM, thank you for the fix! 🙇🏻‍♂️

This revision is now accepted and ready to land.Apr 6 2022, 8:10 AM
This revision was landed with ongoing or failed builds.Apr 6 2022, 12:55 PM
Closed by commit rG9edee89b91f5: [Support] [BLAKE3] Fix building for Cygwin (authored by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG9edee89b91f5: [Support] [BLAKE3] Fix building for Cygwin.

Revision Contents

PathSize
llvm/
lib/
Support/
BLAKE3/
2 lines

Diff 420985

llvm/lib/Support/BLAKE3/CMakeLists.txt

Show All 37 Linesif (IS_X64 AND CAN_USE_ASSEMBLER)
if (MSVC) if (MSVC)
enable_language(ASM_MASM) enable_language(ASM_MASM)
list(APPEND LLVM_BLAKE3_FILES list(APPEND LLVM_BLAKE3_FILES
blake3_sse2_x86-64_windows_msvc.asm blake3_sse2_x86-64_windows_msvc.asm
blake3_sse41_x86-64_windows_msvc.asm blake3_sse41_x86-64_windows_msvc.asm
blake3_avx2_x86-64_windows_msvc.asm blake3_avx2_x86-64_windows_msvc.asm
blake3_avx512_x86-64_windows_msvc.asm blake3_avx512_x86-64_windows_msvc.asm
) )
elseif(WIN32) elseif(WIN32 OR CYGWIN)
list(APPEND LLVM_BLAKE3_FILES list(APPEND LLVM_BLAKE3_FILES
blake3_sse2_x86-64_windows_gnu.S blake3_sse2_x86-64_windows_gnu.S
blake3_sse41_x86-64_windows_gnu.S blake3_sse41_x86-64_windows_gnu.S
blake3_avx2_x86-64_windows_gnu.S blake3_avx2_x86-64_windows_gnu.S
blake3_avx512_x86-64_windows_gnu.S blake3_avx512_x86-64_windows_gnu.S
) )
else() else()
list(APPEND LLVM_BLAKE3_FILES list(APPEND LLVM_BLAKE3_FILES
Show All 34 Lines