diff options
| author | Adam Langley <agl@google.com> | 2015-04-29 03:46:58 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-05-05 03:31:46 +0300 |
| commit | 843ab66e17abd347546480df77b5140c5b7f50bd (patch) | |
| tree | a58bb22a6571929c047643bc3c712fdeb1f7aba9 /crypto/cpu-arm.c | |
| parent | f868409124747fba1b3ec070c0a5a7821cdb4649 (diff) | |
Add support for building with the Android NDK.
Previously I've been using the Linaro toolchains and just building
static binaries. However, the Linaro toolchains have a broken
pthread_rwlock_wrlock—it does nothing and then unlocking corrupts the
lock.
Building with the Android NDK avoids this.
These build instructions depend on
https://github.com/taka-no-me/android-cmake which people will need to
clone into util/ if they want to use the Android NDK.
Change-Id: Ic64919f9399af2a57e8df4fb4b3400865ddb2427
Reviewed-on: https://boringssl-review.googlesource.com/4600
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/cpu-arm.c')
| -rw-r--r-- | crypto/cpu-arm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/cpu-arm.c b/crypto/cpu-arm.c index 27f9bf9b..e7538cbe 100644 --- a/crypto/cpu-arm.c +++ b/crypto/cpu-arm.c @@ -30,9 +30,6 @@ unsigned long getauxval(unsigned long type) __attribute__((weak)); -static const unsigned long AT_HWCAP = 16; -static const unsigned long AT_HWCAP2 = 26; - char CRYPTO_is_NEON_capable(void) { return (OPENSSL_armcap_P & ARMV7_NEON) != 0; } @@ -136,6 +133,7 @@ void OPENSSL_cpuid_setup(void) { return; } + static const unsigned long AT_HWCAP = 16; unsigned long hwcap = getauxval(AT_HWCAP); #if defined(OPENSSL_ARM) @@ -146,6 +144,7 @@ void OPENSSL_cpuid_setup(void) { /* In 32-bit mode, the ARMv8 feature bits are in a different aux vector * value. */ + static const unsigned long AT_HWCAP2 = 26; hwcap = getauxval(AT_HWCAP2); /* See /usr/include/asm/hwcap.h on an ARM installation for the source of |