gn: Fix more build issues on Win

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 202 matching lines @@
     if (is_win) {
       configs -= [
         "//build/config/win:unicode",  # Requires 8-bit mode.
         "//build/config/win:lean_and_mean",  # Won"t compile with lean and mean.
       ]
     }
     configs += [ "//build/config/compiler:no_chromium_code" ]
 
     cflags = []
     defines = [
-      "_NSPR_BUILD",
+      "_NSPR_BUILD_",
       "FORCE_PR_LOG",
     ]
 
     include_dirs = [
       "nspr/pr/include/private",
     ]
 
     if (is_win) {
       cflags = [
         "/wd4554",  # Check precidence.
@@ skipping 118 matching lines @@
 
     if (include_nss_root_certs) {
       public_deps += [ ":nssckbi" ]
     }
 
     if (component_mode == "shared_library") {
       if (is_mac) {
         ldflags = [ "-all_load" ]
       } else if (is_win) {
         # Pass the def file to the linker.
-        ldflags = [ rebase_path("nss/exports_win.def", root_build_dir) ]
+        ldflags = [
+          "/DEF:" + rebase_path("nss/exports_win.def", root_build_dir)
+        ]
       }
     }
   }
 
   config("nssckbi_config") {
     include_dirs = [ "nss/lib/ckfw/builtins" ]
   }
 
   # This is really more of a pseudo-target to work around the fact that
   # a single static_library target cannot contain two object files of the
@@ skipping 96 matching lines @@
       "nss/lib/nss",
       "nss/lib/pk11wrap",
       "nss/lib/pkcs7",
       "nss/lib/pki",
       "nss/lib/smime",
       "nss/lib/softoken",
       "nss/lib/util",
     ]
   }
 
+  if (is_win && cpu_arch == "x86") {
+    source_set("nss_static_avx") {
+      sources = [
+        "nss/lib/freebl/intel-gcm-wrap.c",
+        "nss/lib/freebl/intel-gcm-x86-masm.asm",
+        "nss/lib/freebl/intel-gcm.h",
+      ]
+      defines = [
+        "_WINDOWS",
+        "_X86_",
+        "INTEL_GCM",
+        "MP_API_COMPATIBLE",
+        "MP_ASSEMBLY_DIV_2DX1D",
+        "MP_ASSEMBLY_MULTIPLY",
+        "MP_ASSEMBLY_SQUARE",
+        "MP_NO_MP_WORD",
+        "MP_USE_UINT_DIGIT",
+        "NSS_DISABLE_DBM",
+        "NSS_STATIC",
+        "NSS_USE_STATIC_LIBS",
+        "NSS_X86",
+        "NSS_X86_OR_X64",
+        "RIJNDAEL_INCLUDE_TABLES",
+        "SHLIB_PREFIX=\"\"",
+        "SHLIB_SUFFIX=\"dll\"",
+        "SHLIB_VERSION=\"3\"",
+        "SOFTOKEN_LIB_NAME=\"softokn3.dll\"",
+        "SOFTOKEN_SHLIB_VERSION=\"3\"",
+        "USE_HW_AES",
+        "USE_UTIL_DIRECTLY",
+        "WIN32",
+        "WIN95",
+        "XP_PC",
+      ]
+      include_dirs = [
+        "nspr/pr/include",
+        "nspr/lib/ds",
+        "nspr/lib/libc/include",
+        "nss/lib/freebl/ecl",
+        "nss/lib/util",
+      ]
+    }
+  }
+
   source_set("nss_static") {
     visibility = [ ":*" ]  # Internal implementation detail.
 
     sources = [
       "nss/lib/base/arena.c",
       "nss/lib/base/base.h",
       "nss/lib/base/baset.h",
       "nss/lib/base/error.c",
       "nss/lib/base/errorval.c",
       "nss/lib/base/hash.c",
@@ skipping 103 matching lines @@
       "nss/lib/freebl/ecl/ecp_256_32.c",
       "nss/lib/freebl/ecl/ecp_384.c",
       "nss/lib/freebl/ecl/ecp_521.c",
       "nss/lib/freebl/ecl/ecp_aff.c",
       "nss/lib/freebl/ecl/ecp_jac.c",
       "nss/lib/freebl/ecl/ecp_jm.c",
       "nss/lib/freebl/ecl/ecp_mont.c",
       "nss/lib/freebl/ecl/ec_naf.c",
       "nss/lib/freebl/gcm.c",
       "nss/lib/freebl/gcm.h",
+      "nss/lib/freebl/intel-aes-x86-masm.asm",
+      "nss/lib/freebl/intel-aes.h",
       "nss/lib/freebl/hmacct.c",
       "nss/lib/freebl/hmacct.h",
       "nss/lib/freebl/jpake.c",
       "nss/lib/freebl/md2.c",
       "nss/lib/freebl/md5.c",
       "nss/lib/freebl/mpi/logtab.h",
       "nss/lib/freebl/mpi/mpcpucache.c",
       "nss/lib/freebl/mpi/mpi-config.h",
       "nss/lib/freebl/mpi/mpi-priv.h",
       "nss/lib/freebl/mpi/mpi.c",
@@ skipping 533 matching lines @@
       ]
     }
 
     public_deps = [
       ":nspr",
     ]
     deps = [
       ":nspr",
       "//third_party/sqlite",
     ]
+
+    if (is_win && cpu_arch == "x86") {
+      deps += [ ":nss_static_avx" ]
+    }
   }
 }  # Windows/Mac/iOS.