roll clang 266460:267383

build/config/compiler/BUILD.gn

 # Copyright (c) 2013 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/android/config.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/nacl/config.gni")
 import("//build/toolchain/cc_wrapper.gni")
 import("//build/toolchain/toolchain.gni")
@@ skipping 968 matching lines @@
     ]
 
     # NaCl's Clang compiler and Chrome's hermetic Clang compiler will almost
     # always have different versions. Certain flags may not be recognized by
     # one version or the other.
     if (!is_nacl) {
       # Flags NaCl (Clang 3.7) does not recognize.
       cflags += [
         # TODO(thakis): Enable this, crbug.com/507717
         "-Wno-shift-negative-value",
+
+        # TODO(thakis): https://crbug.com/604888
+        "-Wno-undefined-var-template",
       ]
-
-      if (llvm_force_head_revision) {
-        cflags += [
-          # TODO(thakis): https://crbug.com/604888
-          "-Wno-undefined-var-template",
-        ]
-      }
     }
   }
 }
 
 # chromium_code ---------------------------------------------------------------
 #
 # Toggles between higher and lower warnings for code that is (or isn't)
 # part of Chromium.
 
 config("chromium_code") {
@@ skipping 432 matching lines @@
 
 if (is_ios || is_mac) {
   # On Mac and iOS, this enables support for ARC (automatic ref-counting).
   # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html.
   config("enable_arc") {
     common_flags = [ "-fobjc-arc" ]
     cflags_objc = common_flags
     cflags_objcc = common_flags
   }
 }