Skip to content

[android] do not import stdatomic from android's libc++#74348

Merged
hyp merged 1 commit into
swiftlang:mainfrom
hyp:eng/android-stdatomiccxx23
Jun 13, 2024
Merged

[android] do not import stdatomic from android's libc++#74348
hyp merged 1 commit into
swiftlang:mainfrom
hyp:eng/android-stdatomiccxx23

Conversation

@hyp

@hyp hyp commented Jun 12, 2024

Copy link
Copy Markdown
Contributor

android's libc++ uses an older module map that requires C++23 for stdatomic, and thus it fails to compile with anything else

not quite sure why this worked in the initial testing, but after some changes in LLVM/Swift the Android import requires stdatomic not to come from libc++ as it has an outdated requirement.

android's libc++ uses an older module map that requires C++23 for stdatomic, and thus it fails to compile with anything else
@hyp hyp requested a review from ian-twilightcoder June 12, 2024 17:05
@hyp hyp requested review from a team, egorzhdan and zoecarver as code owners June 12, 2024 17:05
@hyp

hyp commented Jun 12, 2024

Copy link
Copy Markdown
Contributor Author

CC @finagolfin as well

@hyp

hyp commented Jun 12, 2024

Copy link
Copy Markdown
Contributor Author

@swift-ci please test

@finagolfin

Copy link
Copy Markdown
Member

I don't use C++ interop myself so I don't know much about this issue: @egorzhdan or someone else will have to review.

Some good news though: I tracked down the change in the Termux headers that was causing the Swift/C++ interop issue there, along with a bizarre function overloading issue in the libc++ headers that I simply commented out for now. I will run the full Swift compiler validation suite in Termux next and see if those Termux header changes fix most of the C++ interop issues I have been seeing in Termux.

@hyp

hyp commented Jun 13, 2024

Copy link
Copy Markdown
Contributor Author

Some good news though: I tracked down the change in the Termux headers that was causing the Swift/C++ interop issue there, along with a bizarre function overloading issue in the libc++ headers that I simply commented out for now. I will run the full Swift compiler validation suite in Termux next and see if those Termux header changes fix most of the C++ interop issues I have been seeing in Termux.

Cool, that sounds good!

I will merge this in, to unblock further testing and cherry-picking the Android changes to swift 6.

@hyp hyp merged commit a49eb8e into swiftlang:main Jun 13, 2024
hyp added a commit to hyp/swift that referenced this pull request Jun 27, 2024
[android] do not import stdatomic from android's libc++
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants