[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  d5567d5f6ea4773d419051f85cfdae3927519a76 (commit)
      from  3d178db73b1ac13011e950baae5225837c587df1 (commit)


- Log -----------------------------------------------------------------
commit d5567d5f6ea4773d419051f85cfdae3927519a76
Author: yunh <haihai107 at 126.com>
Date:   Wed Jun 23 09:46:42 2021 +0800

    enable getauxval on android 10
    
    Fixes #9498
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15870)
    
    (cherry picked from commit b2dea4d5f22ec146373324c282fb1bcecd5a7d90)

-----------------------------------------------------------------------

Summary of changes:
 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 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>
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index c9f82c6b5e..8bcfed25e0 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 <sys/auxv.h>
 #  define OSSL_IMPLEMENT_GETAUXVAL
+# 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
 #endif
 
diff --git a/crypto/uid.c b/crypto/uid.c
index 55e276dfe4..60af78b9e0 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -36,6 +36,12 @@ int OPENSSL_issetugid(void)
 #   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
 
 int OPENSSL_issetugid(void)