kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't probe for NEON with SIGILL on aarch64.

Browse Source 
We assume that AArch64 systems are modern enough to have getauxval.

Change-Id: I4cc74f04ca5ed50b8ca1cfd00afeaaa01c6caca0
Reviewed-on: https://boringssl-review.googlesource.com/3280
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2015-02-03 11:47:10 -08:00 committed by Adam Langley
parent 0ea8dda93e
commit 8f5e2ebcee
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/cpu-arm-asm.S
View File

@ -12,7 +12,7 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#if !defined(OPENSSL_NO_ASM)
#if !defined(OPENSSL_NO_ASM) && defined(__arm__)
.syntax unified
.cpu cortex-a8
@ -29,4 +29,4 @@ CRYPTO_arm_neon_probe:
bx lr
.section .note.GNU-stack,"",%progbits
#endif /* !OPENSSL_NO_ASM */
#endif /* !OPENSSL_NO_ASM && __arm__ */

21
crypto/cpu-arm.c
View File

@ -62,6 +62,8 @@ void CRYPTO_set_NEON_functional(char neon_functional) {
}
}
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM)
static sigjmp_buf sigill_jmp;
static void sigill_handler(int signal) {
@ -76,7 +78,6 @@ void CRYPTO_arm_neon_probe();
static int probe_for_NEON() {
int supported = 0;
#if !defined(OPENSSL_NO_ASM)
sigset_t sigmask;
sigfillset(&sigmask);
sigdelset(&sigmask, SIGILL);
@ -109,16 +110,26 @@ static int probe_for_NEON() {
sigaction(SIGILL, &sigill_original_action, NULL);
sigprocmask(SIG_SETMASK, &original_sigmask, NULL);
#endif
return supported;
}
#else
static int probe_for_NEON() {
return 0;
}
#endif /* !OPENSSL_NO_ASM && OPENSSL_ARM */
void OPENSSL_cpuid_setup(void) {
if (getauxval == NULL) {
// |CRYPTO_is_NEON_capable| can be true even if |CRYPTO_set_NEON_capable|
// has never been called if the code was compiled with NEON support enabled
// (e.g. -mfpu=neon).
// On ARM, but not AArch64, try a NEON instruction and see whether it works
// in order to probe for NEON support.
//
// Note that |CRYPTO_is_NEON_capable| can be true even if
// |CRYPTO_set_NEON_capable| has never been called if the code was compiled
// with NEON support enabled (e.g. -mfpu=neon).
if (!g_set_neon_called && !CRYPTO_is_NEON_capable() && probe_for_NEON()) {
OPENSSL_armcap_P |= ARMV7_NEON;
}