[compiler-rt] cd634f5 - [compiler-rt][AArch64][Android] Use getauxval on Android. (#102979)

[via llvm-commits]

Author: Daniel Kiss
Date: 2024-08-30T08:51:08+02:00
New Revision: cd634f57c10dedbe4f908889dece2c4460b702c9

URL: https://github.com/llvm/llvm-project/commit/cd634f57c10dedbe4f908889dece2c4460b702c9
DIFF: https://github.com/llvm/llvm-project/commit/cd634f57c10dedbe4f908889dece2c4460b702c9.diff

LOG: [compiler-rt][AArch64][Android] Use getauxval on Android. (#102979)

__getauxval is a libgcc function that doesn't exist on Android.
Also on Linux let's use getauxval as it is anyway used other places in compiler-rt.

Added: 
    

Modified: 
    compiler-rt/lib/builtins/aarch64/sme-abi-init.c

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/builtins/aarch64/sme-abi-init.c b/compiler-rt/lib/builtins/aarch64/sme-abi-init.c
index b6ee12170d56db..d3cd8278a5d214 100644
--- a/compiler-rt/lib/builtins/aarch64/sme-abi-init.c
+++ b/compiler-rt/lib/builtins/aarch64/sme-abi-init.c
@@ -7,24 +7,22 @@ _Bool __aarch64_has_sme_and_tpidr2_el0;
 
 // We have multiple ways to check that the function has SME, depending on our
 // target.
-// * For Linux we can use __getauxval().
+// * For Linux/Glibc we can use getauxval().
+// * For Android we can use getauxval().
 // * For newlib we can use __aarch64_sme_accessible().
 
 #if defined(__linux__)
 
-#ifndef AT_HWCAP2
-#define AT_HWCAP2 26
+#if defined(__ANDROID__)
+#include <sys/auxv.h>
+#elif __has_include(<sys/auxv.h>)
+#include <sys/auxv.h>
+#else
+#define getauxval(x) 0
 #endif
+#include "../cpu_model/aarch64/hwcap.inc"
 
-#ifndef HWCAP2_SME
-#define HWCAP2_SME (1 << 23)
-#endif
-
-extern unsigned long int __getauxval (unsigned long int);
-
-static _Bool has_sme(void) {
-  return __getauxval(AT_HWCAP2) & HWCAP2_SME;
-}
+static _Bool has_sme(void) { return getauxval(AT_HWCAP2) & HWCAP2_SME; }
 
 #else  // defined(__linux__)