This is an archive of the discontinued LLVM Phabricator instance.

Differential D102372

[libcxxabi] Remove unnecessary define from build
ClosedPublic

Authored by smeenai on May 12 2021, 2:49 PM.

Details

Reviewers
phosek
Group Reviewers
Restricted Project
Commits
rG6c05f2dab384: [libcxxabi] Remove unnecessary define from build
Summary

Now that we're passing -D_LIBCPP_BUILDING_LIBRARY to the libc++abi
build, -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS is redundant
(https://github.com/llvm/llvm-project/blob/fb3a00c327df78eaa534e53ac6f07112e0585121/libcxx/include/exception#L120-L121
is the only use of _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS in
libc++, and that conditional also checks for _LIBCPP_BUILDING_LIBRARY).

Diff Detail

Event Timeline

smeenai created this revision.May 12 2021, 2:49 PM
Herald added a subscriber: mgorny. · View Herald TranscriptMay 12 2021, 2:49 PM
smeenai requested review of this revision.May 12 2021, 2:49 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 12 2021, 2:49 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B104149: Diff 344967.May 12 2021, 3:19 PM
smeenai added a comment.May 18 2021, 7:33 PM

Ping.

phosek accepted this revision.May 19 2021, 9:40 AM
phosek added a subscriber: phosek.

LGTM

This revision is now accepted and ready to land.May 19 2021, 9:40 AM
smeenai updated this revision to Diff 346514.May 19 2021, 11:07 AM

Rebasing to see if tests are happier

Harbormaster completed remote builds in B105273: Diff 346514.May 19 2021, 1:45 PM
This revision was landed with ongoing or failed builds.May 20 2021, 4:56 PM
Closed by commit rG6c05f2dab384: [libcxxabi] Remove unnecessary define from build (authored by smeenai). · Explain Why
This revision was automatically updated to reflect the committed changes.
smeenai added a commit: rG6c05f2dab384: [libcxxabi] Remove unnecessary define from build.

Revision Contents

PathSize
libcxxabi/
4 lines

Diff 346514

libcxxabi/CMakeLists.txt

Show First 20 Lines • Show All 471 Lines • ▼ Show 20 Lines
if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY) if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY)
add_definitions(-D_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL) add_definitions(-D_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL)
endif() endif()
# Prevent libc++abi from having library dependencies on libc++ # Prevent libc++abi from having library dependencies on libc++
add_definitions(-D_LIBCPP_DISABLE_EXTERN_TEMPLATE) add_definitions(-D_LIBCPP_DISABLE_EXTERN_TEMPLATE)
# Bring back `std::unexpected`, which is removed in C++17, to support
# pre-C++17.
add_definitions(-D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS)
if (MSVC) if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif() endif()
# Define LIBCXXABI_USE_LLVM_UNWINDER for conditional compilation. # Define LIBCXXABI_USE_LLVM_UNWINDER for conditional compilation.
if (LIBCXXABI_USE_LLVM_UNWINDER) if (LIBCXXABI_USE_LLVM_UNWINDER)
add_definitions(-DLIBCXXABI_USE_LLVM_UNWINDER) add_definitions(-DLIBCXXABI_USE_LLVM_UNWINDER)
endif() endif()
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines