Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 878ec588c89036b8bb3bed1e321b30031ac0b47d..097f0372c0630a51bb02a026cf8b4299690c7a66 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -1064,11 +1064,6 @@ config("default_warnings") { |
# also contain a default: branch. Chrome is full of that. |
"-Wno-covered-switch-default", |
- # Clang considers the `register` keyword as deprecated, but e.g. |
- # code generated by flex (used in angle) contains that keyword. |
- # http://crbug.com/255186 |
- "-Wno-deprecated-register", |
- |
# TODO(thakis): This used to be implied by -Wno-unused-function, |
# which we no longer use. Check if it makes sense to remove |
# this as well. http://crbug.com/316352 |
@@ -1078,6 +1073,15 @@ config("default_warnings") { |
"-Wno-inconsistent-missing-override", |
] |
+ if (is_chromeos || (is_linux && target_cpu == "x86")) { |
+ cflags += [ |
+ # TODO(thakis): Figure out why CrOS needs this, fix, remove. |
+ # https://crbug.com/806812 |
+ # TODO(thakis): Remove from 32-bit Linux eventually, https://707084 |
+ "-Wno-deprecated-register", |
+ ] |
+ } |
+ |
# use_xcode_clang only refers to the iOS toolchain, host binaries use |
# chromium's clang always. |
if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) { |