third_party/instrumented_libraries/nss.diff - Issue 361473002: Instrumented libraries: improve handling of custom patches.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/instrumented_libraries/nss.diff

Issue 361473002: Instrumented libraries: improve handling of custom patches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use -i to pass filename to patch Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/instrumented_libraries/nss.diff

diff --git a/third_party/instrumented_libraries/nss.diff b/third_party/instrumented_libraries/nss.diff

deleted file mode 100644

index c1c6cb12499b1fb00ff979e305b9926ff85c981b..0000000000000000000000000000000000000000

--- a/third_party/instrumented_libraries/nss.diff

+++ /dev/null

@@ -1,15 +0,0 @@

-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-01-31 00:15:56.495855749 +0400

-@@ -186,8 +186,9 @@ ifeq ($(CPU_ARCH),x86_64)

- 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

-+# Disable inline asm in instrumented builds.

-+# 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