blob: 810a8e80bbccceebae847ae72c4aaffdaeb74c58 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -68,12 +68,6 @@
# 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>
@@ -94,15 +88,6 @@
# endif
/*
- * Android: according to https://developer.android.com/ndk/guides/cpu-features,
- * getauxval is supported starting with API level 18
- */
-# if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-
-/*
* ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
* AArch64 used AT_HWCAP.
*/
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -211,12 +211,6 @@
# 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
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -36,12 +36,6 @@
# 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)
|
