forked from kiss-community/repo
197 lines
6.1 KiB
Diff
197 lines
6.1 KiB
Diff
|
From a1207cc75454e653030716948d27ec27412f6fe8 Mon Sep 17 00:00:00 2001
|
||
|
From: Mike Gilbert <floppym@gentoo.org>
|
||
|
Date: Sat, 1 Jun 2019 14:22:57 +0100
|
||
|
Subject: [PATCH] Disable various compiler configs
|
||
|
|
||
|
---
|
||
|
build/config/compiler/BUILD.gn | 68 +++++++++++++++-------------------
|
||
|
1 file changed, 29 insertions(+), 39 deletions(-)
|
||
|
|
||
|
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||
|
index 4b24c76..0737326 100644
|
||
|
--- a/build/config/compiler/BUILD.gn
|
||
|
+++ b/build/config/compiler/BUILD.gn
|
||
|
@@ -230,8 +230,6 @@ config("compiler") {
|
||
|
|
||
|
configs += [
|
||
|
# See the definitions below.
|
||
|
- ":clang_revision",
|
||
|
- ":compiler_cpu_abi",
|
||
|
":compiler_codegen",
|
||
|
":compiler_deterministic",
|
||
|
]
|
||
|
@@ -471,20 +469,6 @@ config("compiler") {
|
||
|
}
|
||
|
}
|
||
|
|
||
|
- if (is_clang && !is_nacl && !use_xcode_clang) {
|
||
|
- cflags += [ "-fcrash-diagnostics-dir=" +
|
||
|
- rebase_path("//tools/clang/crashreports", root_build_dir) ]
|
||
|
-
|
||
|
- cflags += [
|
||
|
- # TODO(hans): Remove this once Clang generates better optimized debug info
|
||
|
- # by default. https://crbug.com/765793
|
||
|
- "-Xclang",
|
||
|
- "-mllvm",
|
||
|
- "-Xclang",
|
||
|
- "-instcombine-lower-dbg-declare=0",
|
||
|
- ]
|
||
|
- }
|
||
|
-
|
||
|
# C11/C++11 compiler flags setup.
|
||
|
# ---------------------------
|
||
|
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
|
||
|
@@ -1433,6 +1417,12 @@ config("default_warnings") {
|
||
|
"-Wno-narrowing",
|
||
|
]
|
||
|
|
||
|
+ # -Wno-class-memaccess warns about hash table and vector in blink.
|
||
|
+ # But the violation is intentional.
|
||
|
+ if (!is_nacl) {
|
||
|
+ cflags_cc += [ "-Wno-class-memaccess" ]
|
||
|
+ }
|
||
|
+
|
||
|
# -Wunused-local-typedefs is broken in gcc,
|
||
|
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
|
||
|
cflags += [ "-Wno-unused-local-typedefs" ]
|
||
|
@@ -1447,6 +1437,10 @@ config("default_warnings") {
|
||
|
# comments
|
||
|
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61638
|
||
|
cflags += [ "-Wno-comments" ]
|
||
|
+
|
||
|
+ # -Wpacked-not-aligned complains all generated mojom-shared-internal.h
|
||
|
+ # files.
|
||
|
+ cflags += [ "-Wno-packed-not-aligned" ]
|
||
|
}
|
||
|
}
|
||
|
|
||
|
@@ -1523,7 +1517,7 @@ config("chromium_code") {
|
||
|
defines = [ "_HAS_NODISCARD" ]
|
||
|
}
|
||
|
} else {
|
||
|
- cflags = [ "-Wall" ]
|
||
|
+ cflags = []
|
||
|
if (treat_warnings_as_errors) {
|
||
|
cflags += [ "-Werror" ]
|
||
|
|
||
|
@@ -1532,10 +1526,6 @@ config("chromium_code") {
|
||
|
# well.
|
||
|
ldflags = [ "-Werror" ]
|
||
|
}
|
||
|
- if (is_clang) {
|
||
|
- # Enable extra warnings for chromium_code when we control the compiler.
|
||
|
- cflags += [ "-Wextra" ]
|
||
|
- }
|
||
|
|
||
|
# In Chromium code, we define __STDC_foo_MACROS in order to get the
|
||
|
# C99 macros on Mac and Linux.
|
||
|
@@ -1544,15 +1534,6 @@ config("chromium_code") {
|
||
|
"__STDC_FORMAT_MACROS",
|
||
|
]
|
||
|
|
||
|
- if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
|
||
|
- current_cpu != "s390" && current_cpu != "ppc64" &&
|
||
|
- current_cpu != "mips" && current_cpu != "mips64") {
|
||
|
- # Non-chromium code is not guaranteed to compile cleanly with
|
||
|
- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
|
||
|
- # disabled, so only do that for Release build.
|
||
|
- defines += [ "_FORTIFY_SOURCE=2" ]
|
||
|
- }
|
||
|
-
|
||
|
if (is_mac) {
|
||
|
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
|
||
|
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
|
||
|
@@ -1941,7 +1922,8 @@ config("default_stack_frames") {
|
||
|
}
|
||
|
|
||
|
# Default "optimization on" config.
|
||
|
-config("optimize") {
|
||
|
+config("optimize") { }
|
||
|
+config("xoptimize") {
|
||
|
if (is_win) {
|
||
|
# TODO(thakis): Remove is_clang here, https://crbug.com/598772
|
||
|
if (is_official_build && full_wpo_on_official && !is_clang) {
|
||
|
@@ -1975,7 +1957,8 @@ config("optimize") {
|
||
|
}
|
||
|
|
||
|
# Same config as 'optimize' but without the WPO flag.
|
||
|
-config("optimize_no_wpo") {
|
||
|
+config("optimize_no_wpo") { }
|
||
|
+config("xoptimize_no_wpo") {
|
||
|
if (is_win) {
|
||
|
# Favor size over speed, /O1 must be before the common flags. The GYP
|
||
|
# build also specifies /Os and /GF but these are implied by /O1.
|
||
|
@@ -1998,7 +1981,8 @@ config("optimize_no_wpo") {
|
||
|
}
|
||
|
|
||
|
# Turn off optimizations.
|
||
|
-config("no_optimize") {
|
||
|
+config("no_optimize") { }
|
||
|
+config("xno_optimize") {
|
||
|
if (is_win) {
|
||
|
cflags = [
|
||
|
"/Od", # Disable optimization.
|
||
|
@@ -2026,7 +2010,8 @@ config("no_optimize") {
|
||
|
# Turns up the optimization level. On Windows, this implies whole program
|
||
|
# optimization and link-time code generation which is very expensive and should
|
||
|
# be used sparingly.
|
||
|
-config("optimize_max") {
|
||
|
+config("optimize_max") { }
|
||
|
+config("xoptimize_max") {
|
||
|
if (is_nacl && is_nacl_irt) {
|
||
|
# The NaCl IRT is a special case and always wants its own config.
|
||
|
# Various components do:
|
||
|
@@ -2073,7 +2058,8 @@ config("optimize_max") {
|
||
|
#
|
||
|
# TODO(crbug.com/621335) - rework how all of these configs are related
|
||
|
# so that we don't need this disclaimer.
|
||
|
-config("optimize_speed") {
|
||
|
+config("optimize_speed") { }
|
||
|
+config("xoptimize_speed") {
|
||
|
if (is_nacl && is_nacl_irt) {
|
||
|
# The NaCl IRT is a special case and always wants its own config.
|
||
|
# Various components do:
|
||
|
@@ -2111,7 +2097,8 @@ config("optimize_speed") {
|
||
|
}
|
||
|
}
|
||
|
|
||
|
-config("optimize_fuzzing") {
|
||
|
+config("optimize_fuzzing") { }
|
||
|
+config("xoptimize_fuzzing") {
|
||
|
cflags = [ "-O1" ] + common_optimize_on_cflags
|
||
|
ldflags = common_optimize_on_ldflags
|
||
|
visibility = [ ":default_optimization" ]
|
||
|
@@ -2213,7 +2200,8 @@ config("win_pdbaltpath") {
|
||
|
}
|
||
|
|
||
|
# Full symbols.
|
||
|
-config("symbols") {
|
||
|
+config("symbols") { }
|
||
|
+config("xsymbols") {
|
||
|
if (is_win) {
|
||
|
if (use_goma || is_clang) {
|
||
|
# Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
|
||
|
@@ -2323,7 +2311,8 @@ config("symbols") {
|
||
|
# Minimal symbols.
|
||
|
# This config guarantees to hold symbol for stack trace which are shown to user
|
||
|
# when crash happens in unittests running on buildbot.
|
||
|
-config("minimal_symbols") {
|
||
|
+config("minimal_symbols") { }
|
||
|
+config("xminimal_symbols") {
|
||
|
if (is_win) {
|
||
|
# Linker symbols for backtraces only.
|
||
|
cflags = []
|
||
|
@@ -2380,7 +2369,8 @@ config("minimal_symbols") {
|
||
|
}
|
||
|
|
||
|
# No symbols.
|
||
|
-config("no_symbols") {
|
||
|
+config("no_symbols") { }
|
||
|
+config("xno_symbols") {
|
||
|
if (!is_win) {
|
||
|
cflags = [ "-g0" ]
|
||
|
asmflags = cflags
|
||
|
--
|
||
|
2.21.0
|
||
|
|