From 2ac6c6dd20fe6cc0b06905a46ed491d1d42df539 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 7 Aug 2017 07:58:16 -0400 Subject: [PATCH] Add Aarch32 and Aarch64 specific guards for Linux --- crc-simd.cpp | 2 +- gcm-simd.cpp | 2 +- rijndael-simd.cpp | 2 +- sha-simd.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crc-simd.cpp b/crc-simd.cpp index 10eb206c..bda4b2d2 100644 --- a/crc-simd.cpp +++ b/crc-simd.cpp @@ -78,7 +78,7 @@ bool CPU_TryCRC32_ARMV8() } return result; #else -# if defined(__linux__) +# if defined(__linux__) && (defined(__aarch32__) || defined(__aarch64__)) if (getauxval(AT_HWCAP) & HWCAP_CRC32) return true; # endif diff --git a/gcm-simd.cpp b/gcm-simd.cpp index 78b4ebbe..d42307d3 100644 --- a/gcm-simd.cpp +++ b/gcm-simd.cpp @@ -211,7 +211,7 @@ bool CPU_TryPMULL_ARMV8() } return result; # else -# if defined(__linux__) +# if defined(__linux__) && (defined(__aarch32__) || defined(__aarch64__)) if (getauxval(AT_HWCAP) & HWCAP_PMULL) return true; # endif diff --git a/rijndael-simd.cpp b/rijndael-simd.cpp index 871f6095..74b2e1b2 100644 --- a/rijndael-simd.cpp +++ b/rijndael-simd.cpp @@ -101,7 +101,7 @@ bool CPU_TryAES_ARMV8() } return result; # else -# if defined(__linux__) +# if defined(__linux__) && (defined(__aarch32__) || defined(__aarch64__)) if (getauxval(AT_HWCAP) & HWCAP_AES) return true; # endif diff --git a/sha-simd.cpp b/sha-simd.cpp index 7b8368a5..07ee69e1 100644 --- a/sha-simd.cpp +++ b/sha-simd.cpp @@ -85,7 +85,7 @@ bool CPU_TrySHA1_ARMV8() } return result; # else -# if defined(__linux__) +# if defined(__linux__) && (defined(__aarch32__) || defined(__aarch64__)) if (getauxval(AT_HWCAP) & HWCAP_SHA1) return true; # endif @@ -148,7 +148,7 @@ bool CPU_TrySHA2_ARMV8() } return result; #else -# if defined(__linux__) +# if defined(__linux__) && (defined(__aarch32__) || defined(__aarch64__)) if (getauxval(AT_HWCAP) & HWCAP_SHA2) return true; # endif