diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2021-11-21 00:00:52 -0500 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-07 15:44:14 +0200 |
| commit | 3ceb3ee7efe946a400865cd9203754d9bccd7cbe (patch) | |
| tree | 8a3c3d5b00c17344ac4f4d5645710d4fb8c74283 | |
| parent | 3adf5e5d9cd5108c699e4b4914dce59cae59b07e (diff) | |
| download | uxp-3ceb3ee7efe946a400865cd9203754d9bccd7cbe.tar.gz | |
Issue #1847 - Get NSS gyp to understand disabling avx2 in freebl
| -rw-r--r-- | security/nss/coreconf/config.gypi | 6 | ||||
| -rw-r--r-- | security/nss/lib/freebl/freebl.gyp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi index d188759653..58f46125ef 100644 --- a/security/nss/coreconf/config.gypi +++ b/security/nss/coreconf/config.gypi @@ -100,6 +100,7 @@ 'disable_tests%': 0, 'disable_chachapoly%': 0, 'disable_dbm%': 1, + 'disable_avx2%': 1, 'disable_libpkix%': 1, 'disable_werror%': 0, 'disable_altivec%': 0, @@ -564,6 +565,11 @@ 'NSS_DISABLE_DBM', ], }], + [ 'disable_avx2==1', { + 'defines': [ + 'NSS_DISABLE_AVX2', + ], + }], [ 'disable_libpkix==1', { 'defines': [ 'NSS_DISABLE_LIBPKIX', diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp index dd9446da60..a5f5c8d0ec 100644 --- a/security/nss/lib/freebl/freebl.gyp +++ b/security/nss/lib/freebl/freebl.gyp @@ -129,7 +129,7 @@ '<(DEPTH)/exports.gyp:nss_exports' ], 'conditions': [ - [ 'target_arch=="x64"', { + [ 'target_arch=="x64" and disable_avx2==0', { 'cflags': [ '-mssse3', '-msse4.1', @@ -179,7 +179,7 @@ '-mfpu=neon' ], }], - [ 'target_arch=="x64"', { + [ 'target_arch=="x64" and disable_avx2==0', { 'sources': [ 'verified/Hacl_Poly1305_256.c', 'verified/Hacl_Chacha20_Vec256.c', |