diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2018-10-08 15:00:24 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2018-10-08 15:00:24 +0200 |
| commit | 7b981d99c8d80bdd5dab437e117a83df0123f994 (patch) | |
| tree | 5b66216f6a63afc7fd35b02faa930f02f4c821b7 | |
| parent | 6e3e8bf5e0bd053b32775e0583340b64b4cf891e (diff) | |
| download | nss-hg-7b981d99c8d80bdd5dab437e117a83df0123f994.tar.gz | |
Bug 1471566 - fix OSS fuzzing build, r=mt
Differential Revision: https://phabricator.services.mozilla.com/D9493
| -rw-r--r-- | lib/freebl/freebl.gyp | 35 | ||||
| -rw-r--r-- | lib/freebl/freebl_base.gypi | 4 |
2 files changed, 34 insertions, 5 deletions
diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index 004807483..288ff07a3 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -7,6 +7,30 @@ ], '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': [ @@ -15,12 +39,19 @@ 'dependencies': [ '<(DEPTH)/exports.gyp:nss_exports' ], + 'conditions': [ + [ '(OS=="linux" or OS=="android") 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 9c5680abb..76df71497 100644 --- a/lib/freebl/freebl_base.gypi +++ b/lib/freebl/freebl_base.gypi @@ -67,14 +67,12 @@ [ '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', { + [ 'cc_is_clang==1 and fuzz!=1', { 'cflags': [ '-no-integrated-as', ], |