diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2018-10-16 14:55:45 +1100 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2018-10-16 14:55:45 +1100 |
| commit | 9e302c5a873fb0a6e3d013974831591d8ae7187d (patch) | |
| tree | ab70e638b518e74afb1a35776c1d622d0e4ab01f | |
| parent | 5ac3bd05fc4593b12056ef813d4364d8bd945aec (diff) | |
| download | nss-hg-9e302c5a873fb0a6e3d013974831591d8ae7187d.tar.gz | |
Backed out changeset 77ae602f995a for gecko build failures, a=bustageNSS_3_40_RTM
See https://bugzilla.mozilla.org/show_bug.cgi?id=1471566#c4
| -rw-r--r-- | lib/freebl/freebl.gyp | 35 | ||||
| -rw-r--r-- | lib/freebl/freebl_base.gypi | 4 |
2 files changed, 5 insertions, 34 deletions
diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index a73c6febc..004807483 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -7,30 +7,6 @@ ], 'targets': [ { - 'target_name': 'intel-gcm-s_lib', - 'type': 'static_library', - 'sources': [ - 'intel-aes.s', - 'intel-gcm.s', - ], - 'dependencies': [ - '<(DEPTH)/exports.gyp:nss_exports' - ], - 'conditions': [ - [ 'cc_is_clang==1', { - 'cflags': [ - '-no-integrated-as', - ], - }], - ], - 'cflags_mozilla': [ - '-no-integrated-as', - ], - 'asflags_mozilla': [ - '-no-integrated-as', - ], - }, - { 'target_name': 'intel-gcm-wrap_c_lib', 'type': 'static_library', 'sources': [ @@ -39,19 +15,12 @@ 'dependencies': [ '<(DEPTH)/exports.gyp:nss_exports' ], - 'conditions': [ - [ 'OS=="linux" and target_arch=="x64"', { - 'dependencies': [ - 'intel-gcm-s_lib', - ], - }], - ], 'cflags': [ - '-mssse3', + '-mssse3' ], 'cflags_mozilla': [ '-mssse3' - ], + ] }, { # TODO: make this so that all hardware accelerated code is in here. diff --git a/lib/freebl/freebl_base.gypi b/lib/freebl/freebl_base.gypi index 76df71497..9c5680abb 100644 --- a/lib/freebl/freebl_base.gypi +++ b/lib/freebl/freebl_base.gypi @@ -67,12 +67,14 @@ [ 'target_arch=="x64"', { 'sources': [ 'arcfour-amd64-gas.s', + 'intel-aes.s', + 'intel-gcm.s', 'mpi/mpi_amd64.c', 'mpi/mpi_amd64_gas.s', 'mpi/mp_comba.c', ], 'conditions': [ - [ 'cc_is_clang==1 and fuzz!=1', { + [ 'cc_is_clang==1', { 'cflags': [ '-no-integrated-as', ], |