[embedded] Resolve a circular dependency problem in SwiftShims when using pico-libc #81857
+34
−1
Conversation
This file contains hidden or 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
kubamracek
requested review from
a team,
zoecarver,
egorzhdan,
beccadax,
Xazax-hun,
j-hui,
fahadnayyar and
susmonteiro
as code owners
|
@swift-ci please test |
j-hui
approved these changes
May 30, 2025
|
@swift-ci please test |
rauhul
approved these changes
May 30, 2025
| @@ -513,6 +513,10 @@ void importer::getNormalInvocationArguments( | |||
| "-isystem", searchPathOpts.RuntimeResourcePath, | |||
| }); | |||
|
|
|||
| if (LangOpts.hasFeature(Feature::Embedded)) { | |||
| invocationArgStrs.insert(invocationArgStrs.end(), {"-D__swift_embedded__"}); | |||
There was a problem hiding this comment.
Does this apply to all clang importer calls now? If so we need to add it to the docs. (But I'm supportive)
There was a problem hiding this comment.
Yes, all ClangImporter calls.
ian-twilightcoder
approved these changes
May 30, 2025
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.
Since we started building Builtin_Float overlay for Embedded Swift and including it in the nightly toolchains (under lib/swift/embedded), we broke building agains the pico libc -- this is a popular libc distributed for example by the official LLVM embedded ARM toolchain as well. The problem is that for non-Linux ARM embedded targets, SwiftShims includes stdint.h, and in pico libc that transitively includes float.h which triggers a dependency on the overlay. See #81594:
Let's simply avoid depending on stdint.h from SwiftShims because we already have other platforms avoiding that (for possibly a similar or same reason).
Fixes #81594.