Skip to content
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

[Bug]: Fix ABI mismatch between FMV and ifunc resolver #1909

Closed
pirama-arumuga-nainar opened this issue Jul 20, 2023 · 3 comments
Closed

[Bug]: Fix ABI mismatch between FMV and ifunc resolver #1909

pirama-arumuga-nainar opened this issue Jul 20, 2023 · 3 comments
Assignees
@pirama-arumuga-nainar
Labels
bug

Comments

@pirama-arumuga-nainar
Copy link
Collaborator

Description

Need to cherry-pick https://reviews.llvm.org/D155026

Snippet of the discussion:

Android iFunc resolver ABI FMV issue.
It takes (uint64_t hwcap, __ifunc_arg_t *arg), but FMV expects (uint64_t hwcap, uint64_t hwcap2) ifunc resolver call arg struct
Need to get init_cpu_features_resolver compiler-rt/lib/builtins/cpu_model.c fixed in NDK, patch for review https://reviews.llvm.org/D155026

Upstream bug

No response

Commit to cherry-pick

https://reviews.llvm.org/rG61962aa1eec922c7dddd36897bb29888b4c98174

Affected versions

r26

Canary version

No response

Host OS

Linux, Mac, Windows

Host OS version

All

Affected ABIs

arm64-v8a
@github-project-automation github-project-automation bot moved this to Triaged in NDK r26 Jul 20, 2023
@DanAlbert DanAlbert moved this from Triaged to Needs cherry-pick in NDK r26 Jul 20, 2023
@pirama-arumuga-nainar
Copy link
Collaborator Author

@ilinpv the fix doesn't cherry-pick cleanly to the llvm-r487747 branch slated for r26. Can you fix the merge conflicts and upload a CL?

@ilinpv
Copy link

ilinpv commented Jul 24, 2023

@pirama-arumuga-nainar here it is https://android-review.googlesource.com/c/toolchain/llvm_android/+/2672879

@DanAlbert DanAlbert moved this from Needs cherry-pick to Needs prebuilt update in NDK r26 Aug 7, 2023
@DanAlbert DanAlbert moved this from Needs prebuilt update to Merged in NDK r26 Aug 7, 2023
@github-project-automation github-project-automation bot moved this to Triaged in NDK r26b Oct 5, 2023
@DanAlbert
Copy link
Member

The toolchain update that fixed this was accidentally not included in r26 RC 1 as we had intended. The fix will be in r26b.

@DanAlbert DanAlbert reopened this Oct 5, 2023
@DanAlbert DanAlbert moved this from Triaged to Merged in NDK r26b Oct 5, 2023
rooteduniverse1003 pushed a commit to rooteduniverse1003/Android-Platform-NDK that referenced this issue Nov 22, 2023
@DanAlbert
Correct the r26 LLVM changelog.
1ec485a 
We included a few changelog updates for the "d" toolchain, and even
included the new prebuilts, but neglected to actually update the NDK's
config.

The toolchain itself needs to be updated directly in the release branch
because master has already moved on for rv64 support.
https://r.android.com/2775899 does the update (but will be abandoned
once coastguard picks it up).

Bug: android/ndk#1907
Bug: android/ndk#1909
Test: None
(cherry picked from https://android-review.googlesource.com/q/commit:5e7ffb1e850ae5aac90540ea6e30320f9d61d40c)
Merged-In: Ibff877a664290979aa8488341f92f145797889a8
Change-Id: Ibff877a664290979aa8488341f92f145797889a8
rooteduniverse1003 pushed a commit to rooteduniverse1003/Android-Platform-NDK that referenced this issue Nov 22, 2023
@DanAlbert
Update LLVM to r487747d.
3784550 
The changelog update is in master. The toolchain can't be updated
there because it's already moved ahead for rv64.

Bug: android/ndk#1907
Bug: android/ndk#1909
Test: ./checkbuild.py && ./run_tests.py
(cherry picked from https://android-review.googlesource.com/q/commit:7469b730771a4c1a8dcb80ea832a462281e989ab)
Merged-In: I7f95f46b6233d7bf89821d78c5b91cde5267b3c8
Change-Id: I7f95f46b6233d7bf89821d78c5b91cde5267b3c8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@pirama-arumuga-nainar pirama-arumuga-nainar

Labels
bug
Projects
No open projects
NDK r26
Status: Merged
NDK r26b
Status: Merged
Milestone
No milestone
Development

No branches or pull requests
3 participants
@DanAlbert @pirama-arumuga-nainar @ilinpv