[tbb-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1448748 Disable a bunch of optimized stuff to fix the MinGW x64 Build

[gk at torproject.org]

commit bf1450d9a5dc8d1bd0ee217acb61b7e488333102
Author: Tom Ritter <tom at mozilla.com>
Date:   Fri Jun 8 13:11:49 2018 -0500

    Bug 1448748 Disable a bunch of optimized stuff to fix the MinGW x64 Build
---
 security/nss/lib/freebl/freebl.gyp       | 6 ------
 security/nss/lib/freebl/freebl_base.gypi | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp
index fae56f709e86..e4cf2606e050 100644
--- a/security/nss/lib/freebl/freebl.gyp
+++ b/security/nss/lib/freebl/freebl.gyp
@@ -274,12 +274,6 @@
       [ 'cc_use_gnu_ld==1 and OS=="win" and target_arch=="x64"', {
         'defines': [
           'MP_IS_LITTLE_ENDIAN',
-          'NSS_BEVAND_ARCFOUR',
-          'MPI_AMD64',
-          'MP_ASSEMBLY_MULTIPLY',
-          'NSS_USE_COMBA',
-          'USE_HW_AES',
-          'INTEL_GCM',
          ],
       }],
       [ 'OS!="win"', {
diff --git a/security/nss/lib/freebl/freebl_base.gypi b/security/nss/lib/freebl/freebl_base.gypi
index ebd1018d8155..63d186fe6e2f 100644
--- a/security/nss/lib/freebl/freebl_base.gypi
+++ b/security/nss/lib/freebl/freebl_base.gypi
@@ -122,6 +122,11 @@
             'intel-gcm-x86-masm.asm',
           ],
         }],
+        [ 'cc_use_gnu_ld==1', {
+          # mingw
+          'sources': [
+          ],
+        }],
         [ 'cc_is_clang!=1', {
           # MSVC
           'sources': [