This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
libunwind/
-
CMakeLists.txt

Differential D124912

[libunwind] [CMake] Handle the RelWithDebInfo configuration similarly to Release
ClosedPublic

Authored by mstorsjo on May 4 2022, 3:00 AM.

Download Raw Diff

Details

Reviewers

MaskRay
phosek

Group Reviewers

Restricted Project

Commits

rGf1f8899a1882: [libunwind] [CMake] Handle the RelWithDebInfo configuration similarly to Release

Summary

This makes sure to include libunwind log messages in the build if
LIBUNWIND_ENABLE_ASSERTIONS is set (which it is by default), when
building in RelWithDebInfo configurations.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

mstorsjo created this revision.May 4 2022, 3:00 AM

Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMay 4 2022, 3:00 AM

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

Herald added subscribers: StephenFan, mgorny. · View Herald Transcript

mstorsjo requested review of this revision.May 4 2022, 3:00 AM

Herald added a project: Restricted Project. · View Herald TranscriptMay 4 2022, 3:00 AM

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

Harbormaster completed remote builds in B162646: Diff 426957.May 4 2022, 5:24 AM

Thanks. It makes sense for RELWITHDEBINFO to match RELEASE.

This revision is now accepted and ready to land.May 4 2022, 9:16 AM

LGTM

I checked LLVM_ENABLE_ASSERTS, and that one seems to have handled this by inverting the condition, checking for NOT “DEBUG”, I guess that’d be even better?

Restructured to check NOT STREQUAL "DEBUG" instead of enumerating the release modes, matching a similar check in llvm/cmake/modules/HandleLLVMOptions.cmake. I'll push this later if there's no further comments on it.

Agree this is better and also handles MINSIZEREL

Perhaps ask @ldionne whether libcxxabi/CMakeLists.txt:383 needs a similar change.

This revision was landed with ongoing or failed builds.May 4 2022, 12:55 PM

Closed by commit rGf1f8899a1882: [libunwind] [CMake] Handle the RelWithDebInfo configuration similarly to Release (authored by mstorsjo). · Explain Why

This revision was automatically updated to reflect the committed changes.

mstorsjo added a commit: rGf1f8899a1882: [libunwind] [CMake] Handle the RelWithDebInfo configuration similarly to Release.

Harbormaster completed remote builds in B162744: Diff 427073.May 4 2022, 2:11 PM

xingxue mentioned this in D136770: [libc++abi][CMake] Handle build type RelWithDebInfo or MinSizeRel configuration similarly to Release.Oct 26 2022, 9:02 AM

Revision Contents

Path

Size

libunwind/

CMakeLists.txt

4 lines

Diff 427112

libunwind/CMakeLists.txt

	Show First 20 Lines • Show All 289 Lines • ▼ Show 20 Lines
	if (LIBUNWIND_ENABLE_ASSERTIONS)			if (LIBUNWIND_ENABLE_ASSERTIONS)
	# MSVC doesn't like _DEBUG on release builds. See PR 4379.			# MSVC doesn't like _DEBUG on release builds. See PR 4379.
	if (NOT MSVC)			if (NOT MSVC)
	add_compile_flags(-D_DEBUG)			add_compile_flags(-D_DEBUG)
	endif()			endif()

	# On Release builds cmake automatically defines NDEBUG, so we			# On Release builds cmake automatically defines NDEBUG, so we
	# explicitly undefine it:			# explicitly undefine it:
	if (uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")			if (NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
	add_compile_flags(-UNDEBUG)			add_compile_flags(-UNDEBUG)
	endif()			endif()
	else()			else()
	if (NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")			if (uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
	add_compile_flags(-DNDEBUG)			add_compile_flags(-DNDEBUG)
	endif()			endif()
	endif()			endif()

	# Cross-unwinding			# Cross-unwinding
	if (NOT LIBUNWIND_ENABLE_CROSS_UNWINDING)			if (NOT LIBUNWIND_ENABLE_CROSS_UNWINDING)
	add_compile_flags(-D_LIBUNWIND_IS_NATIVE_ONLY)			add_compile_flags(-D_LIBUNWIND_IS_NATIVE_ONLY)
	endif()			endif()
	▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines