diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-10-21 15:28:49 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-10-21 15:28:49 +0000 |
| commit | ece960ee909f7ed0db3a75cc746a67f7286e10c4 (patch) | |
| tree | 05834c40d01f73b027a63b10e050e70fe012540d | |
| parent | e2bc81590564050c872820c6b14687f1d3be279a (diff) | |
| parent | 82d02f2928f2c7e6a829724a70c1b77721eae5b7 (diff) | |
| download | gnutls-ece960ee909f7ed0db3a75cc746a67f7286e10c4.tar.gz | |
Merge branch 'fix-avx-detection' into 'master'
x86: fix avx detection
Closes #1083
See merge request gnutls/gnutls!1334
| -rw-r--r-- | lib/accelerated/x86/x86-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c index 29410e51fd..7688b0c778 100644 --- a/lib/accelerated/x86/x86-common.c +++ b/lib/accelerated/x86/x86-common.c @@ -82,8 +82,8 @@ unsigned int _gnutls_x86_cpuid_s[4]; #endif #ifndef OSXSAVE_MASK -/* OSXSAVE|FMA|MOVBE */ -# define OSXSAVE_MASK (0x8000000|0x1000|0x400000) +/* OSXSAVE|MOVBE */ +# define OSXSAVE_MASK (0x8000000|0x400000) #endif #ifndef bit_MOVBE @@ -188,7 +188,7 @@ static void capabilities_to_intel_cpuid(unsigned capabilities) if (capabilities & INTEL_AVX) { if ((a[1] & bit_AVX) && check_4th_gen_intel_features(a[1])) { - _gnutls_x86_cpuid_s[1] |= bit_AVX|bit_MOVBE; + _gnutls_x86_cpuid_s[1] |= bit_AVX|OSXSAVE_MASK; } else { _gnutls_debug_log ("AVX acceleration requested but not available\n"); |