diff options
| author | Adam Langley <agl@google.com> | 2015-05-08 04:28:27 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-05-08 21:34:55 +0300 |
| commit | 65a7e9442c4605b0f1581a3ff3c5afc7a8d13c13 (patch) | |
| tree | 61e9141e937576f2bfd98bdf91367518b0297751 /crypto/cpu-arm.c | |
| parent | 4d2e7ce47bab29c7c872790edd1e262776176678 (diff) | |
Support Trusty, an embedded platform.
Trusty doesn't have setjmp.h and nor does it have threads.
Change-Id: I005f7a009a13e6632513be9fab2bbe62294519a4
Reviewed-on: https://boringssl-review.googlesource.com/4660
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/cpu-arm.c')
| -rw-r--r-- | crypto/cpu-arm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crypto/cpu-arm.c b/crypto/cpu-arm.c index e7538cbe..74e937bd 100644 --- a/crypto/cpu-arm.c +++ b/crypto/cpu-arm.c @@ -17,9 +17,12 @@ #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) #include <inttypes.h> +#include <string.h> + +#if !defined(OPENSSL_TRUSTY) #include <setjmp.h> #include <signal.h> -#include <string.h> +#endif #include "arm_arch.h" @@ -59,7 +62,7 @@ void CRYPTO_set_NEON_functional(char neon_functional) { } } -#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) +#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) && !defined(OPENSSL_TRUSTY) static sigjmp_buf sigill_jmp; @@ -113,11 +116,11 @@ static int probe_for_NEON() { #else -static int probe_for_NEON() { +static int probe_for_NEON(void) { return 0; } -#endif /* !OPENSSL_NO_ASM && OPENSSL_ARM */ +#endif /* !OPENSSL_NO_ASM && OPENSSL_ARM && !OPENSSL_TRUSTY */ void OPENSSL_cpuid_setup(void) { if (getauxval == NULL) { |