From d5567d5f6ea4773d419051f85cfdae3927519a76 Mon Sep 17 00:00:00 2001 From: yunh Date: Wed, 23 Jun 2021 09:46:42 +0800 Subject: [PATCH] enable getauxval on android 10 Fixes #9498 Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/15870) (cherry picked from commit b2dea4d5f22ec146373324c282fb1bcecd5a7d90) --- crypto/armcap.c | 6 ++++++ crypto/ppccap.c | 6 ++++++ crypto/uid.c | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/crypto/armcap.c b/crypto/armcap.c index 93aeac85a37..62e166a4dd0 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -74,6 +74,12 @@ void OPENSSL_cpuid_setup(void) __attribute__ ((constructor)); # include # define OSSL_IMPLEMENT_GETAUXVAL # endif +# elif defined(__ANDROID_API__) +/* see https://developer.android.google.cn/ndk/guides/cpu-features */ +# if __ANDROID_API__ >= 18 +# include +# define OSSL_IMPLEMENT_GETAUXVAL +# endif # endif # if defined(__FreeBSD__) # include diff --git a/crypto/ppccap.c b/crypto/ppccap.c index c9f82c6b5ee..8bcfed25e05 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -89,6 +89,12 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max) # if __GLIBC_PREREQ(2, 16) # include # define OSSL_IMPLEMENT_GETAUXVAL +# elif defined(__ANDROID_API__) +/* see https://developer.android.google.cn/ndk/guides/cpu-features */ +# if __ANDROID_API__ >= 18 +# include +# define OSSL_IMPLEMENT_GETAUXVAL +# endif # endif #endif diff --git a/crypto/uid.c b/crypto/uid.c index 55e276dfe45..60af78b9e06 100644 --- a/crypto/uid.c +++ b/crypto/uid.c @@ -36,6 +36,12 @@ int OPENSSL_issetugid(void) # include # define OSSL_IMPLEMENT_GETAUXVAL # endif +# elif defined(__ANDROID_API__) +/* see https://developer.android.google.cn/ndk/guides/cpu-features */ +# if __ANDROID_API__ >= 18 +# include +# define OSSL_IMPLEMENT_GETAUXVAL +# endif # endif int OPENSSL_issetugid(void) -- 2.47.2