OLD | NEW |
1 diff -rupN ./nss/lib/freebl/Makefile ../nss-3.17.1-patched/nss/lib/freebl/Makefi
le | 1 diff -rupN ./nss/lib/freebl/Makefile ../nss-3.17.1-patched/nss/lib/freebl/Makefi
le |
2 --- ./nss/lib/freebl/Makefile 2014-09-23 23:09:22.000000000 +0400 | 2 --- ./nss/lib/freebl/Makefile 2014-09-23 23:09:22.000000000 +0400 |
3 +++ ../nss-3.17.1-patched/nss/lib/freebl/Makefile 2014-09-26 20:36:05.6393
17008 +0400 | 3 +++ ../nss-3.17.1-patched/nss/lib/freebl/Makefile 2014-09-26 20:36:05.6393
17008 +0400 |
4 @@ -196,18 +196,20 @@ endif # Darwin | 4 @@ -214,18 +214,20 @@ endif # Darwin |
5 | 5 |
6 ifeq ($(OS_TARGET),Linux) | 6 ifeq ($(OS_TARGET),Linux) |
7 ifeq ($(CPU_ARCH),x86_64) | 7 ifeq ($(CPU_ARCH),x86_64) |
8 - ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s | 8 - ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s |
9 +# Disable inline asm in instrumented builds. | 9 +# Disable inline asm in instrumented builds. |
10 +# ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s | 10 +# ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s |
11 ASFLAGS += -fPIC -Wa,--noexecstack | 11 ASFLAGS += -fPIC -Wa,--noexecstack |
12 - DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY | 12 - DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY |
13 - DEFINES += -DNSS_USE_COMBA | 13 - DEFINES += -DNSS_USE_COMBA |
14 +# DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY | 14 +# DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY |
15 +# DEFINES += -DNSS_USE_COMBA | 15 +# DEFINES += -DNSS_USE_COMBA |
16 DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN | 16 DEFINES += -DMP_IS_LITTLE_ENDIAN |
17 # DEFINES += -DMPI_AMD64_ADD | 17 # DEFINES += -DMPI_AMD64_ADD |
18 # comment the next four lines to turn off Intel HW acceleration. | 18 # comment the next four lines to turn off Intel HW acceleration. |
19 - DEFINES += -DUSE_HW_AES -DINTEL_GCM | 19 - DEFINES += -DUSE_HW_AES -DINTEL_GCM |
20 - ASFILES += intel-aes.s intel-gcm.s | 20 - ASFILES += intel-aes.s intel-gcm.s |
21 +# DEFINES += -DUSE_HW_AES -DINTEL_GCM | 21 +# DEFINES += -DUSE_HW_AES -DINTEL_GCM |
22 +# ASFILES += intel-aes.s intel-gcm.s | 22 +# ASFILES += intel-aes.s intel-gcm.s |
23 +# This is just intrinsics and should be fine. | 23 +# This is just intrinsics and should be fine. |
24 EXTRA_SRCS += intel-gcm-wrap.c | 24 EXTRA_SRCS += intel-gcm-wrap.c |
25 INTEL_GCM = 1 | 25 INTEL_GCM = 1 |
26 - MPI_SRCS += mpi_amd64.c mp_comba.c | 26 - MPI_SRCS += mpi_amd64.c mp_comba.c |
27 +# MPI_SRCS += mpi_amd64.c mp_comba.c | 27 +# MPI_SRCS += mpi_amd64.c mp_comba.c |
28 endif | 28 endif |
29 ifeq ($(CPU_ARCH),x86) | 29 ifeq ($(CPU_ARCH),x86) |
30 ASFILES = mpi_x86.s | 30 ASFILES = mpi_x86.s |
OLD | NEW |