This is an archive of the discontinued LLVM Phabricator instance.

Differential D152100

[libunwind] Removes CMake work-arounds.
ClosedPublic

Authored by Mordante on Jun 4 2023, 8:41 AM.

Download Raw Diff

Details

Reviewers

Group Reviewers

Restricted Project

Commits

rG17b0d90e20ee: [libunwind] Removes CMake work-arounds.

Summary

CMake older than 3.20.0 is no longer supported.
This removes work-arounds for no longer supported versions.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

Mordante created this revision.Jun 4 2023, 8:41 AM

Herald added a project: Restricted Project. · View Herald TranscriptJun 4 2023, 8:41 AM

Herald added a subscriber: mstorsjo. · View Herald Transcript

Mordante requested review of this revision.Jun 4 2023, 8:41 AM

Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJun 4 2023, 8:41 AM

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

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

LGTM, thanks!

This revision is now accepted and ready to land.Jun 4 2023, 12:18 PM

Harbormaster completed remote builds in B236466: Diff 528223.Jun 4 2023, 1:44 PM

Closed by commit rG17b0d90e20ee: [libunwind] Removes CMake work-arounds. (authored by Mordante). · Explain WhyJun 5 2023, 8:44 AM

This revision was automatically updated to reflect the committed changes.

Mordante added a commit: rG17b0d90e20ee: [libunwind] Removes CMake work-arounds..

mstorsjo mentioned this in D150699: [compiler-rt] [libunwind] Remove workarounds for older CMake versions.Sep 7 2023, 12:26 PM

Revision Contents

Path

Size

libunwind/

src/

8 lines

Diff 528463

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