| 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-3.4.6/gcc/c-opts.c |
| 21 | =================================================================== |
| 22 | --- gcc-3.4.6.orig/gcc/c-opts.c 2005-03-09 02:00:56.000000000 +0100 |
| 23 | +++ gcc-3.4.6/gcc/c-opts.c 2007-07-30 23:36:53.376930075 +0200 |
| 24 | @@ -97,6 +97,9 @@ |
| 25 | /* Permit Fotran front-end options. */ |
| 26 | static bool permit_fortran_options; |
| 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 | @@ -452,6 +455,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_Wfloat_equal: |
| 47 | warn_float_equal = value; |
| 48 | break; |
| 49 | @@ -821,6 +832,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 | @@ -1211,6 +1228,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 = -1; |
| 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 ("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 ("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-3.4.6/gcc/c.opt |
| 111 | =================================================================== |
| 112 | --- gcc-3.4.6.orig/gcc/c.opt 2005-03-19 21:30:38.000000000 +0100 |
| 113 | +++ gcc-3.4.6/gcc/c.opt 2007-07-30 23:36:53.380930305 +0200 |
| 114 | @@ -208,6 +208,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++ |
| 124 | Warn if testing floating point numbers for equality |
| 125 | @@ -518,6 +522,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-3.4.6/gcc/common.opt |
| 136 | =================================================================== |
| 137 | --- gcc-3.4.6.orig/gcc/common.opt 2004-10-28 05:43:09.000000000 +0200 |
| 138 | +++ gcc-3.4.6/gcc/common.opt 2007-07-30 23:36:53.396931215 +0200 |
| 139 | @@ -72,6 +72,10 @@ |
| 140 | Common |
| 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 | @@ -373,6 +377,9 @@ |
| 151 | Common |
| 152 | Enable guessing of branch probabilities |
| 153 | |
| 154 | +fhonour-copts |
| 155 | +Common RejectNegative |
| 156 | + |
| 157 | fident |
| 158 | Common |
| 159 | Process #ident directives |
| 160 | Index: gcc-3.4.6/gcc/opts.c |
| 161 | =================================================================== |
| 162 | --- gcc-3.4.6.orig/gcc/opts.c 2004-02-18 01:09:07.000000000 +0100 |
| 163 | +++ gcc-3.4.6/gcc/opts.c 2007-07-30 23:36:53.436933495 +0200 |
| 164 | @@ -560,8 +560,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_unit_at_a_time = 1; |
| 173 | @@ -569,6 +567,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_rename_registers = 1; |
| 182 | flag_unswitch_loops = 1; |
| 183 | @@ -717,6 +718,14 @@ |
| 184 | warnings_are_errors = 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_Wextra: |
| 196 | set_Wextra (value); |
| 197 | break; |
| 198 | @@ -1040,6 +1049,9 @@ |
| 199 | flag_guess_branch_prob = value; |
| 200 | break; |
| 201 | |
| 202 | + case OPT_fhonour_copts: |
| 203 | + break; |
| 204 | + |
| 205 | case OPT_fident: |
| 206 | flag_no_ident = !value; |
| 207 | break; |
| 208 | Index: gcc-3.4.6/gcc/doc/cppopts.texi |
| 209 | =================================================================== |
| 210 | --- gcc-3.4.6.orig/gcc/doc/cppopts.texi 2004-06-28 22:28:07.000000000 +0200 |
| 211 | +++ gcc-3.4.6/gcc/doc/cppopts.texi 2007-07-30 23:36:53.456934635 +0200 |
| 212 | @@ -167,6 +167,11 @@ |
| 213 | Make all warnings into hard errors. Source code which triggers warnings |
| 214 | will be rejected. |
| 215 | |
| 216 | +@item -Werror-maybe-reset |
| 217 | +@opindex Werror-maybe-reset |
| 218 | +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment |
| 219 | +variable is set to anything other than 0 or empty. |
| 220 | + |
| 221 | @item -Wsystem-headers |
| 222 | @opindex Wsystem-headers |
| 223 | Issue warnings for code in system headers. These are normally unhelpful |
| 224 | Index: gcc-3.4.6/gcc/doc/invoke.texi |
| 225 | =================================================================== |
| 226 | --- gcc-3.4.6.orig/gcc/doc/invoke.texi 2005-10-08 02:22:20.000000000 +0200 |
| 227 | +++ gcc-3.4.6/gcc/doc/invoke.texi 2007-07-30 23:36:53.464935090 +0200 |
| 228 | @@ -214,7 +214,7 @@ |
| 229 | -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol |
| 230 | -Wconversion -Wno-deprecated-declarations @gol |
| 231 | -Wdisabled-optimization -Wno-div-by-zero -Wendif-labels @gol |
| 232 | --Werror -Werror-implicit-function-declaration @gol |
| 233 | +-Werror -Werror-maybe-reset -Werror-implicit-function-declaration @gol |
| 234 | -Wfloat-equal -Wformat -Wformat=2 @gol |
| 235 | -Wno-format-extra-args -Wformat-nonliteral @gol |
| 236 | -Wformat-security -Wformat-y2k @gol |
| 237 | @@ -2989,6 +2989,22 @@ |
| 238 | @item -Werror |
| 239 | @opindex Werror |
| 240 | Make all warnings into errors. |
| 241 | + |
| 242 | +@item -Werror-maybe-reset |
| 243 | +@opindex Werror-maybe-reset |
| 244 | +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment |
| 245 | +variable is set to anything other than 0 or empty. |
| 246 | + |
| 247 | +@item -fhonour-copts |
| 248 | +@opindex fhonour-copts |
| 249 | +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not |
| 250 | +given at least once, and warn if it is given more than once. |
| 251 | +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not |
| 252 | +given exactly once. |
| 253 | +If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option |
| 254 | +is not given exactly once. |
| 255 | +The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. |
| 256 | +This flag and environment variable only affect the C language. |
| 257 | @end table |
| 258 | |
| 259 | @node Debugging Options |
| 260 | @@ -3879,7 +3895,7 @@ |
| 261 | Perform the optimizations of loop strength reduction and |
| 262 | elimination of iteration variables. |
| 263 | |
| 264 | -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. |
| 265 | +Enabled at levels @option{-O3}. |
| 266 | |
| 267 | @item -fthread-jumps |
| 268 | @opindex fthread-jumps |
| 269 | @@ -4006,7 +4022,7 @@ |
| 270 | @option{-fno-delete-null-pointer-checks} to disable this optimization |
| 271 | for programs which depend on that behavior. |
| 272 | |
| 273 | -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. |
| 274 | +Enabled at levels @option{-O3}. |
| 275 | |
| 276 | @item -fexpensive-optimizations |
| 277 | @opindex fexpensive-optimizations |
| 278 | @@ -4250,7 +4266,7 @@ |
| 279 | allowed to alias. For an example, see the C front-end function |
| 280 | @code{c_get_alias_set}. |
| 281 | |
| 282 | -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. |
| 283 | +Enabled at levels @option{-O3}. |
| 284 | |
| 285 | @item -falign-functions |
| 286 | @itemx -falign-functions=@var{n} |
| 287 | Index: gcc-3.4.6/gcc/java/jvspec.c |
| 288 | =================================================================== |
| 289 | --- gcc-3.4.6.orig/gcc/java/jvspec.c 2003-10-05 04:52:33.000000000 +0200 |
| 290 | +++ gcc-3.4.6/gcc/java/jvspec.c 2007-07-30 23:36:53.496936915 +0200 |
| 291 | @@ -609,6 +609,7 @@ |
| 292 | class name. Append dummy `.c' that can be stripped by set_input so %b |
| 293 | is correct. */ |
| 294 | set_input (concat (main_class_name, "main.c", NULL)); |
| 295 | + putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ |
| 296 | err = do_spec (jvgenmain_spec); |
| 297 | if (err == 0) |
| 298 | { |
| 299 | |
