port the mbsd_multi patch to gcc 4.4.0, refresh the other patches
[openwrt/staging/florian.git] / toolchain / gcc / patches / 4.4.0 / 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 at mirbsd.de>
18 with copyright assignment to the FSF in effect.
19
20 --- a/gcc/c-opts.c
21 +++ b/gcc/c-opts.c
22 @@ -105,6 +105,9 @@
23 /* Number of deferred options scanned for -include. */
24 static size_t include_cursor;
25
26 +/* Check if a port honours COPTS. */
27 +static int honour_copts = 0;
28 +
29 static void set_Wimplicit (int);
30 static void handle_OPT_d (const char *);
31 static void set_std_cxx98 (int);
32 @@ -454,6 +457,14 @@
33 enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC);
34 break;
35
36 + case OPT_Werror_maybe_reset:
37 + {
38 + char *ev = getenv ("GCC_NO_WERROR");
39 + if ((ev != NULL) && (*ev != '0'))
40 + cpp_opts->warnings_are_errors = 0;
41 + }
42 + break;
43 +
44 case OPT_Wformat:
45 set_Wformat (value);
46 break;
47 @@ -690,6 +701,12 @@
48 flag_exceptions = value;
49 break;
50
51 + case OPT_fhonour_copts:
52 + if (c_language == clk_c) {
53 + honour_copts++;
54 + }
55 + break;
56 +
57 case OPT_fimplement_inlines:
58 flag_implement_inlines = value;
59 break;
60 @@ -1209,6 +1226,47 @@
61 return false;
62 }
63
64 + if (c_language == clk_c) {
65 + char *ev = getenv ("GCC_HONOUR_COPTS");
66 + int evv;
67 + if (ev == NULL)
68 + evv = -1;
69 + else if ((*ev == '0') || (*ev == '\0'))
70 + evv = 0;
71 + else if (*ev == '1')
72 + evv = 1;
73 + else if (*ev == '2')
74 + evv = 2;
75 + else if (*ev == 's')
76 + evv = -1;
77 + else {
78 + warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
79 + evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */
80 + }
81 + if (evv == 1) {
82 + if (honour_copts == 0) {
83 + error ("someone does not honour COPTS at all in lenient mode");
84 + return false;
85 + } else if (honour_copts != 1) {
86 + warning (0, "someone does not honour COPTS correctly, passed %d times",
87 + honour_copts);
88 + }
89 + } else if (evv == 2) {
90 + if (honour_copts == 0) {
91 + error ("someone does not honour COPTS at all in strict mode");
92 + return false;
93 + } else if (honour_copts != 1) {
94 + error ("someone does not honour COPTS correctly, passed %d times",
95 + honour_copts);
96 + return false;
97 + }
98 + } else if (evv == 0) {
99 + if (honour_copts != 1)
100 + inform ("someone does not honour COPTS correctly, passed %d times",
101 + honour_copts);
102 + }
103 + }
104 +
105 return true;
106 }
107
108 --- a/gcc/c.opt
109 +++ b/gcc/c.opt
110 @@ -215,6 +215,10 @@
111 C ObjC RejectNegative Warning
112 This switch is deprecated; use -Werror=implicit-function-declaration instead
113
114 +Werror-maybe-reset
115 +C ObjC C++ ObjC++
116 +; Documented in common.opt
117 +
118 Wfloat-equal
119 C ObjC C++ ObjC++ Var(warn_float_equal) Warning
120 Warn if testing floating point numbers for equality
121 @@ -609,6 +613,9 @@
122 fhonor-std
123 C++ ObjC++
124
125 +fhonour-copts
126 +C ObjC C++ ObjC++ RejectNegative
127 +
128 fhosted
129 C ObjC
130 Assume normal C execution environment
131 --- a/gcc/common.opt
132 +++ b/gcc/common.opt
133 @@ -102,6 +102,10 @@
134 Common Joined
135 Treat specified warning as error
136
137 +Werror-maybe-reset
138 +Common
139 +If environment variable GCC_NO_WERROR is set, act as -Wno-error
140 +
141 Wextra
142 Common Warning
143 Print extra (possibly unwanted) warnings
144 @@ -573,6 +577,9 @@
145 Common Report Var(flag_guess_branch_prob) Optimization
146 Enable guessing of branch probabilities
147
148 +fhonour-copts
149 +Common RejectNegative
150 +
151 ; Nonzero means ignore `#ident' directives. 0 means handle them.
152 ; Generate position-independent code for executables if possible
153 ; On SVR4 targets, it also controls whether or not to emit a
154 --- a/gcc/opts.c
155 +++ b/gcc/opts.c
156 @@ -896,9 +896,6 @@
157 flag_schedule_insns_after_reload = opt2;
158 #endif
159 flag_regmove = opt2;
160 - flag_strict_aliasing = opt2;
161 - flag_strict_overflow = opt2;
162 - flag_delete_null_pointer_checks = opt2;
163 flag_reorder_blocks = opt2;
164 flag_reorder_functions = opt2;
165 flag_tree_vrp = opt2;
166 @@ -922,6 +919,9 @@
167
168 /* -O3 optimizations. */
169 opt3 = (optimize >= 3);
170 + flag_strict_aliasing = opt3;
171 + flag_strict_overflow = opt3;
172 + flag_delete_null_pointer_checks = opt3;
173 flag_predictive_commoning = opt3;
174 flag_inline_functions = opt3;
175 flag_unswitch_loops = opt3;
176 @@ -1601,6 +1601,17 @@
177 enable_warning_as_error (arg, value, lang_mask);
178 break;
179
180 + case OPT_Werror_maybe_reset:
181 + {
182 + char *ev = getenv ("GCC_NO_WERROR");
183 + if ((ev != NULL) && (*ev != '0'))
184 + warnings_are_errors = 0;
185 + }
186 + break;
187 +
188 + case OPT_fhonour_copts:
189 + break;
190 +
191 case OPT_Wextra:
192 set_Wextra (value);
193 break;
194 --- a/gcc/doc/cppopts.texi
195 +++ b/gcc/doc/cppopts.texi
196 @@ -164,6 +164,11 @@
197 Make all warnings into hard errors. Source code which triggers warnings
198 will be rejected.
199
200 + at item -Werror-maybe-reset
201 + at opindex Werror-maybe-reset
202 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
203 +variable is set to anything other than 0 or empty.
204 +
205 @item -Wsystem-headers
206 @opindex Wsystem-headers
207 Issue warnings for code in system headers. These are normally unhelpful
208 --- a/gcc/doc/invoke.texi
209 +++ b/gcc/doc/invoke.texi
210 @@ -234,7 +234,7 @@
211 -Wconversion -Wcoverage-mismatch -Wno-deprecated @gol
212 -Wno-deprecated-declarations -Wdisabled-optimization @gol
213 -Wno-div-by-zero -Wempty-body -Wenum-compare -Wno-endif-labels @gol
214 --Werror -Werror=* @gol
215 +-Werror -Werror=* -Werror-maybe-reset @gol
216 -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol
217 -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
218 -Wformat-security -Wformat-y2k @gol
219 @@ -4161,6 +4161,22 @@
220 @option{-Wall} and by @option{-pedantic}, which can be disabled with
221 @option{-Wno-pointer-sign}.
222
223 + at item -Werror-maybe-reset
224 + at opindex Werror-maybe-reset
225 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
226 +variable is set to anything other than 0 or empty.
227 +
228 + at item -fhonour-copts
229 + at opindex fhonour-copts
230 +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
231 +given at least once, and warn if it is given more than once.
232 +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
233 +given exactly once.
234 +If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
235 +is not given exactly once.
236 +The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
237 +This flag and environment variable only affect the C language.
238 +
239 @item -Wstack-protector
240 @opindex Wstack-protector
241 @opindex Wno-stack-protector
242 @@ -5699,7 +5715,7 @@
243 second branch or a point immediately following it, depending on whether
244 the condition is known to be true or false.
245
246 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
247 +Enabled at levels @option{-O3}.
248
249 @item -fsplit-wide-types
250 @opindex fsplit-wide-types
251 @@ -5844,7 +5860,7 @@
252 @option{-fno-delete-null-pointer-checks} to disable this optimization
253 for programs which depend on that behavior.
254
255 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
256 +Enabled at levels @option{-O3}.
257
258 @item -fexpensive-optimizations
259 @opindex fexpensive-optimizations
260 --- a/gcc/java/jvspec.c
261 +++ b/gcc/java/jvspec.c
262 @@ -670,6 +670,7 @@
263 class name. Append dummy `.c' that can be stripped by set_input so %b
264 is correct. */
265 set_input (concat (main_class_name, "main.c", NULL));
266 + putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */
267 err = do_spec (jvgenmain_spec);
268 if (err == 0)
269 {