diff options
| author | Kevin Jacobs <kjacobs@mozilla.com> | 2019-10-11 19:33:06 +0000 |
|---|---|---|
| committer | Kevin Jacobs <kjacobs@mozilla.com> | 2019-10-11 19:33:06 +0000 |
| commit | ff11154e6b6c34e30247ccc1dd981d592ec731e9 (patch) | |
| tree | 7710b9a37c53857df3e8f91052e5b6e4afcc37c6 | |
| parent | 8acbd18f6fe952731709946cd2b501b494ff3867 (diff) | |
| download | nss-hg-ff11154e6b6c34e30247ccc1dd981d592ec731e9.tar.gz | |
Bug 1152625 - Add gyp flag for disabling ARM HW AES r=jcj
Adds an option to disable ARMv8 HW AES, if `-Ddisable_arm_hw_aes=1` is passed to build.sh.
Depends on D34473
Differential Revision: https://phabricator.services.mozilla.com/D44018
| -rw-r--r-- | coreconf/config.gypi | 1 | ||||
| -rw-r--r-- | lib/freebl/freebl.gyp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 2f17c822d..f4426ac32 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -96,6 +96,7 @@ 'cc_is_gcc%': '<(cc_is_gcc)', 'cc_use_gnu_ld%': '<(cc_use_gnu_ld)', # Some defaults + 'disable_arm_hw_aes%': 0, 'disable_tests%': 0, 'disable_chachapoly%': 0, 'disable_dbm%': 0, diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index dc33f73a7..39506921c 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -189,7 +189,7 @@ 'dependencies': [ 'gcm-aes-x86_c_lib', ], - }, 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', { + }, 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', { 'dependencies': [ 'armv8_c_lib' ], @@ -466,10 +466,9 @@ 'MP_USE_UINT_DIGIT', 'SHA_NO_LONG_LONG', 'ARMHF', - 'USE_HW_AES', ], }], - [ 'target_arch=="arm64" or target_arch=="aarch64"', { + [ 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', { 'defines': [ 'USE_HW_AES', ], |