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 /lib/freebl/Makefile | |
| 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 'lib/freebl/Makefile')
| -rw-r--r-- | lib/freebl/Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile index a15db872f..f492d3274 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile @@ -572,18 +572,18 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc) HAVE_INT128_SUPPORT = 1 DEFINES += -DHAVE_INT128_SUPPORT endif - 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 ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION)))) HAVE_INT128_SUPPORT = 1 DEFINES += -DHAVE_INT128_SUPPORT endif + ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION)))) + NSS_DISABLE_SSE3 = 1 + NSS_DISABLE_SSE4_1 = 1 + NSS_DISABLE_SSE4_2 = 1 + endif endif endif # lcc endif # USE_64 @@ -596,8 +596,12 @@ ifndef NSS_DISABLE_CHACHAPOLY ifeq ($(CPU_ARCH),x86_64) ifndef NSS_DISABLE_AVX2 EXTRA_SRCS += Hacl_Poly1305_256.c Hacl_Chacha20_Vec256.c Hacl_Chacha20Poly1305_256.c + DEFINES += -DHACL_CAN_COMPILE_VEC256 endif # NSS_DISABLE_AVX2 - EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c + ifndef NSS_DISABLE_SSE3 + EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c + DEFINES += -DHACL_CAN_COMPILE_VEC128 + endif endif # x86_64 VERIFIED_SRCS += Hacl_Poly1305_32.c Hacl_Chacha20.c Hacl_Chacha20Poly1305_32.c @@ -639,7 +643,7 @@ vpath %.c mpi ecl verified deprecated vpath %.S mpi ecl vpath %.s mpi ecl vpath %.asm mpi ecl -INCLUDES += -Impi -Iecl -Iverified -Iverified/kremlin/include -Iverified/kremlin/kremlib/dist/minimal -Ideprecated +INCLUDES += -Impi -Iecl -Iverified -Iverified/internal -Iverified/karamel/include -Iverified/karamel/krmllib/dist/minimal -Ideprecated DEFINES += -DMP_API_COMPATIBLE |