diff options
| author | Petr Sumbera <petr.sumbera@oracle.com> | 2019-06-05 23:29:47 +0000 |
|---|---|---|
| committer | Petr Sumbera <petr.sumbera@oracle.com> | 2019-06-05 23:29:47 +0000 |
| commit | b5bc32ce5dea558ae6ed932c474955908dcdbb64 (patch) | |
| tree | 88d5ebee4f33d68811e94c03becd8a8ec14f0544 | |
| parent | 6a2dc558ae18029512ecdc1f18cbe652b8448357 (diff) | |
| download | nss-hg-b5bc32ce5dea558ae6ed932c474955908dcdbb64.tar.gz | |
Bug 1550708 - NSS gyp build system should produce libfreebl_64fpu_3.so for Solaris SPARC r=jcj
Differential Revision: https://phabricator.services.mozilla.com/D30628
| -rw-r--r-- | lib/freebl/freebl.gyp | 37 | ||||
| -rw-r--r-- | nss.gyp | 11 |
2 files changed, 47 insertions, 1 deletions
diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index 472de30f8..8eb5162eb 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -222,6 +222,43 @@ ] }, }, + { + 'target_name': 'freebl_64int_3', + 'includes': [ + 'freebl_base.gypi', + ], + 'type': 'shared_library', + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports', + 'hw-acc-crypto', + ], + }, + { + 'target_name': 'freebl_64fpu_3', + 'includes': [ + 'freebl_base.gypi', + ], + 'type': 'shared_library', + 'sources': [ + 'mpi/mpi_sparc.c', + 'mpi/mpv_sparcv9.s', + 'mpi/montmulfv9.s', + ], + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports', + 'hw-acc-crypto', + ], + 'asflags_mozilla': [ + '-mcpu=v9', '-Wa,-xarch=v9a' + ], + 'defines': [ + 'MP_NO_MP_WORD', + 'MP_USE_UINT_DIGIT', + 'MP_ASSEMBLY_MULTIPLY', + 'MP_USING_MONT_MULF', + 'MP_MONT_USE_MP_MUL', + ], + }, ], 'conditions': [ [ 'OS=="linux"', { @@ -13,10 +13,19 @@ 'type': 'none', 'dependencies': [ 'lib/ckfw/builtins/builtins.gyp:nssckbi', - 'lib/freebl/freebl.gyp:freebl3', 'lib/softoken/softoken.gyp:softokn3', ], 'conditions': [ + [ 'OS=="solaris" and target_arch=="sparc64"', { + 'dependencies': [ + 'lib/freebl/freebl.gyp:freebl_64int_3', + 'lib/freebl/freebl.gyp:freebl_64fpu_3', + ], + }, { + 'dependencies': [ + 'lib/freebl/freebl.gyp:freebl3', + ], + }], [ 'moz_fold_libs==0', { 'dependencies': [ 'lib/nss/nss.gyp:nss3', |