NSS arm gyp

arm.patch

diff -r 5d99ef9b5cb6 coreconf/config.gypi
--- a/coreconf/config.gypi	Wed Aug 03 21:42:31 2016 -0400
+++ b/coreconf/config.gypi	Sat Aug 06 12:57:33 2016 +0000
@@ -64,7 +64,6 @@
           ['OS=="linux"', {
             'cflags': [
               '-fPIC',
-              '-m64',
               '-pipe',
               '-ffunction-sections',
               '-fdata-sections',
diff -r 5d99ef9b5cb6 external_tests/google_test/google_test.gyp
--- a/external_tests/google_test/google_test.gyp	Wed Aug 03 21:42:31 2016 -0400
+++ b/external_tests/google_test/google_test.gyp	Sat Aug 06 12:57:33 2016 +0000
@@ -22,6 +22,9 @@
       "type": "shared_library",
       "dependencies": [
         "gtest"
+      ],
+      "libraries": [
+        "-lstdc++"
       ]
     }
   ],
@@ -34,4 +37,4 @@
   "variables": {
     "module": "gtest"
   }
-}
\ No newline at end of file
+}
diff -r 5d99ef9b5cb6 lib/freebl/freebl.gyp
--- a/lib/freebl/freebl.gyp	Wed Aug 03 21:42:31 2016 -0400
+++ b/lib/freebl/freebl.gyp	Sat Aug 06 12:57:33 2016 +0000
@@ -4,19 +4,6 @@
   ],
   "targets": [
     {
-      "target_name": "intel-gcm-wrap_c_lib",
-      "type": "static_library",
-      "sources": [
-        "intel-gcm-wrap.c"
-      ],
-      "dependencies": [
-        "<(DEPTH)/exports.gyp:nss_exports"
-      ],
-      "cflags": [
-        "-mssse3"
-      ]
-    },
-    {
       "target_name": "freebl",
       "type": "static_library",
       "sources": [
@@ -29,10 +16,6 @@
     {
       "target_name": "freebl3",
       "type": "shared_library",
-      "sources": [
-        "lowhash_vector.c",
-        "freebl_hash.def"
-      ],
       "dependencies": [
         "<(DEPTH)/exports.gyp:nss_exports"
       ],
@@ -48,10 +31,9 @@
         "alg2268.c",
         "alghmac.c",
         "arcfive.c",
-        "arcfour-amd64-gas.s",
         "arcfour.c",
         "camellia.c",
-        "chacha20_vec.c",
+        "chacha20.c",
         "chacha20poly1305.c",
         "ctr.c",
         "cts.c",
@@ -79,23 +61,18 @@
         "freeblver.c",
         "gcm.c",
         "hmacct.c",
-        "intel-aes.s",
-        "intel-gcm.s",
         "jpake.c",
         "ldvector.c",
         "md2.c",
         "md5.c",
-        "mpi/mp_comba.c",
         "mpi/mp_gf2m.c",
         "mpi/mpcpucache.c",
         "mpi/mpi.c",
-        "mpi/mpi_amd64.c",
-        "mpi/mpi_amd64_gas.s",
         "mpi/mplogic.c",
         "mpi/mpmontg.c",
         "mpi/mpprime.c",
         "nsslowhash.c",
-        "poly1305-donna-x64-sse2-incremental-source.c",
+        "poly1305.c",
         "pqg.c",
         "rawhash.c",
         "rijndael.c",
@@ -112,7 +89,6 @@
       ],
       "dependencies": [
         "<(DEPTH)/exports.gyp:nss_exports",
-        "intel-gcm-wrap_c_lib"
       ],
       "variables": {
         "mapfile": "freebl_hash_vector.def"
@@ -133,22 +109,11 @@
       "SHLIB_VERSION=\"3\"",
       "SOFTOKEN_SHLIB_VERSION=\"3\"",
       "RIJNDAEL_INCLUDE_TABLES",
-      "NSS_USE_64",
       "FREEBL_NO_DEPEND",
-      "FREEBL_LOWHASH",
-      "NSS_X86_OR_X64",
-      "NSS_X64",
-      "NSS_BEVAND_ARCFOUR",
-      "MPI_AMD64",
-      "MP_ASSEMBLY_MULTIPLY",
-      "NSS_USE_COMBA",
-      "MP_IS_LITTLE_ENDIAN",
-      "USE_HW_AES",
-      "INTEL_GCM",
       "MP_API_COMPATIBLE"
     ]
   },
   "variables": {
     "module": "nss"
   }
-}
\ No newline at end of file
+}
diff -r 5d99ef9b5cb6 lib/softoken/legacydb/legacydb.gyp
--- a/lib/softoken/legacydb/legacydb.gyp	Wed Aug 03 21:42:31 2016 -0400
+++ b/lib/softoken/legacydb/legacydb.gyp	Sat Aug 06 12:57:33 2016 +0000
@@ -38,9 +38,6 @@
       "dependencies": [
         "nssdbm"
       ],
