Port the mbsd_multi patch from freewrt, which adds -fhonour-copts. This will emit...
[openwrt/openwrt.git] / toolchain / gcc / patches / 4.1.2 / 910-mbsd_multi.patch
1
2 This patch brings over a few features from MirBSD:
3 * -fhonour-copts
4 If this option is not given, it's warned (depending
5 on environment variables). This is to catch errors
6 of misbuilt packages which override CFLAGS themselves.
7 * -Werror-maybe-reset
8 Has the effect of -Wno-error if GCC_NO_WERROR is
9 set and not '0', a no-operation otherwise. This is
10 to be able to use -Werror in "make" but prevent
11 GNU autoconf generated configure scripts from
12 freaking out.
13 * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
14 the default for -O2/-Os, because they trigger gcc bugs
15 and can delete code with security implications.
16
17 This patch was authored by Thorsten Glaser <tg@mirbsd.de>
18 with copyright assignment to the FSF in effect.
19
20 Index: gcc-4.1.2/gcc/c-opts.c
21 ===================================================================
22 --- gcc-4.1.2.orig/gcc/c-opts.c 2007-07-31 01:14:52.799979303 +0200
23 +++ gcc-4.1.2/gcc/c-opts.c 2007-07-31 01:17:10.535828420 +0200
24 @@ -103,6 +103,9 @@
25 /* Number of deferred options scanned for -include. */
26 static size_t include_cursor;
27
28 +/* Check if a port honours COPTS. */
29 +static int honour_copts = 0;
30 +
31 static void set_Wimplicit (int);
32 static void handle_OPT_d (const char *);
33 static void set_std_cxx98 (int);
34 @@ -448,6 +451,14 @@
35 mesg_implicit_function_declaration = 2;
36 break;
37
38 + case OPT_Werror_maybe_reset:
39 + {
40 + char *ev = getenv ("GCC_NO_WERROR");
41 + if ((ev != NULL) && (*ev != '0'))
42 + cpp_opts->warnings_are_errors = 0;
43 + }
44 + break;
45 +
46 case OPT_Wformat:
47 set_Wformat (value);
48 break;
49 @@ -691,6 +702,12 @@
50 flag_exceptions = value;
51 break;
52
53 + case OPT_fhonour_copts:
54 + if (c_language == clk_c) {
55 + honour_copts++;
56 + }
57 + break;
58 +
59 case OPT_fimplement_inlines:
60 flag_implement_inlines = value;
61 break;
62 @@ -1121,6 +1138,47 @@
63 /* Has to wait until now so that cpplib has its hash table. */
64 init_pragma ();
65
66 + if (c_language == clk_c) {
67 + char *ev = getenv ("GCC_HONOUR_COPTS");
68 + int evv;
69 + if (ev == NULL)
70 + evv = 0;
71 + else if ((*ev == '0') || (*ev == '\0'))
72 + evv = 0;
73 + else if (*ev == '1')
74 + evv = 1;
75 + else if (*ev == '2')
76 + evv = 2;
77 + else if (*ev == 's')
78 + evv = -1;
79 + else {
80 + warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
81 + evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */
82 + }
83 + if (evv == 1) {
84 + if (honour_copts == 0) {
85 + error ("someone does not honour COPTS at all in lenient mode");
86 + return false;
87 + } else if (honour_copts != 1) {
88 + warning (0, "someone does not honour COPTS correctly, passed %d times",
89 + honour_copts);
90 + }
91 + } else if (evv == 2) {
92 + if (honour_copts == 0) {
93 + error ("someone does not honour COPTS at all in strict mode");
94 + return false;
95 + } else if (honour_copts != 1) {
96 + error ("someone does not honour COPTS correctly, passed %d times",
97 + honour_copts);
98 + return false;
99 + }
100 + } else if (evv == 0) {
101 + if (honour_copts != 1)
102 + inform ("someone does not honour COPTS correctly, passed %d times",
103 + honour_copts);
104 + }
105 + }
106 +
107 return true;
108 }
109
110 Index: gcc-4.1.2/gcc/c.opt
111 ===================================================================
112 --- gcc-4.1.2.orig/gcc/c.opt 2007-07-31 01:14:52.807979755 +0200
113 +++ gcc-4.1.2/gcc/c.opt 2007-07-31 01:15:32.270228583 +0200
114 @@ -185,6 +185,10 @@
115 C ObjC RejectNegative
116 Make implicit function declarations an error
117
118 +Werror-maybe-reset
119 +C ObjC C++ ObjC++
120 +; Documented in common.opt
121 +
122 Wfloat-equal
123 C ObjC C++ ObjC++ Var(warn_float_equal)
124 Warn if testing floating point numbers for equality
125 @@ -541,6 +545,9 @@
126 fhonor-std
127 C++ ObjC++
128
129 +fhonour-copts
130 +C ObjC C++ ObjC++ RejectNegative
131 +
132 fhosted
133 C ObjC
134 Assume normal C execution environment
135 Index: gcc-4.1.2/gcc/common.opt
136 ===================================================================
137 --- gcc-4.1.2.orig/gcc/common.opt 2007-07-31 01:14:52.815980213 +0200
138 +++ gcc-4.1.2/gcc/common.opt 2007-07-31 01:17:41.997621326 +0200
139 @@ -77,6 +77,10 @@
140 Common Var(warnings_are_errors)
141 Treat all warnings as errors
142
143 +Werror-maybe-reset
144 +Common
145 +If environment variable GCC_NO_WERROR is set, act as -Wno-error
146 +
147 Wextra
148 Common
149 Print extra (possibly unwanted) warnings
150 @@ -451,6 +455,9 @@
151 Common Report Var(flag_guess_branch_prob)
152 Enable guessing of branch probabilities
153
154 +fhonour-copts
155 +Common RejectNegative
156 +
157 ; Nonzero means ignore `#ident' directives. 0 means handle them.
158 ; Generate position-independent code for executables if possible
159 ; On SVR4 targets, it also controls whether or not to emit a
160 Index: gcc-4.1.2/gcc/opts.c
161 ===================================================================
162 --- gcc-4.1.2.orig/gcc/opts.c 2007-07-31 01:14:52.823980670 +0200
163 +++ gcc-4.1.2/gcc/opts.c 2007-07-31 01:18:38.152821428 +0200
164 @@ -569,8 +569,6 @@
165 flag_schedule_insns_after_reload = 1;
166 #endif
167 flag_regmove = 1;
168 - flag_strict_aliasing = 1;
169 - flag_delete_null_pointer_checks = 1;
170 flag_reorder_blocks = 1;
171 flag_reorder_functions = 1;
172 flag_tree_store_ccp = 1;
173 @@ -586,6 +584,9 @@
174
175 if (optimize >= 3)
176 {
177 + flag_strict_aliasing = 1;
178 + flag_delete_null_pointer_checks = 1;
179 +
180 flag_inline_functions = 1;
181 flag_unswitch_loops = 1;
182 flag_gcse_after_reload = 1;
183 @@ -759,6 +760,17 @@
184 set_Wextra (value);
185 break;
186
187 + case OPT_Werror_maybe_reset:
188 + {
189 + char *ev = getenv ("GCC_NO_WERROR");
190 + if ((ev != NULL) && (*ev != '0'))
191 + warnings_are_errors = 0;
192 + }
193 + break;
194 +
195 + case OPT_fhonour_copts:
196 + break;
197 +
198 case OPT_Wextra:
199 set_Wextra (value);
200 break;
201 Index: gcc-4.1.2/gcc/doc/cppopts.texi
202 ===================================================================
203 --- gcc-4.1.2.orig/gcc/doc/cppopts.texi 2007-07-31 01:14:52.827980895 +0200
204 +++ gcc-4.1.2/gcc/doc/cppopts.texi 2007-07-31 01:15:32.362233824 +0200
205 @@ -166,6 +166,11 @@
206 Make all warnings into hard errors. Source code which triggers warnings
207 will be rejected.
208
209 +@item -Werror-maybe-reset
210 +@opindex Werror-maybe-reset
211 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
212 +variable is set to anything other than 0 or empty.
213 +
214 @item -Wsystem-headers
215 @opindex Wsystem-headers
216 Issue warnings for code in system headers. These are normally unhelpful
217 Index: gcc-4.1.2/gcc/doc/invoke.texi
218 ===================================================================
219 --- gcc-4.1.2.orig/gcc/doc/invoke.texi 2007-07-31 01:14:59.592366375 +0200
220 +++ gcc-4.1.2/gcc/doc/invoke.texi 2007-07-31 01:16:22.569094954 +0200
221 @@ -222,7 +222,7 @@
222 -Wc++-compat -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol
223 -Wconversion -Wno-deprecated-declarations @gol
224 -Wdisabled-optimization -Wno-div-by-zero -Wno-endif-labels @gol
225 --Werror -Werror-implicit-function-declaration @gol
226 +-Werror -Werror-maybe-reset -Werror-implicit-function-declaration @gol
227 -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol
228 -Wno-format-extra-args -Wformat-nonliteral @gol
229 -Wformat-security -Wformat-y2k @gol
230 @@ -3390,6 +3390,22 @@
231 @opindex Werror
232 Make all warnings into errors.
233
234 +@item -Werror-maybe-reset
235 +@opindex Werror-maybe-reset
236 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
237 +variable is set to anything other than 0 or empty.
238 +
239 +@item -fhonour-copts
240 +@opindex fhonour-copts
241 +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
242 +given at least once, and warn if it is given more than once.
243 +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
244 +given exactly once.
245 +If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
246 +is not given exactly once.
247 +The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
248 +This flag and environment variable only affect the C language.
249 +
250 @item -Wstack-protector
251 This option is only active when @option{-fstack-protector} is active. It
252 warns about functions that will not be protected against stack smashing.
253 @@ -4679,7 +4695,7 @@
254 Perform the optimizations of loop strength reduction and
255 elimination of iteration variables.
256
257 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
258 +Enabled at levels @option{-O3}.
259
260 @item -fthread-jumps
261 @opindex fthread-jumps
262 @@ -4826,7 +4842,7 @@
263 @option{-fno-delete-null-pointer-checks} to disable this optimization
264 for programs which depend on that behavior.
265
266 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
267 +Enabled at levels @option{-O3}.
268
269 @item -fexpensive-optimizations
270 @opindex fexpensive-optimizations
271 @@ -5234,7 +5250,7 @@
272 allowed to alias. For an example, see the C front-end function
273 @code{c_get_alias_set}.
274
275 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
276 +Enabled at levels @option{-O3}.
277
278 @item -falign-functions
279 @itemx -falign-functions=@var{n}
280 Index: gcc-4.1.2/gcc/java/jvspec.c
281 ===================================================================
282 --- gcc-4.1.2.orig/gcc/java/jvspec.c 2007-07-31 01:14:52.847982035 +0200
283 +++ gcc-4.1.2/gcc/java/jvspec.c 2007-07-31 01:15:32.454239068 +0200
284 @@ -620,6 +620,7 @@
285 class name. Append dummy `.c' that can be stripped by set_input so %b
286 is correct. */
287 set_input (concat (main_class_name, "main.c", NULL));
288 + putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */
289 err = do_spec (jvgenmain_spec);
290 if (err == 0)
291 {