This is an archive of the discontinued LLVM Phabricator instance.

[CMake] Fix LIBUNWIND_ENABLE_CET build after D110005
ClosedPublic

Authored by xiongji90 on Oct 17 2022, 10:57 PM.

Download Raw Diff

Details

Reviewers

MaskRay
compnerd
mstorsjo

Group Reviewers

Restricted Project

Commits

rG09dcb933eff3: [CMake] Fix LIBUNWIND_ENABLE_CET build after D110005

Summary

In https://reviews.llvm.org/D110005, LLVM runtime libraries unify names used by compiler flag check in cmake, we need to update LIBUNWIND_SUPPORTS_* flag used in libunwind cmake too.

Diff Detail

Event Timeline

xiongji90 created this revision.Oct 17 2022, 10:57 PM

Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 17 2022, 10:57 PM

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

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

xiongji90 requested review of this revision.Oct 17 2022, 10:57 PM

Herald added a project: Restricted Project. · View Herald TranscriptOct 17 2022, 10:57 PM

Herald added a subscriber: llvm-commits. · View Herald Transcript

Hi, @MaskRay and @compnerd
Could you help review this little fix for libunwind CET build break?

Thanks very much.

Harbormaster completed remote builds in B192656: Diff 468424.Oct 18 2022, 12:18 AM

LGTM, and sorry for the accidental breakage.

This revision is now accepted and ready to land.Oct 18 2022, 3:19 AM

MaskRay added inline comments.Oct 18 2022, 9:47 AM

libunwind/CMakeLists.txt
163	Where is this defined?
166	Where is this defined?

mstorsjo added inline comments.Oct 18 2022, 10:47 AM

libunwind/CMakeLists.txt
163	Here: https://github.com/llvm/llvm-project/blob/main/libunwind/cmake/Modules/HandleLibunwindFlags.cmake#L186 Called two lines above.

MaskRay accepted this revision.Oct 18 2022, 10:58 AM

MaskRay retitled this revision from Fix libunwind CET build break to [CMake] Fix LIBUNWIND_ENABLE_CET build.Oct 18 2022, 2:56 PM

MaskRay retitled this revision from [CMake] Fix LIBUNWIND_ENABLE_CET build to [CMake] Fix LIBUNWIND_ENABLE_CET build after D110005.Oct 18 2022, 2:59 PM

This revision was landed with ongoing or failed builds.Oct 18 2022, 3:00 PM

Closed by commit rG09dcb933eff3: [CMake] Fix LIBUNWIND_ENABLE_CET build after D110005 (authored by xiongji90, committed by MaskRay). · Explain Why

This revision was automatically updated to reflect the committed changes.

MaskRay added a commit: rG09dcb933eff3: [CMake] Fix LIBUNWIND_ENABLE_CET build after D110005.

Revision Contents

Path

Size

libunwind/

CMakeLists.txt

4 lines

Diff 468424

libunwind/CMakeLists.txt

Show First 20 Lines • Show All 154 Lines • ▼ Show 20 Lines	if (LIBUNWIND_USE_COMPILER_RT AND NOT LIBUNWIND_HAS_NODEFAULTLIBS_FLAG)
list(APPEND LIBUNWIND_LINK_FLAGS "-rtlib=compiler-rt")		list(APPEND LIBUNWIND_LINK_FLAGS "-rtlib=compiler-rt")
endif()		endif()

add_compile_flags_if_supported(-Werror=return-type)		add_compile_flags_if_supported(-Werror=return-type)

if (LIBUNWIND_ENABLE_CET)		if (LIBUNWIND_ENABLE_CET)
add_compile_flags_if_supported(-fcf-protection=full)		add_compile_flags_if_supported(-fcf-protection=full)
add_compile_flags_if_supported(-mshstk)		add_compile_flags_if_supported(-mshstk)
if (NOT LIBUNWIND_SUPPORTS_FCF_PROTECTION_EQ_FULL_FLAG)		if (NOT CXX_SUPPORTS_FCF_PROTECTION_EQ_FULL_FLAG)
		MaskRayUnsubmitted Not Done Reply Inline Actions Where is this defined? MaskRay: Where is this defined?
		mstorsjoUnsubmitted Not Done Reply Inline Actions Here: https://github.com/llvm/llvm-project/blob/main/libunwind/cmake/Modules/HandleLibunwindFlags.cmake#L186 Called two lines above. mstorsjo: Here: https://github.com/llvm/llvm-project/blob/main/libunwind/cmake/Modules/HandleLibunwindFla…
message(SEND_ERROR "Compiler doesn't support CET -fcf-protection option!")		message(SEND_ERROR "Compiler doesn't support CET -fcf-protection option!")
endif()		endif()
if (NOT LIBUNWIND_SUPPORTS_MSHSTK_FLAG)		if (NOT CXX_SUPPORTS_MSHSTK_FLAG)
		MaskRayUnsubmitted Not Done Reply Inline Actions Where is this defined? MaskRay: Where is this defined?
message(SEND_ERROR "Compiler doesn't support CET -mshstk option!")		message(SEND_ERROR "Compiler doesn't support CET -mshstk option!")
endif()		endif()
endif()		endif()

# Get warning flags		# Get warning flags
add_compile_flags_if_supported(-W)		add_compile_flags_if_supported(-W)
add_compile_flags_if_supported(-Wall)		add_compile_flags_if_supported(-Wall)
add_compile_flags_if_supported(-Wchar-subscripts)		add_compile_flags_if_supported(-Wchar-subscripts)
▲ Show 20 Lines • Show All 160 Lines • Show Last 20 Lines