1 |
commit: 0f63495513b774cf8494894df98e8112c1463165 |
2 |
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> |
3 |
AuthorDate: Fri Feb 28 10:16:17 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 28 14:39:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f634955 |
7 |
|
8 |
www-client/chromium: fix compiler patch for dev channel |
9 |
|
10 |
Closes: https://bugs.gentoo.org/711010 |
11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
12 |
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com> |
13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/14796 |
15 |
|
16 |
.../chromium/files/chromium-compiler-r12.patch | 54 +++++++++------------- |
17 |
1 file changed, 22 insertions(+), 32 deletions(-) |
18 |
|
19 |
diff --git a/www-client/chromium/files/chromium-compiler-r12.patch b/www-client/chromium/files/chromium-compiler-r12.patch |
20 |
index 18f597f7e34..833abe2828c 100644 |
21 |
--- a/www-client/chromium/files/chromium-compiler-r12.patch |
22 |
+++ b/www-client/chromium/files/chromium-compiler-r12.patch |
23 |
@@ -1,17 +1,17 @@ |
24 |
-From 4ee82d093d26ab2fcdb989fd62f55b0588afdde0 Mon Sep 17 00:00:00 2001 |
25 |
+From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001 |
26 |
From: Mike Gilbert <floppym@g.o> |
27 |
-Date: Sat, 15 Feb 2020 12:11:49 +0000 |
28 |
+Date: Fri, 26 Feb 2020 10:09:23 +0000 |
29 |
Subject: [PATCH] Disable various compiler configs |
30 |
|
31 |
--- |
32 |
- build/config/compiler/BUILD.gn | 70 ++++++++++++---------------------- |
33 |
- 1 file changed, 25 insertions(+), 45 deletions(-) |
34 |
+ build/config/compiler/BUILD.gn | 67 ++++++++++++---------------------- |
35 |
+ 1 file changed, 23 insertions(+), 44 deletions(-) |
36 |
|
37 |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
38 |
-index e40194e..f2bd02e 100644 |
39 |
+index 85bc736..a85bd12 100644 |
40 |
--- a/build/config/compiler/BUILD.gn |
41 |
+++ b/build/config/compiler/BUILD.gn |
42 |
-@@ -260,8 +260,6 @@ config("compiler") { |
43 |
+@@ -261,8 +261,6 @@ config("compiler") { |
44 |
|
45 |
configs += [ |
46 |
# See the definitions below. |
47 |
@@ -20,7 +20,7 @@ index e40194e..f2bd02e 100644 |
48 |
":compiler_codegen", |
49 |
":compiler_deterministic", |
50 |
] |
51 |
-@@ -486,26 +484,6 @@ config("compiler") { |
52 |
+@@ -487,26 +485,6 @@ config("compiler") { |
53 |
} |
54 |
} |
55 |
|
56 |
@@ -37,7 +37,7 @@ index e40194e..f2bd02e 100644 |
57 |
- "-instcombine-lower-dbg-declare=0", |
58 |
- ] |
59 |
- |
60 |
-- if (target_os != "chromeos") { |
61 |
+- if (!is_chromeos && default_toolchain != "//build/toolchain/cros:target") { |
62 |
- # TODO(https://crbug.com/1049161): Remove '-DCLANG_SPAWN_CC1=ON' from build.py instead |
63 |
- # once this change has marinated a bit. |
64 |
- cflags += [ "-fintegrated-cc1" ] |
65 |
@@ -47,7 +47,7 @@ index e40194e..f2bd02e 100644 |
66 |
# C11/C++11 compiler flags setup. |
67 |
# --------------------------- |
68 |
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { |
69 |
-@@ -1452,6 +1430,12 @@ config("default_warnings") { |
70 |
+@@ -1442,6 +1420,12 @@ config("default_warnings") { |
71 |
cflags_cc += [ "-Wno-class-memaccess" ] |
72 |
} |
73 |
|
74 |
@@ -60,7 +60,7 @@ index e40194e..f2bd02e 100644 |
75 |
# -Wunused-local-typedefs is broken in gcc, |
76 |
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872 |
77 |
cflags += [ "-Wno-unused-local-typedefs" ] |
78 |
-@@ -1577,7 +1561,7 @@ config("chromium_code") { |
79 |
+@@ -1572,7 +1556,7 @@ config("chromium_code") { |
80 |
defines = [ "_HAS_NODISCARD" ] |
81 |
} |
82 |
} else { |
83 |
@@ -69,7 +69,7 @@ index e40194e..f2bd02e 100644 |
84 |
if (treat_warnings_as_errors) { |
85 |
cflags += [ "-Werror" ] |
86 |
|
87 |
-@@ -1586,10 +1570,6 @@ config("chromium_code") { |
88 |
+@@ -1581,10 +1565,6 @@ config("chromium_code") { |
89 |
# well. |
90 |
ldflags = [ "-Werror" ] |
91 |
} |
92 |
@@ -80,7 +80,7 @@ index e40194e..f2bd02e 100644 |
93 |
|
94 |
# In Chromium code, we define __STDC_foo_MACROS in order to get the |
95 |
# C99 macros on Mac and Linux. |
96 |
-@@ -1598,15 +1578,6 @@ config("chromium_code") { |
97 |
+@@ -1593,15 +1573,6 @@ config("chromium_code") { |
98 |
"__STDC_FORMAT_MACROS", |
99 |
] |
100 |
|
101 |
@@ -96,7 +96,7 @@ index e40194e..f2bd02e 100644 |
102 |
if (is_mac) { |
103 |
cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
104 |
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
105 |
-@@ -2010,7 +1981,8 @@ config("default_stack_frames") { |
106 |
+@@ -1993,7 +1964,8 @@ config("default_stack_frames") { |
107 |
} |
108 |
|
109 |
# Default "optimization on" config. |
110 |
@@ -104,19 +104,9 @@ index e40194e..f2bd02e 100644 |
111 |
+config("optimize") { } |
112 |
+config("xoptimize") { |
113 |
if (is_win) { |
114 |
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772 |
115 |
- if (is_official_build && full_wpo_on_official && !is_clang) { |
116 |
-@@ -2036,7 +2008,8 @@ config("optimize") { |
117 |
- } |
118 |
- |
119 |
- # Same config as 'optimize' but without the WPO flag. |
120 |
--config("optimize_no_wpo") { |
121 |
-+config("optimize_no_wpo") { } |
122 |
-+config("xoptimize_no_wpo") { |
123 |
- if (is_win) { |
124 |
- # Favor size over speed, /O1 must be before the common flags. The GYP |
125 |
- # build also specifies /Os and /GF but these are implied by /O1. |
126 |
-@@ -2059,7 +2032,8 @@ config("optimize_no_wpo") { |
127 |
+ # Favor size over speed, /O1 must be before the common flags. |
128 |
+ # /O1 implies /Os and /GF. |
129 |
+@@ -2016,7 +1988,8 @@ config("optimize") { |
130 |
} |
131 |
|
132 |
# Turn off optimizations. |
133 |
@@ -126,7 +116,7 @@ index e40194e..f2bd02e 100644 |
134 |
if (is_win) { |
135 |
cflags = [ |
136 |
"/Od", # Disable optimization. |
137 |
-@@ -2093,7 +2067,8 @@ config("no_optimize") { |
138 |
+@@ -2050,7 +2023,8 @@ config("no_optimize") { |
139 |
# Turns up the optimization level. On Windows, this implies whole program |
140 |
# optimization and link-time code generation which is very expensive and should |
141 |
# be used sparingly. |
142 |
@@ -136,7 +126,7 @@ index e40194e..f2bd02e 100644 |
143 |
if (is_nacl && is_nacl_irt) { |
144 |
# The NaCl IRT is a special case and always wants its own config. |
145 |
# Various components do: |
146 |
-@@ -2132,7 +2107,8 @@ config("optimize_max") { |
147 |
+@@ -2089,7 +2063,8 @@ config("optimize_max") { |
148 |
# |
149 |
# TODO(crbug.com/621335) - rework how all of these configs are related |
150 |
# so that we don't need this disclaimer. |
151 |
@@ -146,7 +136,7 @@ index e40194e..f2bd02e 100644 |
152 |
if (is_nacl && is_nacl_irt) { |
153 |
# The NaCl IRT is a special case and always wants its own config. |
154 |
# Various components do: |
155 |
-@@ -2162,7 +2138,8 @@ config("optimize_speed") { |
156 |
+@@ -2119,7 +2094,8 @@ config("optimize_speed") { |
157 |
} |
158 |
} |
159 |
|
160 |
@@ -156,7 +146,7 @@ index e40194e..f2bd02e 100644 |
161 |
cflags = [ "-O1" ] + common_optimize_on_cflags |
162 |
ldflags = common_optimize_on_ldflags |
163 |
visibility = [ ":default_optimization" ] |
164 |
-@@ -2278,7 +2255,8 @@ config("win_pdbaltpath") { |
165 |
+@@ -2235,7 +2211,8 @@ config("win_pdbaltpath") { |
166 |
} |
167 |
|
168 |
# Full symbols. |
169 |
@@ -166,7 +156,7 @@ index e40194e..f2bd02e 100644 |
170 |
if (is_win) { |
171 |
if (use_goma || is_clang) { |
172 |
# Note that with VC++ this requires is_win_fastlink, enforced elsewhere. |
173 |
-@@ -2388,7 +2366,8 @@ config("symbols") { |
174 |
+@@ -2361,7 +2338,8 @@ config("symbols") { |
175 |
# Minimal symbols. |
176 |
# This config guarantees to hold symbol for stack trace which are shown to user |
177 |
# when crash happens in unittests running on buildbot. |
178 |
@@ -176,7 +166,7 @@ index e40194e..f2bd02e 100644 |
179 |
if (is_win) { |
180 |
# Functions, files, and line tables only. |
181 |
cflags = [] |
182 |
-@@ -2443,7 +2422,8 @@ config("minimal_symbols") { |
183 |
+@@ -2416,7 +2394,8 @@ config("minimal_symbols") { |
184 |
} |
185 |
|
186 |
# No symbols. |