From 7d8f36e964b41bbad242a414b70edc42e7c1b605 Mon Sep 17 00:00:00 2001
From: Martin Thomson <martin.thomson@gmail.com>
Date: Tue, 16 Oct 2018 14:56:59 +1100
Subject: [PATCH] Backed out changeset 77ae602f995a for gecko build failures.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1471566#c4
---
 lib/freebl/freebl.gyp       | 35 ++---------------------------------
 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 a73c6febcc..004807483e 100644
--- a/lib/freebl/freebl.gyp
+++ b/lib/freebl/freebl.gyp
@@ -6,30 +6,6 @@
     '../../coreconf/config.gypi'
   ],
   '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',
@@ -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 76df714972..9c5680abb4 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',
               ],