diff options
| author | thakis <thakis@chromium.org> | 2016-01-08 11:37:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 19:38:43 +0000 |
| commit | 6fc6aa0987377a5d5633103de9c153fcccbf2ed8 (patch) | |
| tree | cad74b3b73f2791037acedda2d4ac0d65350a94b | |
| parent | 4bc8e916048df9c2559c3c479054a2cd4e632aa7 (diff) | |
| download | chromium_src-6fc6aa0987377a5d5633103de9c153fcccbf2ed8.zip chromium_src-6fc6aa0987377a5d5633103de9c153fcccbf2ed8.tar.gz chromium_src-6fc6aa0987377a5d5633103de9c153fcccbf2ed8.tar.bz2 | |
Enable warning on reserved user-defined literals everywhere but CrOS.
This was disabled because a dbus header was missing a few spaces.
The version of the dbus header in the sysroot has them though,
and we use the sysroot everywhere except in Chrome OS-on-Linux
builds these days.
The spaces were added here, almost 3 years ago by now:
http://cgit.freedesktop.org/dbus/dbus/commit/?h=dbus-1.4&id=51b88b4c7919487290c0862b013cd8e7cd2de34b
No behavior change.
BUG=263960, 573778
Review URL: https://codereview.chromium.org/1570193002
Cr-Commit-Position: refs/heads/master@{#368408}
| -rw-r--r-- | build/common.gypi | 30 | ||||
| -rw-r--r-- | build/config/compiler/BUILD.gn | 4 | ||||
| -rw-r--r-- | tools/android/memdump/memdump.cc | 6 |
3 files changed, 29 insertions, 11 deletions
diff --git a/build/common.gypi b/build/common.gypi index e8c7b16..333a500 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4315,10 +4315,6 @@ }]] }], ['clang==1', { - 'cflags': [ - # TODO(thakis): Remove, http://crbug.com/263960 - '-Wno-reserved-user-defined-literal', - ], 'cflags_cc': [ # gnu++11 instead of c++11 is needed because some code uses # typeof() (a GNU extension). @@ -4327,6 +4323,12 @@ '-std=gnu++11', ], }], + ['clang==1 and chromeos==1', { + 'cflags': [ + # TODO(thakis): Remove, http://crbug.com/263960 + '-Wno-reserved-user-defined-literal', + ], + }], ['clang==0 and host_clang==1', { 'target_conditions': [ ['_toolset=="host"', { @@ -4712,8 +4714,6 @@ '-std=gnu++11', # See comment for -Wno-c++11-narrowing. '-Wno-narrowing', - # TODO(thakis): Remove, http://crbug.com/263960 - '-Wno-literal-suffix', ], }], ], @@ -4725,6 +4725,24 @@ '-std=gnu++11', # See comment for -Wno-c++11-narrowing. '-Wno-narrowing', + ], + }], + ], + }], + ['gcc_version>=47 and clang==0 and chromeos==1', { + 'target_conditions': [ + ['_toolset=="target"', { + 'cflags_cc': [ + # TODO(thakis): Remove, http://crbug.com/263960 + '-Wno-literal-suffix', + ], + }], + ], + }], + ['host_gcc_version>=47 and clang==0 and host_clang==0 and chromeos==1', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags_cc': [ # TODO(thakis): Remove, http://crbug.com/263960 '-Wno-literal-suffix', ], diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index d08ede4..0ad9485 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -802,7 +802,7 @@ config("default_warnings") { # See comment for -Wno-c++11-narrowing. "-Wno-narrowing", ] - if (!is_clang) { + if (!is_clang && is_chromeos) { cflags_cc += [ # TODO(thakis): Remove, http://crbug.com/263960 "-Wno-literal-suffix", @@ -865,7 +865,7 @@ config("default_warnings") { "-Wno-inconsistent-missing-override", ] - if (is_posix && !is_mac && !is_ios) { + if (is_chromeos) { cflags += [ # TODO(thakis): Remove, http://crbug.com/263960 "-Wno-reserved-user-defined-literal", diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc index 0564f85..7f135ee 100644 --- a/tools/android/memdump/memdump.cc +++ b/tools/android/memdump/memdump.cc @@ -422,9 +422,9 @@ void DumpProcessesMemoryMapsInExtendedFormat( AppendAppSharedField(memory_map.app_shared_pages, &app_shared_buf); base::SStringPrintf( &buf, - "%"PRIx64"-%"PRIx64" %s %"PRIx64" private_unevictable=%d private=%d " - "shared_app=%s shared_other_unevictable=%d shared_other=%d " - "\"%s\" [%s]\n", + "%" PRIx64 "-%" PRIx64 " %s %" PRIx64 " private_unevictable=%d " + "private=%d shared_app=%s shared_other_unevictable=%d " + "shared_other=%d \"%s\" [%s]\n", memory_map.start_address, memory_map.end_address, memory_map.flags.c_str(), |