Skip to content

[experiment] try fixing compiler_builtins android bug #127561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 6 commits into from
Closed

[experiment] try fixing compiler_builtins android bug #127561

wants to merge 6 commits into from

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Jul 10, 2024 •
edited
Loading

#125016 has android bugs, try patching in fixes from rust-lang/compiler-builtins#640.

More recently tested rust-lang/compiler-builtins#642. Details in rust-lang/compiler-builtins#641.

try-job: arm-android
try-job: dist-android

r? @ghost

@tgross35 tgross35 marked this pull request as draft July 10, 2024 08:33
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 10, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 10, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Portable SIMD is developed in its own repository. If possible, consider making this change to rust-lang/portable-simd instead.

cc @calebzulawski, @programmerjake

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

@tgross35
Copy link
Contributor Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2024
@bors
Auto merge of rust-lang#127561 - tgross35:builtins-experimental, r=<try>
78f447d 
[experiment] try fixing compiler_builtins android bug

rust-lang#125016 has android bugs, try patching in fixes from rust-lang/compiler-builtins#640.

try-job: arm-android

r? `@ghost`
@bors
Copy link
Collaborator

bors commented Jul 10, 2024

⌛ Trying commit e6318f9 with merge 78f447d...

@bors
Copy link
Collaborator

bors commented Jul 10, 2024

☀️ Try build successful - checks-actions
Build commit: 78f447d (78f447d1335d67b04a86e19db6c44aafad665640)

@tgross35 tgross35 mentioned this pull request Jul 11, 2024
Closed
nicholasbishop and others added 4 commits July 17, 2024 23:13
@nicholasbishop @tgross35
Add f16/f128 handling in a couple places
b46f441
@nicholasbishop @tgross35
Update compiler_builtins to 0.1.112
d3a2d75 
The `weak-intrinsics` feature was removed from compiler_builtins in
rust-lang/compiler-builtins#598, so dropped the
`compiler-builtins-weak-intrinsics` feature from alloc/std/sysroot.

In rust-lang/compiler-builtins#593, some
builtins for f16/f128 were added. These don't work for all compiler
backends, so add a `compiler-builtins-no-f16-f128` feature and disable
it for cranelift and gcc. Also disable it for LLVM targets that don't
support it.
@tgross35
fix tidy
7947992
@tgross35
Bump to a custom compiler builtins version
cc93eac
@tgross35
Copy link
Contributor Author

^ The previous test verified that reverting the switch to all weak intrinsics fixed things. Ref was 42538d8077cb3e2e86ccd4b73266b8f352af3f77 from rust-lang/compiler-builtins#640.

See some more notes at rust-lang/compiler-builtins#641

@tgross35 tgross35 force-pushed the builtins-experimental branch from e6318f9 to eb130cb Compare July 18, 2024 04:20
@tgross35
Copy link
Contributor Author

tgross35 commented Jul 18, 2024 •
edited
Loading

And now testing with rust-lang/compiler-builtins#642 ae00838dc9deefec686f282024acbaee8f289735, which makes only atomic symbols strong based on a theory

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@bors
Auto merge of rust-lang#127561 - tgross35:builtins-experimental, r=<try>
e7b1bed 
[experiment] try fixing compiler_builtins android bug

rust-lang#125016 has android bugs, try patching in fixes from rust-lang/compiler-builtins#640.

try-job: arm-android
try-job: dist-android

r? `@ghost`
@bors
Copy link
Collaborator

bors commented Jul 18, 2024

⌛ Trying commit eb130cb with merge e7b1bed...

@bors
Copy link
Collaborator

bors commented Jul 18, 2024

☀️ Try build successful - checks-actions
Build commit: e7b1bed (e7b1bed160e322d3b91ea0e4ee75d376052cafab)

@tgross35 tgross35 mentioned this pull request Jul 18, 2024
Merged
@tgross35
Copy link
Contributor Author

Going to try another rev with only the C ABI fix, see rust-lang/compiler-builtins#641 (comment). Testing CB rev e7fd5be54ae5b636d16de041e6700c80624131bf.

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@bors
Auto merge of rust-lang#127561 - tgross35:builtins-experimental, r=<try>
ae6244e 
[experiment] try fixing compiler_builtins android bug

rust-lang#125016 has android bugs, try patching in fixes from rust-lang/compiler-builtins#640.

try-job: arm-android
try-job: dist-android

r? `@ghost`
@bors
Copy link
Collaborator

bors commented Jul 18, 2024

⌛ Trying commit 28ae9dd with merge ae6244e...

@bors
Copy link
Collaborator

bors commented Jul 18, 2024

☀️ Try build successful - checks-actions
Build commit: ae6244e (ae6244e3997fdbb64184d675445d0f424d2e1e00)

@tgross35 tgross35 closed this Jul 29, 2024
@tgross35 tgross35 mentioned this pull request Aug 22, 2024
Closed
@tgross35 tgross35 deleted the builtins-experimental branch February 19, 2025 04:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tgross35 @rustbot @bors @nicholasbishop