diff options
| author | Jack Lloyd <[email protected]> | 2016-08-31 12:58:58 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-31 12:58:58 -0400 |
| commit | dfab07a7bc00dc00f98ab86c70d536306073f34f (patch) | |
| tree | d3dbb140764f259c932171d6f229d033dee685ca /src/lib/utils/cpuid.cpp | |
| parent | e29024608fca1b811aa72a7aafd930a42740b968 (diff) | |
| parent | 1b9cf39063194fe91dc8e5d78f73d7251c5d16fc (diff) | |
Merge master into this branch, resolving conflicts with #457/#576
which recently landed on master.
Diffstat (limited to 'src/lib/utils/cpuid.cpp')
| -rw-r--r-- | src/lib/utils/cpuid.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/utils/cpuid.cpp b/src/lib/utils/cpuid.cpp index 695a28550..d3def91ed 100644 --- a/src/lib/utils/cpuid.cpp +++ b/src/lib/utils/cpuid.cpp @@ -159,14 +159,12 @@ bool altivec_check_pvr_emul() bool CPUID::has_simd_32() { -#if defined(BOTAN_HAS_SIMD_SSE2) +#if defined(BOTAN_TARGET_SUPPORTS_SSE2) return CPUID::has_sse2(); -#elif defined(BOTAN_HAS_SIMD_ALTIVEC) +#elif defined(BOTAN_TARGET_SUPPORTS_ALTIVEC) return CPUID::has_altivec(); -#elif defined(BOTAN_HAS_SIMD_SCALAR) - return true; #else - return false; + return true; #endif } |