More Windows build fixes.

build/secondary/third_party/nss/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/linux/pkg_config.gni")
 
 if (is_linux) {
   # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL
   # library but the system NSS libraries. Non-Linux platforms using NSS use the
   # hermetic one in //third_party/nss.
@@ skipping 811 matching lines @@
       "nss/lib/util/nssrwlk.h",
       "nss/lib/util/nssrwlkt.h",
       "nss/lib/util/nssutil.h",
       "nss/lib/util/oidstring.c",
       "nss/lib/util/pkcs11.h",
       "nss/lib/util/pkcs11f.h",
       "nss/lib/util/pkcs11n.h",
       "nss/lib/util/pkcs11p.h",
       "nss/lib/util/pkcs11t.h",
       "nss/lib/util/pkcs11u.h",
+      "nss/lib/util/pkcs1sig.c",
+      "nss/lib/util/pkcs1sig.h",
       "nss/lib/util/portreg.c",
       "nss/lib/util/portreg.h",
       "nss/lib/util/quickder.c",
       "nss/lib/util/secalgid.c",
       "nss/lib/util/secasn1.h",
       "nss/lib/util/secasn1d.c",
       "nss/lib/util/secasn1e.c",
       "nss/lib/util/secasn1t.h",
       "nss/lib/util/secasn1u.c",
       "nss/lib/util/seccomon.h",
@@ skipping 296 matching lines @@
       defines += [
         "SHLIB_SUFFIX=\"dll\"",
         "SHLIB_PREFIX=\"\"",
         "SOFTOKEN_LIB_NAME=\"softokn3.dll\"",
         "XP_PC",
         "WIN32",
         "WIN95",
       ]
 
       if (cpu_arch == "x86") {
-        sources -= [ "nss/lib/freebl/mpi/mpi_amd64.c" ]
         defines += [
           "NSS_X86_OR_X64",
           "NSS_X86",
           "_X86_",
           "MP_ASSEMBLY_MULTIPLY",
           "MP_ASSEMBLY_SQUARE",
           "MP_ASSEMBLY_DIV_2DX1D",
           "MP_USE_UINT_DIGIT",
           "MP_NO_MP_WORD",
           "USE_HW_AES",
           "INTEL_GCM",
         ]
       } else if (cpu_arch == "x64") {
-        sources -= [ "nss/lib/freebl/mpi/mpi_x86_asm.c" ]
+        sources -= [
+          "nss/lib/freebl/intel-aes-x86-masm.asm",
+          "nss/lib/freebl/mpi/mpi_amd64.c",
+          "nss/lib/freebl/mpi/mpi_x86_asm.c",
+        ]
         defines += [
           "NSS_USE_64",
           "NSS_X86_OR_X64",
           "NSS_X64",
           "_AMD64_",
           "MP_CHAR_STORE_SLOW",
           "MP_IS_LITTLE_ENDIAN",
           "WIN64",
         ]
       }
@@ skipping 27 matching lines @@
       ":nspr",
       "//third_party/sqlite",
     ]
 
     if (is_win && cpu_arch == "x86") {
       deps += [ ":nss_static_avx" ]
     }
   }
 }  # Windows/Mac/iOS.