Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: nss.gyp

Issue 493883002: Attempt to let nss's SSSE3 files build with clang-cl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 6 years, 4 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS=="ios"', { 8 ['OS=="ios"', {
9 'exclude_nss_root_certs%': 0, 9 'exclude_nss_root_certs%': 0,
10 'exclude_nss_libpkix%': 0, 10 'exclude_nss_libpkix%': 0,
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 'include_dirs': [ 447 'include_dirs': [
448 'nss/lib/ckfw', 448 'nss/lib/ckfw',
449 ], 449 ],
450 'direct_dependent_settings': { 450 'direct_dependent_settings': {
451 'include_dirs': [ 451 'include_dirs': [
452 'nss/lib/ckfw/builtins', 452 'nss/lib/ckfw/builtins',
453 ], 453 ],
454 }, 454 },
455 }, 455 },
456 { 456 {
457 # This target contains files compiled for AVX. The code calling the
458 # functions in this target has to check if the current CPU supports AVX.
459 'target_name': 'nss_static_avx',
460 # This target is an implementation detail - the public dependencies
461 # should be on 'nss'.
wtc 2014/08/21 23:27:49 Nit: we probably don't need to copy this comment.
Nico 2014/08/25 17:35:09 Done.
462 'suppress_wildcard': 1,
463 'conditions': [
464 ['OS!="win" or target_arch!="ia32"', {
465 'type': 'none',
466 }, {
467 'type': 'static_library',
468 'sources': [
469 'nss/lib/freebl/intel-gcm-wrap.c',
470 'nss/lib/freebl/intel-gcm-x86-masm.asm',
471 'nss/lib/freebl/intel-gcm.h',
472 ],
473 'defines': [
wtc 2014/08/21 23:27:49 BUG?: I believe we also need these, at least to be
Nico 2014/08/25 17:35:09 Done.
474 'NSS_X86_OR_X64',
475 'NSS_X86',
476 '_X86_',
477 'MP_ASSEMBLY_MULTIPLY',
478 'MP_ASSEMBLY_SQUARE',
479 'MP_ASSEMBLY_DIV_2DX1D',
480 'MP_USE_UINT_DIGIT',
481 'MP_NO_MP_WORD',
482 'USE_HW_AES',
wtc 2014/08/21 23:27:49 Nit: it's safer to add 'INTEL_GCM'. It's actually
Nico 2014/08/25 17:35:09 Done.
483 ],
484 'include_dirs': [
485 'nspr/pr/include',
486 'nspr/lib/ds',
487 'nspr/lib/libc/include',
488 'nss/lib/freebl/ecl',
wtc 2014/08/21 23:27:49 Do we really need this directory?
Nico 2014/08/25 17:35:09 Yes, I only added directories that were necessary
489 'nss/lib/util',
490 ],
491 'msvs_disabled_warnings': [4018],
492 'msvs_settings': {
493 'MASM': {
494 'UseSafeExceptionHandlers': 'true',
495 },
496 'VCCLCompilerTool': {
497 'EnableEnhancedInstructionSet': '3', # Enable AVX.
498 },
499 },
500 }],
501 ],
502 },
503 {
457 'target_name': 'nss_static', 504 'target_name': 'nss_static',
458 'type': 'static_library', 505 'type': 'static_library',
459 # This target is an implementation detail - the public dependencies 506 # This target is an implementation detail - the public dependencies
460 # should be on 'nss'. 507 # should be on 'nss'.
461 'suppress_wildcard': 1, 508 'suppress_wildcard': 1,
462 'sources': [ 509 'sources': [
463 'nss/lib/base/arena.c', 510 'nss/lib/base/arena.c',
464 'nss/lib/base/base.h', 511 'nss/lib/base/base.h',
465 'nss/lib/base/baset.h', 512 'nss/lib/base/baset.h',
466 'nss/lib/base/error.c', 513 'nss/lib/base/error.c',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 'nss/lib/freebl/ecl/ecp_521.c', 624 'nss/lib/freebl/ecl/ecp_521.c',
578 'nss/lib/freebl/ecl/ecp_aff.c', 625 'nss/lib/freebl/ecl/ecp_aff.c',
579 'nss/lib/freebl/ecl/ecp_jac.c', 626 'nss/lib/freebl/ecl/ecp_jac.c',
580 'nss/lib/freebl/ecl/ecp_jm.c', 627 'nss/lib/freebl/ecl/ecp_jm.c',
581 'nss/lib/freebl/ecl/ecp_mont.c', 628 'nss/lib/freebl/ecl/ecp_mont.c',
582 'nss/lib/freebl/ecl/ec_naf.c', 629 'nss/lib/freebl/ecl/ec_naf.c',
583 'nss/lib/freebl/gcm.c', 630 'nss/lib/freebl/gcm.c',
584 'nss/lib/freebl/gcm.h', 631 'nss/lib/freebl/gcm.h',
585 'nss/lib/freebl/intel-aes-x86-masm.asm', 632 'nss/lib/freebl/intel-aes-x86-masm.asm',
586 'nss/lib/freebl/intel-aes.h', 633 'nss/lib/freebl/intel-aes.h',
587 'nss/lib/freebl/intel-gcm-wrap.c',
588 'nss/lib/freebl/intel-gcm-x86-masm.asm',
589 'nss/lib/freebl/intel-gcm.h',
590 'nss/lib/freebl/hmacct.c', 634 'nss/lib/freebl/hmacct.c',
591 'nss/lib/freebl/hmacct.h', 635 'nss/lib/freebl/hmacct.h',
592 'nss/lib/freebl/jpake.c', 636 'nss/lib/freebl/jpake.c',
593 'nss/lib/freebl/md2.c', 637 'nss/lib/freebl/md2.c',
594 'nss/lib/freebl/md5.c', 638 'nss/lib/freebl/md5.c',
595 'nss/lib/freebl/mpi/logtab.h', 639 'nss/lib/freebl/mpi/logtab.h',
596 'nss/lib/freebl/mpi/mpcpucache.c', 640 'nss/lib/freebl/mpi/mpcpucache.c',
597 'nss/lib/freebl/mpi/mpi-config.h', 641 'nss/lib/freebl/mpi/mpi-config.h',
598 'nss/lib/freebl/mpi/mpi-priv.h', 642 'nss/lib/freebl/mpi/mpi-priv.h',
599 'nss/lib/freebl/mpi/mpi.c', 643 'nss/lib/freebl/mpi/mpi.c',
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 # primes.c is included by mpprime.c. 1019 # primes.c is included by mpprime.c.
976 'nss/lib/freebl/mpi/primes.c', 1020 'nss/lib/freebl/mpi/primes.c',
977 # unix_rand.c and win_rand.c are included by sysrand.c. 1021 # unix_rand.c and win_rand.c are included by sysrand.c.
978 'nss/lib/freebl/unix_rand.c', 1022 'nss/lib/freebl/unix_rand.c',
979 'nss/lib/freebl/win_rand.c', 1023 'nss/lib/freebl/win_rand.c',
980 # debug_module.c is included by pk11load.c. 1024 # debug_module.c is included by pk11load.c.
981 'nss/lib/pk11wrap/debug_module.c', 1025 'nss/lib/pk11wrap/debug_module.c',
982 ], 1026 ],
983 'dependencies': [ 1027 'dependencies': [
984 'nspr', 1028 'nspr',
1029 'nss_static_avx',
985 '../sqlite/sqlite.gyp:sqlite', 1030 '../sqlite/sqlite.gyp:sqlite',
986 ], 1031 ],
987 'export_dependent_settings': [ 1032 'export_dependent_settings': [
988 'nspr', 1033 'nspr',
989 ], 1034 ],
990 'defines': [ 1035 'defines': [
991 'MP_API_COMPATIBLE', 1036 'MP_API_COMPATIBLE',
992 'NSS_DISABLE_DBM', 1037 'NSS_DISABLE_DBM',
993 'NSS_STATIC', 1038 'NSS_STATIC',
994 'NSS_USE_STATIC_LIBS', 1039 'NSS_USE_STATIC_LIBS',
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 'NSS_USE_64', 1240 'NSS_USE_64',
1196 'NSS_X86_OR_X64', 1241 'NSS_X86_OR_X64',
1197 'NSS_X64', 1242 'NSS_X64',
1198 '_AMD64_', 1243 '_AMD64_',
1199 'MP_CHAR_STORE_SLOW', 1244 'MP_CHAR_STORE_SLOW',
1200 'MP_IS_LITTLE_ENDIAN', 1245 'MP_IS_LITTLE_ENDIAN',
1201 'WIN64', 1246 'WIN64',
1202 ], 1247 ],
1203 'sources!': [ 1248 'sources!': [
1204 'nss/lib/freebl/intel-aes-x86-masm.asm', 1249 'nss/lib/freebl/intel-aes-x86-masm.asm',
1205 'nss/lib/freebl/intel-gcm-wrap.c',
1206 'nss/lib/freebl/intel-gcm-x86-masm.asm',
1207 'nss/lib/freebl/mpi/mpi_amd64.c', 1250 'nss/lib/freebl/mpi/mpi_amd64.c',
1208 'nss/lib/freebl/mpi/mpi_x86_asm.c', 1251 'nss/lib/freebl/mpi/mpi_x86_asm.c',
1209 ], 1252 ],
1210 }], 1253 }],
1211 ], 1254 ],
1212 }, { # else: OS!="win" 1255 }, { # else: OS!="win"
1213 'sources!': [ 1256 'sources!': [
1214 'nss/lib/freebl/intel-aes-x86-masm.asm', 1257 'nss/lib/freebl/intel-aes-x86-masm.asm',
1215 'nss/lib/freebl/intel-gcm-wrap.c',
1216 'nss/lib/freebl/intel-gcm-x86-masm.asm',
1217 # mpi_x86_asm.c contains MSVC inline assembly code. 1258 # mpi_x86_asm.c contains MSVC inline assembly code.
1218 'nss/lib/freebl/mpi/mpi_x86_asm.c', 1259 'nss/lib/freebl/mpi/mpi_x86_asm.c',
1219 ], 1260 ],
1220 }], 1261 }],
1221 ], 1262 ],
1222 }, 1263 },
1223 ], 1264 ],
1224 } 1265 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698