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

Daniel Kiss via llvm-commits llvm-commits at lists.llvm.org
Mon Aug 12 14:11:58 PDT 2024


https://github.com/DanielKristofKiss created https://github.com/llvm/llvm-project/pull/102979

__getauxval is a libgcc function that doesn't exist on Android.

>From 3d36920a76e992c9a723ca4d3bccee8d0bef3251 Mon Sep 17 00:00:00 2001
From: Daniel Kiss <daniel.kiss at arm.com>
Date: Mon, 12 Aug 2024 23:05:50 +0200
Subject: [PATCH] [compiler-rt][AArch64][Android] Use getauxval on Android.

__getauxval is a libgcc function that doesn't exist on Android.
---
 compiler-rt/lib/builtins/aarch64/sme-abi-init.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/compiler-rt/lib/builtins/aarch64/sme-abi-init.c b/compiler-rt/lib/builtins/aarch64/sme-abi-init.c
index b6ee12170d56db..8b6715bd2254cd 100644
--- a/compiler-rt/lib/builtins/aarch64/sme-abi-init.c
+++ b/compiler-rt/lib/builtins/aarch64/sme-abi-init.c
@@ -7,7 +7,8 @@ _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__)
@@ -20,11 +21,15 @@ _Bool __aarch64_has_sme_and_tpidr2_el0;
 #define HWCAP2_SME (1 << 23)
 #endif
 
+#ifdef __ANDROID__
+extern unsigned long int getauxval(unsigned long int);
+#define GETAUXVAL(x) getauxval(x)
+#else
 extern unsigned long int __getauxval (unsigned long int);
+#define GETAUXVAL(x) __getauxval(x)
+#endif
 
-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__)
 



More information about the llvm-commits mailing list