diff options
| author | Anna Weine <anna.weine@mozilla.com> | 2023-04-17 08:45:04 +0000 |
|---|---|---|
| committer | Anna Weine <anna.weine@mozilla.com> | 2023-04-17 08:45:04 +0000 |
| commit | ee51da79edae57f2de4853e560a7358df61b274f (patch) | |
| tree | 1766fee1034006c24df94acbda0df227112ff6ef /coreconf | |
| parent | 8c3a9f0bbc2a9c30abdf25aaf87d65f37284bda4 (diff) | |
| download | nss-hg-ee51da79edae57f2de4853e560a7358df61b274f.tar.gz | |
Bug 1727555 - Update HACL* till 51a72a953a4ee6f91e63b2816ae5c4e62edf35d6 r=nss-reviewers,jschanck
Differential Revision: https://phabricator.services.mozilla.com/D158327
Diffstat (limited to 'coreconf')
| -rw-r--r-- | coreconf/config.mk | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/coreconf/config.mk b/coreconf/config.mk index 2ee4797bb..741bbee2e 100644 --- a/coreconf/config.mk +++ b/coreconf/config.mk @@ -131,6 +131,19 @@ endif ####################################################################### # Master "Core Components" macros for Hardware features # ####################################################################### + +ifndef NSS_DISABLE_SSE3 + NSS_DISABLE_SSE3 = 0 + ifndef CC_IS_CLANG + ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION)))) + NSS_DISABLE_SSE3 = 1 + endif + endif + ifeq (1,$(NSS_DISABLE_SSE3)) + export NSS_DISABLE_SSE3 + endif +endif #ndef NSS_DISABLE_SSE3 + ifndef NSS_DISABLE_AVX2 ifneq ($(CPU_ARCH),x86_64) # Disable AVX2 entirely on non-Intel platforms @@ -139,14 +152,9 @@ ifndef NSS_DISABLE_AVX2 else # Clang reports its version as an older gcc, but it's OK ifndef CC_IS_CLANG - ifneq (,$(filter 0 1 2 3,$(word 1,$(GCC_VERSION)))) + ifneq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION)))) NSS_DISABLE_AVX2 = 1 endif - ifeq (4,$(word 1,$(GCC_VERSION))) - ifeq (,$(filter 8 9,$(word 2,$(GCC_VERSION)))) - NSS_DISABLE_AVX2 = 1 - endif - endif endif ifeq (1,$(NSS_DISABLE_AVX2)) $(warning Unable to find gcc 4.8 or greater, disabling -mavx2) @@ -179,6 +187,10 @@ ifdef NSS_DISABLE_AVX2 DEFINES += -DNSS_DISABLE_AVX2 endif +ifdef NSS_DISABLE_SSE3 +DEFINES += -DNSS_DISABLE_SSE3 +endif + ifdef NSS_DISABLE_CHACHAPOLY DEFINES += -DNSS_DISABLE_CHACHAPOLY endif |