This is an archive of the discontinued LLVM Phabricator instance.

Differential D96574

libcxxabi: add builtins to dynamic library link
ClosedPublic

Authored by pattop on Feb 11 2021, 8:10 PM.

Details

Reviewers
phosek
Group Reviewers
Restricted Project
Commits
rG26a0aeba6171: [libc++abi] Add builtins to dynamic library link
Summary

Otherwise libc++abi.so fails to link on arm with undefined references to
some __aeabi_ builtins.

Diff Detail

Event Timeline

pattop created this revision.Feb 11 2021, 8:10 PM
Herald added subscribers: kristof.beyls, mgorny. · View Herald TranscriptFeb 11 2021, 8:10 PM
pattop requested review of this revision.Feb 11 2021, 8:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 11 2021, 8:10 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B88928: Diff 323216.Feb 11 2021, 11:18 PM
ldionne accepted this revision as: Restricted Project.Feb 15 2021, 11:58 AM
ldionne added a subscriber: ldionne.

This seems fine to me, but I'd like someone with more compiler-rt knowledge to chime in and confirm that this looks alright.

Anyone?

phosek accepted this revision.Feb 16 2021, 10:28 PM
phosek added a subscriber: phosek.

LGTM

This revision is now accepted and ready to land.Feb 16 2021, 10:28 PM
pattop added a comment.Feb 17 2021, 1:24 PM

Thanks,

I don't have commit access so someone else will need to commit.

ldionne added a comment.Feb 17 2021, 2:02 PM

Please provide Author Name <email@domain> and I'll do it. Thanks.

ldionne added a comment.Feb 17 2021, 2:03 PM

Oh, actually, that was in the Phab email I received. Got it.

pattop added a comment.Feb 17 2021, 2:06 PM

Patrick Oppenlander <patrick.oppenlander@gmail.com>

Thanks!

Closed by commit rG26a0aeba6171: [libc++abi] Add builtins to dynamic library link (authored by pattop, committed by ldionne). · Explain WhyFeb 17 2021, 2:06 PM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG26a0aeba6171: [libc++abi] Add builtins to dynamic library link.

Revision Contents

PathSize
libcxxabi/
src/
5 lines

Diff 324422

libcxxabi/src/CMakeLists.txt

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Lines
else() else()
if (LIBCXXABI_ENABLE_THREADS) if (LIBCXXABI_ENABLE_THREADS)
add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread) add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread)
endif() endif()
add_library_flags_if(LIBCXXABI_HAS_C_LIB c) add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
endif() endif()
if (LIBCXXABI_USE_COMPILER_RT)
find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
list(APPEND LIBCXXABI_SHARED_LIBRARIES "${LIBCXXABI_BUILTINS_LIBRARY}")
endif ()
if (LIBCXXABI_USE_LLVM_UNWINDER) if (LIBCXXABI_USE_LLVM_UNWINDER)
# Prefer using the in-tree version of libunwind, either shared or static. If # Prefer using the in-tree version of libunwind, either shared or static. If
# none are found fall back to using -lunwind. # none are found fall back to using -lunwind.
# FIXME: Is it correct to prefer the static version of libunwind? # FIXME: Is it correct to prefer the static version of libunwind?
if (NOT LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY AND (TARGET unwind_shared OR HAVE_LIBUNWIND)) if (NOT LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY AND (TARGET unwind_shared OR HAVE_LIBUNWIND))
list(APPEND LIBCXXABI_SHARED_LIBRARIES unwind_shared) list(APPEND LIBCXXABI_SHARED_LIBRARIES unwind_shared)
elseif (LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY AND (TARGET unwind_static OR HAVE_LIBUNWIND)) elseif (LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY AND (TARGET unwind_static OR HAVE_LIBUNWIND))
list(APPEND LIBCXXABI_SHARED_LIBRARIES unwind_static) list(APPEND LIBCXXABI_SHARED_LIBRARIES unwind_static)
▲ Show 20 Lines • Show All 238 Lines • Show Last 20 Lines