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

[pirama-arumuga-nainar]

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

[pirama-arumuga-nainar]

@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]

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

[DanAlbert]

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