Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / instrumented_libraries / patches / nss.diff

diff --git a/src/third_party/instrumented_libraries/patches/nss.diff b/src/third_party/instrumented_libraries/patches/nss.diff
index 24adde7..1275e5a 100644 (file)
--- a/src/third_party/instrumented_libraries/patches/nss.diff
+++ b/src/third_party/instrumented_libraries/patches/nss.diff
@@ -1,24 +1,24 @@
-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
+diff -rupN ./nss/lib/freebl/Makefile ../nss-3.17.1-patched/nss/lib/freebl/Makefile
+--- ./nss/lib/freebl/Makefile  2014-09-23 23:09:22.000000000 +0400
++++ ../nss-3.17.1-patched/nss/lib/freebl/Makefile      2014-09-26 20:36:05.639317008 +0400
+@@ -196,18 +196,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
+     ASFLAGS += -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
+     # comment the next four lines to turn off Intel HW acceleration.
+-    DEFINES += -DUSE_HW_AES -DINTEL_GCM
 -    ASFILES += intel-aes.s intel-gcm.s
-+#    DEFINES += -DUSE_HW_AES
++#    DEFINES += -DUSE_HW_AES -DINTEL_GCM
 +#    ASFILES += intel-aes.s intel-gcm.s
 +#   This is just intrinsics and should be fine.
      EXTRA_SRCS += intel-gcm-wrap.c