diff options
Diffstat (limited to 'nss/nss_linux.patch')
| -rw-r--r-- | nss/nss_linux.patch | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/nss/nss_linux.patch b/nss/nss_linux.patch index ee601bb1ecd0..9d768b20099f 100644 --- a/nss/nss_linux.patch +++ b/nss/nss_linux.patch @@ -1,24 +1,14 @@ ---- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:28.195966851 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:10.246610849 +0100 -@@ -131,7 +131,7 @@ - # -ansi on platforms like Android where the system headers are C99 and do - # not build with -ansi. - STANDARDS_CFLAGS = -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE --OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR -+OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR -DHAVE_UNISTD_H - OS_LIBS = $(OS_PTHREAD) -ldl -lc - - ifdef USE_PTHREADS ---- misc/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile 2013-01-31 02:08:59.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile 2014-01-10 13:57:48.000000000 +0100 -@@ -186,8 +186,8 @@ - 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 - EXTRA_SRCS += intel-gcm-wrap.c - INTEL_GCM = 1 - MPI_SRCS += mpi_amd64.c mp_comba.c +diff -ur misc/nss-3.25/nss/lib/freebl/Makefile misc/build/nss-3.25/nss/lib/freebl/Makefile +--- misc/nss-3.25/nss/lib/freebl/Makefile 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/lib/freebl/Makefile 2016-07-14 23:52:19.135925000 -0700 +@@ -153,8 +153,8 @@ + # The Intel AES assembly code requires Visual C++ 2010. + # if $(_MSC_VER) >= 1600 (Visual C++ 2010) + ifeq ($(firstword $(sort $(_MSC_VER) 1600)),1600) +- DEFINES += -DUSE_HW_AES -DINTEL_GCM +- ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm ++ #DEFINES += -DUSE_HW_AES -DINTEL_GCM ++ #ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm + EXTRA_SRCS += intel-gcm-wrap.c + ifeq ($(CLANG_CL),1) + INTEL_GCM_CLANG_CL = 1 |