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

Side by Side Diff

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

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

Side by Side Diff: third_party/instrumented_libraries/patches/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, 5 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:

OLD	NEW
1 diff -rupN ./nss/lib/freebl/Makefile ../nss-3.15.4-patched/nss/lib/freebl/Makefi le	1 diff -rupN ./nss/lib/freebl/Makefile ../nss-3.15.4-patched/nss/lib/freebl/Makefi le

2 --- ./nss/lib/freebl/Makefile 2014-01-03 23:59:10.000000000 +0400	2 --- ./nss/lib/freebl/Makefile 2014-01-03 23:59:10.000000000 +0400

3 +++ ../nss-3.15.4-patched/nss/lib/freebl/Makefile 2014-01-31 00:15:56.4958 55749 +0400	3 +++ ../nss-3.15.4-patched/nss/lib/freebl/Makefile 2014-01-31 00:15:56.4958 55749 +0400

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

5 DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN	5 DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN

6 # DEFINES += -DMPI_AMD64_ADD	6 # DEFINES += -DMPI_AMD64_ADD

7 # comment the next two lines to turn off intel HW accelleration	7 # comment the next two lines to turn off intel HW accelleration

8 - DEFINES += -DUSE_HW_AES	8 - DEFINES += -DUSE_HW_AES

9 - ASFILES += intel-aes.s intel-gcm.s	9 - ASFILES += intel-aes.s intel-gcm.s

10 +# Disable inline asm in instrumented builds.	10 +# Disable inline asm in instrumented builds.

11 +# DEFINES += -DUSE_HW_AES	11 +# DEFINES += -DUSE_HW_AES

12 +# ASFILES += intel-aes.s intel-gcm.s	12 +# ASFILES += intel-aes.s intel-gcm.s

13 EXTRA_SRCS += intel-gcm-wrap.c	13 EXTRA_SRCS += intel-gcm-wrap.c

14 INTEL_GCM = 1	14 INTEL_GCM = 1

15 MPI_SRCS += mpi_amd64.c mp_comba.c	15 MPI_SRCS += mpi_amd64.c mp_comba.c

OLD	NEW