1 files changed, 21 insertions, 12 deletions

diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 1b96d312f328..732c4ac683d7 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2020-06-03 18:40:10 UTC
+--- build/config/compiler/BUILD.gn.orig	2020-07-07 21:58:11 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -138,7 +138,7 @@ declare_args() {
+@@ -133,7 +133,7 @@ declare_args() {
    # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel.
    # 'use_xcode_clang' may call old clang.
    init_stack_vars =
@@ -9,7 +9,7 @@
  
    # This argument is to control whether enabling text section splitting in the
    # final binary. When enabled, the separated text sections with prefix
-@@ -307,7 +307,7 @@ config("compiler") {
+@@ -287,7 +287,7 @@ config("compiler") {
      }
  
      # Linker warnings.
@@ -18,7 +18,7 @@
        ldflags += [ "-Wl,--fatal-warnings" ]
      }
      if (fatal_linker_warnings && (is_mac || is_ios)) {
-@@ -401,7 +401,7 @@ config("compiler") {
+@@ -381,7 +381,7 @@ config("compiler") {
  
      # Compiler instrumentation can introduce dependencies in DSOs to symbols in
      # the executable they are loaded into, so they are unresolved at link-time.
@@ -27,7 +27,7 @@
        ldflags += [
          "-Wl,-z,defs",
          "-Wl,--as-needed",
-@@ -500,7 +500,7 @@ config("compiler") {
+@@ -472,7 +472,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -36,7 +36,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" +
                  rebase_path("//tools/clang/crashreports", root_build_dir) ]
  
-@@ -770,7 +770,7 @@ config("compiler_cpu_abi") {
+@@ -735,7 +735,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -45,7 +45,7 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1120,7 +1120,7 @@ config("compiler_deterministic") {
+@@ -1085,7 +1085,7 @@ config("compiler_deterministic") {
        "-Xclang",
        ".",
      ]
@@ -54,8 +54,8 @@
        # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
        asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
      }
-@@ -1503,7 +1503,7 @@ config("default_warnings") {
-         cflags += [ "-Wno-nonportable-include-path" ]
+@@ -1476,7 +1476,7 @@ config("default_warnings") {
+         cflags += [ "-Wno-max-tokens" ]
        }
  
 -      if (current_toolchain == host_toolchain || !use_xcode_clang) {
@@ -63,7 +63,16 @@
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -1753,7 +1753,7 @@ config("thin_archive") {
+@@ -1638,7 +1638,7 @@ config("no_chromium_code") {
+       # suppressing them individually, we just blanket suppress them here.
+       "-Wno-unused-variable",
+     ]
+-    if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) {
++    if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) {
+       cflags += [
+         # TODO(https://crbug.com/1031169): Clean up and enable.
+         "-Wno-misleading-indentation",
+@@ -1716,7 +1716,7 @@ config("thin_archive") {
    # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
    # have a "thin archive" mode (it does accept -T, but it means truncating
    # archive names to 16 characters, which is not what we want).
@@ -72,7 +81,7 @@
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]
-@@ -2277,7 +2277,7 @@ config("symbols") {
+@@ -2246,7 +2246,7 @@ config("symbols") {
      # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
      # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
      if (!is_nacl || is_clang) {
@@ -81,7 +90,7 @@
      }
  
      if (is_clang && !is_nacl && !use_xcode_clang) {
-@@ -2305,7 +2305,7 @@ config("symbols") {
+@@ -2274,7 +2274,7 @@ config("symbols") {
      # DWARF info may be corrupt; offsets in a range list entry are in different
      # sections" there.  Maybe just a bug in nacl_switch_32.S.
      if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&