Update monet.

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 193 matching lines @@
       "nspr/pr/src/threads/prdump.c",
       "nspr/pr/src/threads/prmon.c",
       "nspr/pr/src/threads/prrwlock.c",
       "nspr/pr/src/threads/prsem.c",
       "nspr/pr/src/threads/prtpd.c",
     ]
 
     public_configs = [ ":nspr_config" ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
-    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",
       "//build/config/compiler:no_size_t_to_int_warning",
     ]
 
     cflags = []
     defines = [
       "_NSPR_BUILD_",
       "FORCE_PR_LOG",
     ]
 
     include_dirs = [ "nspr/pr/include/private" ]
 
-    if (is_win) {
-      cflags = [ "/wd4554" ]  # Check precidence.
-      defines += [
-        "XP_PC",
-        "WIN32",
-        "WIN95",
-        "_PR_GLOBAL_THREADS_ONLY",
-        "_CRT_SECURE_NO_WARNINGS",
-      ]
-    } else {
-      sources -= [
-        "nspr/pr/src/md/windows/ntgc.c",
-        "nspr/pr/src/md/windows/ntinrval.c",
-        "nspr/pr/src/md/windows/ntmisc.c",
-        "nspr/pr/src/md/windows/ntsec.c",
-        "nspr/pr/src/md/windows/ntsem.c",
-        "nspr/pr/src/md/windows/w32ipcsem.c",
-        "nspr/pr/src/md/windows/w32poll.c",
-        "nspr/pr/src/md/windows/w32rng.c",
-        "nspr/pr/src/md/windows/w32shm.c",
-        "nspr/pr/src/md/windows/w95cv.c",
-        "nspr/pr/src/md/windows/w95dllmain.c",
-        "nspr/pr/src/md/windows/w95io.c",
-        "nspr/pr/src/md/windows/w95sock.c",
-        "nspr/pr/src/md/windows/w95thred.c",
-        "nspr/pr/src/md/windows/win32_errors.c",
-        "nspr/pr/src/threads/combined/prucpu.c",
-        "nspr/pr/src/threads/combined/prucv.c",
-        "nspr/pr/src/threads/combined/prulock.c",
-        "nspr/pr/src/threads/combined/prustack.c",
-        "nspr/pr/src/threads/combined/pruthr.c",
-      ]
-    }
+    sources -= [
+      "nspr/pr/src/md/windows/ntgc.c",
+      "nspr/pr/src/md/windows/ntinrval.c",
+      "nspr/pr/src/md/windows/ntmisc.c",
+      "nspr/pr/src/md/windows/ntsec.c",
+      "nspr/pr/src/md/windows/ntsem.c",
+      "nspr/pr/src/md/windows/w32ipcsem.c",
+      "nspr/pr/src/md/windows/w32poll.c",
+      "nspr/pr/src/md/windows/w32rng.c",
+      "nspr/pr/src/md/windows/w32shm.c",
+      "nspr/pr/src/md/windows/w95cv.c",
+      "nspr/pr/src/md/windows/w95dllmain.c",
+      "nspr/pr/src/md/windows/w95io.c",
+      "nspr/pr/src/md/windows/w95sock.c",
+      "nspr/pr/src/md/windows/w95thred.c",
+      "nspr/pr/src/md/windows/win32_errors.c",
+      "nspr/pr/src/threads/combined/prucpu.c",
+      "nspr/pr/src/threads/combined/prucv.c",
+      "nspr/pr/src/threads/combined/prulock.c",
+      "nspr/pr/src/threads/combined/prustack.c",
+      "nspr/pr/src/threads/combined/pruthr.c",
+    ]
 
     if (!is_posix) {
       sources -= [
         "nspr/pr/src/md/unix/darwin.c",
         "nspr/pr/src/md/unix/os_Darwin.s",
         "nspr/pr/src/md/unix/unix.c",
         "nspr/pr/src/md/unix/unix_errors.c",
         "nspr/pr/src/md/unix/uxproces.c",
         "nspr/pr/src/md/unix/uxrng.c",
         "nspr/pr/src/md/unix/uxshm.c",
@@ skipping 75 matching lines @@
       ":nss_static",
     ]
 
     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 =
-            [ "/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 48 matching lines @@
       "nss/lib/ckfw/nssckt.h",
       "nss/lib/ckfw/object.c",
       "nss/lib/ckfw/session.c",
       "nss/lib/ckfw/sessobj.c",
       "nss/lib/ckfw/slot.c",
       "nss/lib/ckfw/token.c",
       "nss/lib/ckfw/wrap.c",
     ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
-
-    if (is_win) {
-      configs -= [ "//build/config/win:unicode" ]  # Requires 8-bit mode.
-    }
     configs += [ "//build/config/compiler:no_chromium_code" ]
 
     include_dirs = [ "nss/lib/ckfw" ]
     public_configs = [ ":nssckbi_config" ]
 
     public_deps = [
       ":nss_static",
     ]
   }
 
   config("nss_static_config") {
     defines = [
       "NSS_STATIC",
       "NSS_USE_STATIC_LIBS",
       "USE_UTIL_DIRECTLY",
     ]
-    if (is_win) {
-      defines += [ "_WINDOWS" ]
-    }
     include_dirs = [
       "nspr/pr/include",
       "nspr/lib/ds",
       "nspr/lib/libc/include",
       "nss/lib/base",
       "nss/lib/certdb",
       "nss/lib/certhigh",
       "nss/lib/cryptohi",
       "nss/lib/dev",
       "nss/lib/freebl",
       "nss/lib/freebl/ecl",
       "nss/lib/nss",
       "nss/lib/pk11wrap",
       "nss/lib/pkcs7",
       "nss/lib/pki",
       "nss/lib/smime",
       "nss/lib/softoken",
       "nss/lib/util",
     ]
   }
 
-  if (is_win && current_cpu == "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 341 matching lines @@
 
       # unix_rand.c and win_rand.c are included by sysrand.c.
       "nss/lib/freebl/unix_rand.c",
       "nss/lib/freebl/win_rand.c",
 
       # debug_module.c is included by pk11load.c.
       "nss/lib/pk11wrap/debug_module.c",
     ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
-    if (is_win) {
-      configs -= [ "//build/config/win:unicode" ]  # Requires 8-bit mode.
-    }
     configs += [
       "//build/config/compiler:no_chromium_code",
       "//build/config/compiler:no_size_t_to_int_warning",
     ]
     public_configs = [ ":nss_static_config" ]
 
     cflags = []
 
     # Only need the defines and includes not in nss_static_config.
     defines = [
       "MP_API_COMPATIBLE",
       "NSS_DISABLE_DBM",
       "RIJNDAEL_INCLUDE_TABLES",
       "SHLIB_VERSION=\"3\"",
       "SOFTOKEN_SHLIB_VERSION=\"3\"",
     ]
     include_dirs = [
       "nss/lib/freebl/mpi",
       "nss/lib/ssl",
     ]
 
-    if (is_win) {
-      cflags += [ "/wd4101" ]  # Unreferenced local variable.
-    }
-
     if (include_nss_libpkix) {
       sources += [
         "nss/lib/certhigh/certvfypkix.c",
         "nss/lib/certhigh/certvfypkixprint.c",
         "nss/lib/libpkix/include/pkix.h",
         "nss/lib/libpkix/include/pkix_certsel.h",
         "nss/lib/libpkix/include/pkix_certstore.h",
         "nss/lib/libpkix/include/pkix_checker.h",
         "nss/lib/libpkix/include/pkix_crlsel.h",
         "nss/lib/libpkix/include/pkix_errorstrings.h",
@@ skipping 167 matching lines @@
         "nss/lib/libpkix/pkix_pl_nss/system",
       ]
     } else {
       defines += [ "NSS_DISABLE_LIBPKIX" ]
     }
 
     if (!include_nss_root_certs) {
       defines += [ "NSS_DISABLE_ROOT_CERTS" ]
     }
 
-    if (current_cpu == "x64" && !is_win) {
+    if (current_cpu == "x64") {
       sources -= [
         "nss/lib/freebl/chacha20/chacha20.c",
         "nss/lib/freebl/poly1305/poly1305.c",
       ]
     } else {
       sources -= [
         "nss/lib/freebl/chacha20/chacha20_vec.c",
         "nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c",
       ]
     }
@@ skipping 14 matching lines @@
         "SHLIB_PREFIX=\"lib\"",
         "SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"",
       ]
 
       configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
     } else {
       # Not Mac/iOS.
       sources -= [ "nss/lib/freebl/mpi/mpi_arm_mac.c" ]
     }
 
-    if (is_win) {
-      defines += [
-        "SHLIB_SUFFIX=\"dll\"",
-        "SHLIB_PREFIX=\"\"",
-        "SOFTOKEN_LIB_NAME=\"softokn3.dll\"",
-        "XP_PC",
-        "WIN32",
-        "WIN95",
-      ]
-
-      if (current_cpu == "x86") {
-        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",
-        ]
-        sources -= [ "nss/lib/freebl/mpi/mpi_amd64.c" ]
-      } else if (current_cpu == "x64") {
-        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",
-        ]
-      }
-    } else {
-      # Not Windows.
-      sources -= [
-        # mpi_x86_asm.c contains MSVC inline assembly code.
-        "nss/lib/freebl/mpi/mpi_x86_asm.c",
-      ]
-    }
+    sources -= [
+      # mpi_x86_asm.c contains MSVC inline assembly code.
+      "nss/lib/freebl/mpi/mpi_x86_asm.c",
+    ]
 
     if (is_clang) {
       cflags += [
         # nss doesn"t explicitly cast between different enum types.
         "-Wno-conversion",
 
         # nss passes "const char*" through "void*".
         "-Wno-incompatible-pointer-types",
 
         # nss prefers `a && b || c` over `(a && b) || c`.
         "-Wno-logical-op-parentheses",
 
         # nss doesn"t use exhaustive switches on enums
         "-Wno-switch",
 
         # nss has some `unsigned < 0` checks.
         "-Wno-tautological-compare",
       ]
     }
 
     public_deps = [
       ":nspr",
     ]
     deps = [
       ":nspr",
       "//third_party/sqlite",
     ]
-
-    if (is_win && current_cpu == "x86") {
-      deps += [ ":nss_static_avx" ]
-    }
   }
-}  # Windows/Mac/iOS.
+}  # Mac/iOS.