This is an archive of the discontinued LLVM Phabricator instance.

Differential D73436

[libunwind] Treat assembly files as C on mingw
ClosedPublic

Authored by mstorsjo on Jan 26 2020, 12:20 PM.

Details

Reviewers
phosek
smeenai
rnk
JamesNagurne
mclow.lists
Commits
rGb780df052dd2: [libunwind] Treat assembly files as C on mingw
Summary

When targeting mingw, current CMake (3.16) fails to get the right flags for assembly source files for windows gnu/clang targets (see https://gitlab.kitware.com/cmake/cmake/merge_requests/4287 for a fix), causing builds to fail due to -fPIC being unsupported in clang for mingw targets.

In the meantime, restore the behaviour from before c48974ffd7d1676 selectively on mingw targets, treating the assembly files as C.

Diff Detail

Event Timeline

mstorsjo created this revision.Jan 26 2020, 12:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 26 2020, 12:20 PM
Herald added subscribers: christof, mgorny. · View Herald Transcript
mstorsjo mentioned this in D72952: [libunwind] Set LIBUNWIND_ASM_SOURCES to the ASM source language from C.Jan 26 2020, 12:53 PM
smeenai accepted this revision.Jan 26 2020, 4:01 PM

LGTM

libunwind/src/CMakeLists.txt
28

Maybe you could clarify that it's all CMake versions as of 3.16 that have this issue, not just 3.16 specifically.

This revision is now accepted and ready to land.Jan 26 2020, 4:01 PM
Herald added a reviewer: mclow.lists. · View Herald TranscriptJan 26 2020, 4:01 PM
Closed by commit rGb780df052dd2: [libunwind] Treat assembly files as C on mingw (authored by mstorsjo). · Explain WhyJan 26 2020, 11:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libunwind/
src/
7 lines

Diff 240452

libunwind/src/CMakeLists.txt

Show All 18 Lines
set_source_files_properties(${LIBUNWIND_C_SOURCES} set_source_files_properties(${LIBUNWIND_C_SOURCES}
PROPERTIES PROPERTIES
COMPILE_FLAGS "-std=c99") COMPILE_FLAGS "-std=c99")
set(LIBUNWIND_ASM_SOURCES set(LIBUNWIND_ASM_SOURCES
UnwindRegistersRestore.S UnwindRegistersRestore.S
UnwindRegistersSave.S UnwindRegistersSave.S
) )
if (MINGW)
# Current CMake (3.16) doesn't build assembly sources for windows/gnu
smeenaiUnsubmitted
Not Done
ReplyInline Actions

Maybe you could clarify that it's all CMake versions as of 3.16 that have this issue, not just 3.16 specifically.

smeenai: Maybe you could clarify that it's all CMake versions as of 3.16 that have this issue, not just…
# targets properly, so treat them as C files.
set_source_files_properties(${LIBUNWIND_ASM_SOURCES}
PROPERTIES
LANGUAGE C)
endif()
set(LIBUNWIND_HEADERS set(LIBUNWIND_HEADERS
AddressSpace.hpp AddressSpace.hpp
assembly.h assembly.h
CompactUnwinder.hpp CompactUnwinder.hpp
config.h config.h
dwarf2.h dwarf2.h
DwarfInstructions.hpp DwarfInstructions.hpp
▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines