diff --git a/BUILD.gn b/BUILD.gn
index 1495f17364..ace692a565 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -371,6 +371,18 @@ config("toolchain") {
       "-fno-inline",
     ]
   }
+
+  if (is_clang) {
+    cflags += [
+      # TODO(hans): Remove once http://crbug.com/428099 is resolved.
+      "-Winconsistent-missing-override",
+    ]
+
+    if (v8_current_cpu == "x64" || v8_current_cpu == "arm64" ||
+        v8_current_cpu == "mips64el") {
+      cflags += [ "-Wshorten-64-to-32" ]
+    }
+  }
 }
 
 ###############################################################################