summaryrefslogtreecommitdiffstats
path: root/crypto/armcap.c
diff options
context:
space:
mode:
authoryunh <haihai107@126.com>2021-06-23 09:46:42 +0800
committerPauli <pauli@openssl.org>2021-06-25 18:31:05 +1000
commitd5567d5f6ea4773d419051f85cfdae3927519a76 (patch)
tree7bb13520483eb6e845e73ccc3797991e91b90e1d /crypto/armcap.c
parent3d178db73b1ac13011e950baae5225837c587df1 (diff)
enable getauxval on android 10
Fixes #9498 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15870) (cherry picked from commit b2dea4d5f22ec146373324c282fb1bcecd5a7d90)
Diffstat (limited to 'crypto/armcap.c')
-rw-r--r--crypto/armcap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/armcap.c b/crypto/armcap.c
index 93aeac85a3..62e166a4dd 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -74,6 +74,12 @@ void OPENSSL_cpuid_setup(void) __attribute__ ((constructor));
# include <sys/auxv.h>
# define OSSL_IMPLEMENT_GETAUXVAL
# endif
+# elif defined(__ANDROID_API__)
+/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+# if __ANDROID_API__ >= 18
+# include <sys/auxv.h>
+# define OSSL_IMPLEMENT_GETAUXVAL
+# endif
# endif
# if defined(__FreeBSD__)
# include <sys/param.h>