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