1 diff -rupN ./nss/lib/freebl/Makefile ../nss-3.15.4-patched/nss/lib/freebl/Makefile
2 --- ./nss/lib/freebl/Makefile 2014-01-03 23:59:10.000000000 +0400
3 +++ ../nss-3.15.4-patched/nss/lib/freebl/Makefile 2014-06-27 00:07:28.017558175 +0400
4 @@ -179,18 +179,20 @@ endif # Darwin
6 ifeq ($(OS_TARGET),Linux)
7 ifeq ($(CPU_ARCH),x86_64)
8 - ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s
9 +# Disable inline asm in instrumented builds.
10 +# ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s
11 ASFLAGS += -m64 -fPIC -Wa,--noexecstack
12 - DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
13 - DEFINES += -DNSS_USE_COMBA
14 +# DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
15 +# DEFINES += -DNSS_USE_COMBA
16 DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
17 # DEFINES += -DMPI_AMD64_ADD
18 # comment the next two lines to turn off intel HW accelleration
19 - DEFINES += -DUSE_HW_AES
20 - ASFILES += intel-aes.s intel-gcm.s
21 +# DEFINES += -DUSE_HW_AES
22 +# ASFILES += intel-aes.s intel-gcm.s
23 +# This is just intrinsics and should be fine.
24 EXTRA_SRCS += intel-gcm-wrap.c
26 - MPI_SRCS += mpi_amd64.c mp_comba.c
27 +# MPI_SRCS += mpi_amd64.c mp_comba.c
29 ifeq ($(CPU_ARCH),x86)