diff options
| author | Danh <congdanhqx@gmail.com> | 2020-06-30 10:15:54 -0700 |
|---|---|---|
| committer | Danh <congdanhqx@gmail.com> | 2020-06-30 10:15:54 -0700 |
| commit | cccae6c55fae06569bada2dcbf7b5ff0d3adabb8 (patch) | |
| tree | bb6f077b2fd2c0923f2367f9741dd58f261ddf5e | |
| parent | 010995281156ce6da912ac3afeec5de7ba457257 (diff) | |
| download | nss-hg-cccae6c55fae06569bada2dcbf7b5ff0d3adabb8.tar.gz | |
Bug 1646594 - Enable AVX2 if applicable on x86_64 with make 4.3 r=bbeurdouche
| -rw-r--r-- | coreconf/arch.mk | 1 | ||||
| -rw-r--r-- | coreconf/config.mk | 2 | ||||
| -rw-r--r-- | lib/freebl/Makefile | 9 |
3 files changed, 10 insertions, 2 deletions
diff --git a/coreconf/arch.mk b/coreconf/arch.mk index 790372d34..cc13ced65 100644 --- a/coreconf/arch.mk +++ b/coreconf/arch.mk @@ -116,6 +116,7 @@ ifeq ($(OS_ARCH),Linux) OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) endif KERNEL = Linux + include $(CORE_DEPTH)/coreconf/Linux.mk endif # Since all uses of OS_ARCH that follow affect only userland, we can diff --git a/coreconf/config.mk b/coreconf/config.mk index 39f755d01..b65e6846c 100644 --- a/coreconf/config.mk +++ b/coreconf/config.mk @@ -149,8 +149,10 @@ DEFINES += -DNSS_DISABLE_DBM endif ifdef NSS_DISABLE_AVX2 +ifneq ($(NSS_DISABLE_AVX2),0) DEFINES += -DNSS_DISABLE_AVX2 endif +endif ifdef NSS_DISABLE_CHACHAPOLY DEFINES += -DNSS_DISABLE_CHACHAPOLY diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile index 52d827c6a..c205813b4 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile @@ -548,10 +548,12 @@ endif ifndef NSS_DISABLE_CHACHAPOLY ifeq ($(CPU_ARCH),x86_64) ifndef NSS_DISABLE_AVX2 + NSS_DISABLE_AVX2 = 0 + endif + ifeq ($(NSS_DISABLE_AVX2),0) EXTRA_SRCS += Hacl_Poly1305_256.c Hacl_Chacha20_Vec256.c Hacl_Chacha20Poly1305_256.c - else - EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c endif # NSS_DISABLE_AVX2 + EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c endif # x86_64 VERIFIED_SRCS += Hacl_Poly1305_32.c Hacl_Chacha20.c Hacl_Chacha20Poly1305_32.c @@ -735,6 +737,9 @@ $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20Poly1305_128$(OBJ_SUFFIX): CFLAGS += -mssse $(OBJDIR)/$(PROG_PREFIX)Hacl_Poly1305_128$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpclmul ifndef NSS_DISABLE_AVX2 + NSS_DISABLE_AVX2 = 0 +endif +ifeq ($(NSS_DISABLE_AVX2),0) $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20Poly1305_256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx2 -maes $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20_Vec256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -maes $(OBJDIR)/$(PROG_PREFIX)Hacl_Poly1305_256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -maes -mpclmul |