-      "variables": {
-        "mapfile": "nssdbm.def"
-      }
     }
   ],
   "target_defaults": {
@@ -53,4 +50,4 @@
   "variables": {
     "module": "nss"
   }
-}
\ No newline at end of file
+}
diff -r 5d99ef9b5cb6 lib/softoken/softoken.gyp
--- a/lib/softoken/softoken.gyp	Wed Aug 03 21:42:31 2016 -0400
+++ b/lib/softoken/softoken.gyp	Sat Aug 06 12:57:33 2016 +0000
@@ -42,9 +42,6 @@
       "dependencies": [
         "softokn"
       ],
-      "variables": {
-        "mapfile": "softokn.def"
-      }
     }
   ],
   "target_defaults": {
@@ -58,4 +55,4 @@
   "variables": {
     "module": "nss"
   }
-}
\ No newline at end of file
+}
diff -r 5d99ef9b5cb6 lib/sqlite/sqlite.gyp
--- a/lib/sqlite/sqlite.gyp	Wed Aug 03 21:42:31 2016 -0400
+++ b/lib/sqlite/sqlite.gyp	Sat Aug 06 12:57:33 2016 +0000
@@ -22,9 +22,6 @@
       "dependencies": [
         "sqlite"
       ],
-      "variables": {
-        "mapfile": "sqlite.def"
-      }
     }
   ],
   "target_defaults": {
@@ -35,4 +32,4 @@
   "variables": {
     "module": "nss"
   }
-}
\ No newline at end of file
+}
diff -r 5d99ef9b5cb6 lib/util/util.gyp
--- a/lib/util/util.gyp	Wed Aug 03 21:42:31 2016 -0400
+++ b/lib/util/util.gyp	Sat Aug 06 12:57:33 2016 +0000
@@ -48,12 +48,9 @@
       "dependencies": [
         "nssutil"
       ],
-      "variables": {
-        "mapfile": "nssutil.def"
-      }
     }
   ],
   "variables": {
     "module": "nss"
   }
-}
\ No newline at end of file
+}
diff -r 5d99ef9b5cb6 nss.gyp
--- a/nss.gyp	Wed Aug 03 21:42:31 2016 -0400
+++ b/nss.gyp	Sat Aug 06 12:57:33 2016 +0000
@@ -32,7 +32,6 @@
         "<(DEPTH)/cmd/fipstest/fipstest.gyp:fipstest",
         "<(DEPTH)/cmd/httpserv/httpserv.gyp:httpserv",
         "<(DEPTH)/cmd/listsuites/listsuites.gyp:listsuites",
-        "<(DEPTH)/cmd/lowhashtest/lowhashtest.gyp:lowhashtest",
         "<(DEPTH)/cmd/makepqg/makepqg.gyp:makepqg",
         "<(DEPTH)/cmd/modutil/modutil.gyp:modutil",
         "<(DEPTH)/cmd/multinit/multinit.gyp:multinit",
@@ -84,4 +83,4 @@
   "includes": [
     "coreconf/config.gypi"
   ]
-}
\ No newline at end of file
+}

apply patch on https://hg.mozilla.org/users/tmielczarek_mozilla.com/nss/rev/5d99ef9b5cb6

root@taskcluster-worker:~/nss# time (gyp -f ninja --depth=. nss.gyp && /usr/bin/ninja -C out/Debug)
ninja: Entering directory `out/Debug'
[997/997] STAMP obj/nss_all.actions_depends.stamp

real 9m57.000s
user 8m52.290s
sys 0m31.410s