739351d476
Change log:95336cb92b..191d55580eFull diff:95336cb92b..191d55580eRoll chromium third_party 4e16929f46..3a8f2a9e1e Change log:4e16929f46..3a8f2a9e1eChanged dependencies: * src/tools:c44a3f5eca..f524a53b81DEPS diff:95336cb92b..191d55580e/DEPS No update to Clang. TBR=titovartem@google.com, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: Ic9c4a62b050383646e9fcf5cc07a5653c14ac06e Reviewed-on: https://webrtc-review.googlesource.com/76120 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23205}
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
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
|
|
@@ -214,18 +214,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 += -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_IS_LITTLE_ENDIAN
|
|
# DEFINES += -DMPI_AMD64_ADD
|
|
# 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 -DINTEL_GCM
|
|
+# 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
|