[libcxxabi] Always link against libzircon for Fuchsia targets #115910
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created using spr 1.3.4
|
@llvm/pr-subscribers-libcxxabi Author: Paul Kirth (ilovepi) ChangesWhen using LTO, the deplibs mechanism is insufficient to ensure that libzircon To work around this, we can just provide libzircon as a link input. Full diff: https://github.com/llvm/llvm-project/pull/115910.diff 1 Files Affected:
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index 84fe2784bec5ca..5a384c5345d755 100644
--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -75,6 +75,10 @@ if (NOT APPLE) # On Apple platforms, we always use -nostdlib++ so we don't need
add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
endif()
+if (FUCHSIA)
+ add_library_flags(zircon)
+endif()
+
if (NOT LIBCXXABI_USE_COMPILER_RT)
add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc)
endif()
|
Created using spr 1.3.4
Created using spr 1.3.4
petrhosek
approved these changes
Nov 14, 2024
petrhosek
reviewed
Nov 15, 2024
| @@ -75,6 +75,10 @@ if (NOT APPLE) # On Apple platforms, we always use -nostdlib++ so we don't need | |||
| add_library_flags_if(LIBCXXABI_HAS_C_LIB c) | |||
| endif() | |||
|
|
|||
| if (FUCHSIA) | |||
| add_link_flags("-Wl,--push-state,--as-needed,-lzircon,--pop-state") | |||
There was a problem hiding this comment.
I'd leave a TODO comment to use https://cmake.org/cmake/help/latest/variable/CMAKE_LINK_LIBRARY_USING_FEATURE.html once LLVM requires CMake at least 3.24.
Created using spr 1.3.6-beta.1
|
ping. Can someone for @llvm/reviewers-libcxxabi take a look at this please? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using LTO, the deplibs mechanism is insufficient to ensure that libzircon
is always brought into the link prior to LTO code generation. The general
problem is discussed in depth in
#56070
To work around this, we can just provide libzircon as a link input.