This is an archive of the discontinued LLVM Phabricator instance.

[compiler-rt] [libunwind] Remove workarounds for older CMake versions
AbandonedPublic

Authored by mstorsjo on May 16 2023, 11:33 AM.

Download Raw Diff

Details

Reviewers

Mordante
phosek
MaskRay
ldionne

Group Reviewers

Restricted Project

Summary

These only apply for CMake versions less than our new minimum.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

mstorsjo created this revision.May 16 2023, 11:33 AM

Herald added a project: Restricted Project. · View Herald TranscriptMay 16 2023, 11:33 AM

Herald added subscribers: Enna1, dberris. · View Herald Transcript

mstorsjo requested review of this revision.May 16 2023, 11:33 AM

Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMay 16 2023, 11:33 AM

Herald added a reviewer: Restricted Project. · View Herald Transcript

Herald added subscribers: libcxx-commits, Restricted Project. · View Herald Transcript

MaskRay accepted this revision.Jun 5 2023, 8:41 PM

This revision is now accepted and ready to land.Jun 5 2023, 8:41 PM

LGTM

Can we ship this?

This was superseded by D152102 and D152100.

Revision Contents

Path

Size

compiler-rt/

cmake/

Modules/

AddCompilerRT.cmake

7 lines

libunwind/

src/

CMakeLists.txt

8 lines

Diff 522726

compiler-rt/cmake/Modules/AddCompilerRT.cmake

Show First 20 Lines • Show All 119 Lines • ▼ Show 20 Lines	function(add_compiler_rt_component name)
if(COMMAND runtime_register_component)		if(COMMAND runtime_register_component)
runtime_register_component(${name})		runtime_register_component(${name})
endif()		endif()
add_dependencies(compiler-rt ${name})		add_dependencies(compiler-rt ${name})
endfunction()		endfunction()

function(add_asm_sources output)		function(add_asm_sources output)
set(${output} ${ARGN} PARENT_SCOPE)		set(${output} ${ARGN} PARENT_SCOPE)
# CMake doesn't pass the correct architecture for Apple prior to CMake 3.19. https://gitlab.kitware.com/cmake/cmake/-/issues/20771
# MinGW didn't work correctly with assembly prior to CMake 3.17. https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4287 and https://reviews.llvm.org/rGb780df052dd2b246a760d00e00f7de9ebdab9d09
# Workaround these two issues by compiling as C.
# Same workaround used in libunwind. Also update there if changed here.
if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR (MINGW AND CMAKE_VERSION VERSION_LESS 3.17))
set_source_files_properties(${ARGN} PROPERTIES LANGUAGE C)
endif()
endfunction()		endfunction()

macro(set_output_name output name arch)		macro(set_output_name output name arch)
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)		if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
set(${output} ${name})		set(${output} ${name})
else()		else()
if(ANDROID AND ${arch} STREQUAL "i386")		if(ANDROID AND ${arch} STREQUAL "i386")
set(${output} "${name}-i686${COMPILER_RT_OS_SUFFIX}")		set(${output} "${name}-i686${COMPILER_RT_OS_SUFFIX}")
▲ Show 20 Lines • Show All 630 Lines • Show Last 20 Lines

libunwind/src/CMakeLists.txt

Show All 20 Lines	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
)		)

# See add_asm_sources() in compiler-rt for explanation of this workaround.
# CMake doesn't work correctly with assembly on AIX. Workaround by compiling
# as C files as well.
if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR
(MINGW AND CMAKE_VERSION VERSION_LESS 3.17))
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
cet_unwind.h		cet_unwind.h
config.h		config.h
dwarf2.h		dwarf2.h
DwarfInstructions.hpp		DwarfInstructions.hpp
▲ Show 20 Lines • Show All 193 Lines • Show Last 20 Lines