diff options
| author | myfreeweb <greg@unrelenting.technology> | 2020-03-20 13:33:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 13:33:26 +0300 |
| commit | c5b67767b1f9a0da50cfce60026577797c66f7d9 (patch) | |
| tree | c555a467f049a7ff5467cc325120c021ef971fd5 | |
| parent | d7b108ee11053845610bf5155672ff609f84e8db (diff) | |
FreeBSD/aarch64 feature detection and clang asm build fix (#23)
* crypto: add aarch64 (arm64) feature detection for FreeBSD (12.0 and up)
* armv8 asm: use armv8+crypto mode on clang (for FreeBSD)
The original ifdef construction configures non-clang and Android clang,
but ignores clang on other platforms completely.
The Android part was for handling clang older than 3.0.0 (!),
which is pretty ancient at this point, so this can be simplified
to use the same target always.
| -rw-r--r-- | crypto/aes/asm/aesv8-armx.pl | 8 | ||||
| -rw-r--r-- | crypto/cpu-aarch64-linux.c | 44 | ||||
| -rw-r--r-- | crypto/modes/asm/ghashv8-armx.pl | 8 |
3 files changed, 44 insertions, 16 deletions
diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl index 89e6f874..c41175a6 100644 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -51,15 +51,7 @@ $code=<<___; .text ___ $code.=<<___ if ($flavour =~ /64/); -#if !defined(__clang__) .arch armv8-a+crypto -#elif defined(ANDROID) && defined(__clang__) -#if __clang_major__ > 3 -.arch armv8-a+crypto -#else -.arch armv8-a+crypto,+neon -#endif -#endif ___ $code.=".arch armv7-a\n.fpu neon\n.code 32\n" if ($flavour !~ /64/); #^^^^^^ this is done to simplify adoption by not depending diff --git a/crypto/cpu-aarch64-linux.c b/crypto/cpu-aarch64-linux.c index 1b0f3955..93d12237 100644 --- a/crypto/cpu-aarch64-linux.c +++ b/crypto/cpu-aarch64-linux.c @@ -25,6 +25,48 @@ extern uint32_t OPENSSL_armcap_P; +#if defined(__FreeBSD__) + +#include <stdlib.h> +#include <sys/types.h> +#include <machine/armreg.h> + +// Support for older version of armreg.h +#ifndef ID_AA64ISAR0_AES_VAL +#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES +#endif +#ifndef ID_AA64ISAR0_SHA1_VAL +#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 +#endif +#ifndef ID_AA64ISAR0_SHA2_VAL +#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 +#endif + +void OPENSSL_cpuid_setup(void) { + if (getenv("QEMU_EMULATING") != NULL) { + return; + } + + uint64_t isar0_val = READ_SPECIALREG(id_aa64isar0_el1); + + OPENSSL_armcap_P |= ARMV7_NEON; + + if (ID_AA64ISAR0_AES_VAL(isar0_val) >= ID_AA64ISAR0_AES_BASE) { + OPENSSL_armcap_P |= ARMV8_PMULL; + } + if (ID_AA64ISAR0_AES_VAL(isar0_val) >= ID_AA64ISAR0_AES_PMULL) { + OPENSSL_armcap_P |= ARMV8_PMULL; + } + if (ID_AA64ISAR0_SHA1_VAL(isar0_val) >= ID_AA64ISAR0_SHA1_BASE) { + OPENSSL_armcap_P |= ARMV8_SHA1; + } + if (ID_AA64ISAR0_SHA2_VAL(isar0_val) >= ID_AA64ISAR0_SHA2_BASE) { + OPENSSL_armcap_P |= ARMV8_SHA256; + } +} + +#else // linux + void OPENSSL_cpuid_setup(void) { unsigned long hwcap = getauxval(AT_HWCAP); @@ -58,4 +100,6 @@ void OPENSSL_cpuid_setup(void) { } } +#endif + #endif /* OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP */ diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl index 73421405..eabef0cb 100644 --- a/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/modes/asm/ghashv8-armx.pl @@ -59,15 +59,7 @@ $code=<<___; .text ___ $code.=<<___ if ($flavour =~ /64/); -#if !defined(__clang__) .arch armv8-a+crypto -#elif defined(ANDROID) && defined(__clang__) -#if __clang_major__ > 3 -.arch armv8-a+crypto -#else -.arch armv8-a+crypto,+neon -#endif -#endif ___ $code.=".fpu neon\n.code 32\n" if ($flavour !~ /64/); |