diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/patches/3.4.6/910-mbsd_multi.patch | 298 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.1.2/910-mbsd_multi.patch | 291 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.2.0/910-mbsd_multi.patch | 293 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.2.1/910-mbsd_multi.patch | 293 |
4 files changed, 1175 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/3.4.6/910-mbsd_multi.patch b/toolchain/gcc/patches/3.4.6/910-mbsd_multi.patch new file mode 100644 index 0000000000..282ded139c --- /dev/null +++ b/toolchain/gcc/patches/3.4.6/910-mbsd_multi.patch @@ -0,0 +1,298 @@ + + This patch brings over a few features from MirBSD: + * -fhonour-copts + If this option is not given, it's warned (depending + on environment variables). This is to catch errors + of misbuilt packages which override CFLAGS themselves. + * -Werror-maybe-reset + Has the effect of -Wno-error if GCC_NO_WERROR is + set and not '0', a no-operation otherwise. This is + to be able to use -Werror in "make" but prevent + GNU autoconf generated configure scripts from + freaking out. + * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks + the default for -O2/-Os, because they trigger gcc bugs + and can delete code with security implications. + + This patch was authored by Thorsten Glaser <tg@mirbsd.de> + with copyright assignment to the FSF in effect. + +Index: gcc-3.4.6/gcc/c-opts.c +=================================================================== +--- gcc-3.4.6.orig/gcc/c-opts.c 2005-03-09 02:00:56.000000000 +0100 ++++ gcc-3.4.6/gcc/c-opts.c 2007-07-30 23:36:53.376930075 +0200 +@@ -97,6 +97,9 @@ + /* Permit Fotran front-end options. */ + static bool permit_fortran_options; + ++/* Check if a port honours COPTS. */ ++static int honour_copts = 0; ++ + static void set_Wimplicit (int); + static void handle_OPT_d (const char *); + static void set_std_cxx98 (int); +@@ -452,6 +455,14 @@ + mesg_implicit_function_declaration = 2; + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ cpp_opts->warnings_are_errors = 0; ++ } ++ break; ++ + case OPT_Wfloat_equal: + warn_float_equal = value; + break; +@@ -821,6 +832,12 @@ + flag_exceptions = value; + break; + ++ case OPT_fhonour_copts: ++ if (c_language == clk_c) { ++ honour_copts++; ++ } ++ break; ++ + case OPT_fimplement_inlines: + flag_implement_inlines = value; + break; +@@ -1211,6 +1228,47 @@ + /* Has to wait until now so that cpplib has its hash table. */ + init_pragma (); + ++ if (c_language == clk_c) { ++ char *ev = getenv ("GCC_HONOUR_COPTS"); ++ int evv; ++ if (ev == NULL) ++ evv = 0; ++ else if ((*ev == '0') || (*ev == '\0')) ++ evv = 0; ++ else if (*ev == '1') ++ evv = 1; ++ else if (*ev == '2') ++ evv = 2; ++ else if (*ev == 's') ++ evv = -1; ++ else { ++ warning ("unknown GCC_HONOUR_COPTS value, assuming 1"); ++ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ ++ } ++ if (evv == 1) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in lenient mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ warning ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } else if (evv == 2) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in strict mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ error ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ return false; ++ } ++ } else if (evv == 0) { ++ if (honour_copts != 1) ++ inform ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } ++ + return true; + } + +Index: gcc-3.4.6/gcc/c.opt +=================================================================== +--- gcc-3.4.6.orig/gcc/c.opt 2005-03-19 21:30:38.000000000 +0100 ++++ gcc-3.4.6/gcc/c.opt 2007-07-30 23:36:53.380930305 +0200 +@@ -208,6 +208,10 @@ + C ObjC RejectNegative + Make implicit function declarations an error + ++Werror-maybe-reset ++C ObjC C++ ObjC++ ++; Documented in common.opt ++ + Wfloat-equal + C ObjC C++ ObjC++ + Warn if testing floating point numbers for equality +@@ -518,6 +522,9 @@ + fhonor-std + C++ ObjC++ + ++fhonour-copts ++C ObjC C++ ObjC++ RejectNegative ++ + fhosted + C ObjC + Assume normal C execution environment +Index: gcc-3.4.6/gcc/common.opt +=================================================================== +--- gcc-3.4.6.orig/gcc/common.opt 2004-10-28 05:43:09.000000000 +0200 ++++ gcc-3.4.6/gcc/common.opt 2007-07-30 23:36:53.396931215 +0200 +@@ -72,6 +72,10 @@ + Common + Treat all warnings as errors + ++Werror-maybe-reset ++Common ++If environment variable GCC_NO_WERROR is set, act as -Wno-error ++ + Wextra + Common + Print extra (possibly unwanted) warnings +@@ -373,6 +377,9 @@ + Common + Enable guessing of branch probabilities + ++fhonour-copts ++Common RejectNegative ++ + fident + Common + Process #ident directives +Index: gcc-3.4.6/gcc/opts.c +=================================================================== +--- gcc-3.4.6.orig/gcc/opts.c 2004-02-18 01:09:07.000000000 +0100 ++++ gcc-3.4.6/gcc/opts.c 2007-07-30 23:36:53.436933495 +0200 +@@ -560,8 +560,6 @@ + flag_schedule_insns_after_reload = 1; + #endif + flag_regmove = 1; +- flag_strict_aliasing = 1; +- flag_delete_null_pointer_checks = 1; + flag_reorder_blocks = 1; + flag_reorder_functions = 1; + flag_unit_at_a_time = 1; +@@ -569,6 +567,9 @@ + + if (optimize >= 3) + { ++ flag_strict_aliasing = 1; ++ flag_delete_null_pointer_checks = 1; ++ + flag_inline_functions = 1; + flag_rename_registers = 1; + flag_unswitch_loops = 1; +@@ -717,6 +718,14 @@ + warnings_are_errors = value; + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ warnings_are_errors = 0; ++ } ++ break; ++ + case OPT_Wextra: + set_Wextra (value); + break; +@@ -1040,6 +1049,9 @@ + flag_guess_branch_prob = value; + break; + ++ case OPT_fhonour_copts: ++ break; ++ + case OPT_fident: + flag_no_ident = !value; + break; +Index: gcc-3.4.6/gcc/doc/cppopts.texi +=================================================================== +--- gcc-3.4.6.orig/gcc/doc/cppopts.texi 2004-06-28 22:28:07.000000000 +0200 ++++ gcc-3.4.6/gcc/doc/cppopts.texi 2007-07-30 23:36:53.456934635 +0200 +@@ -167,6 +167,11 @@ + Make all warnings into hard errors. Source code which triggers warnings + will be rejected. + ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ + @item -Wsystem-headers + @opindex Wsystem-headers + Issue warnings for code in system headers. These are normally unhelpful +Index: gcc-3.4.6/gcc/doc/invoke.texi +=================================================================== +--- gcc-3.4.6.orig/gcc/doc/invoke.texi 2005-10-08 02:22:20.000000000 +0200 ++++ gcc-3.4.6/gcc/doc/invoke.texi 2007-07-30 23:36:53.464935090 +0200 +@@ -214,7 +214,7 @@ + -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol + -Wconversion -Wno-deprecated-declarations @gol + -Wdisabled-optimization -Wno-div-by-zero -Wendif-labels @gol +--Werror -Werror-implicit-function-declaration @gol ++-Werror -Werror-maybe-reset -Werror-implicit-function-declaration @gol + -Wfloat-equal -Wformat -Wformat=2 @gol + -Wno-format-extra-args -Wformat-nonliteral @gol + -Wformat-security -Wformat-y2k @gol +@@ -2989,6 +2989,22 @@ + @item -Werror + @opindex Werror + Make all warnings into errors. ++ ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ ++@item -fhonour-copts ++@opindex fhonour-copts ++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not ++given at least once, and warn if it is given more than once. ++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not ++given exactly once. ++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option ++is not given exactly once. ++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. ++This flag and environment variable only affect the C language. + @end table + + @node Debugging Options +@@ -3879,7 +3895,7 @@ + Perform the optimizations of loop strength reduction and + elimination of iteration variables. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fthread-jumps + @opindex fthread-jumps +@@ -4006,7 +4022,7 @@ + @option{-fno-delete-null-pointer-checks} to disable this optimization + for programs which depend on that behavior. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fexpensive-optimizations + @opindex fexpensive-optimizations +@@ -4250,7 +4266,7 @@ + allowed to alias. For an example, see the C front-end function + @code{c_get_alias_set}. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -falign-functions + @itemx -falign-functions=@var{n} +Index: gcc-3.4.6/gcc/java/jvspec.c +=================================================================== +--- gcc-3.4.6.orig/gcc/java/jvspec.c 2003-10-05 04:52:33.000000000 +0200 ++++ gcc-3.4.6/gcc/java/jvspec.c 2007-07-30 23:36:53.496936915 +0200 +@@ -609,6 +609,7 @@ + class name. Append dummy `.c' that can be stripped by set_input so %b + is correct. */ + set_input (concat (main_class_name, "main.c", NULL)); ++ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ + err = do_spec (jvgenmain_spec); + if (err == 0) + { diff --git a/toolchain/gcc/patches/4.1.2/910-mbsd_multi.patch b/toolchain/gcc/patches/4.1.2/910-mbsd_multi.patch new file mode 100644 index 0000000000..5d06f80c6c --- /dev/null +++ b/toolchain/gcc/patches/4.1.2/910-mbsd_multi.patch @@ -0,0 +1,291 @@ + + This patch brings over a few features from MirBSD: + * -fhonour-copts + If this option is not given, it's warned (depending + on environment variables). This is to catch errors + of misbuilt packages which override CFLAGS themselves. + * -Werror-maybe-reset + Has the effect of -Wno-error if GCC_NO_WERROR is + set and not '0', a no-operation otherwise. This is + to be able to use -Werror in "make" but prevent + GNU autoconf generated configure scripts from + freaking out. + * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks + the default for -O2/-Os, because they trigger gcc bugs + and can delete code with security implications. + + This patch was authored by Thorsten Glaser <tg@mirbsd.de> + with copyright assignment to the FSF in effect. + +Index: gcc-4.1.2/gcc/c-opts.c +=================================================================== +--- gcc-4.1.2.orig/gcc/c-opts.c 2007-07-31 01:14:52.799979303 +0200 ++++ gcc-4.1.2/gcc/c-opts.c 2007-07-31 01:17:10.535828420 +0200 +@@ -103,6 +103,9 @@ + /* Number of deferred options scanned for -include. */ + static size_t include_cursor; + ++/* Check if a port honours COPTS. */ ++static int honour_copts = 0; ++ + static void set_Wimplicit (int); + static void handle_OPT_d (const char *); + static void set_std_cxx98 (int); +@@ -448,6 +451,14 @@ + mesg_implicit_function_declaration = 2; + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ cpp_opts->warnings_are_errors = 0; ++ } ++ break; ++ + case OPT_Wformat: + set_Wformat (value); + break; +@@ -691,6 +702,12 @@ + flag_exceptions = value; + break; + ++ case OPT_fhonour_copts: ++ if (c_language == clk_c) { ++ honour_copts++; ++ } ++ break; ++ + case OPT_fimplement_inlines: + flag_implement_inlines = value; + break; +@@ -1121,6 +1138,47 @@ + /* Has to wait until now so that cpplib has its hash table. */ + init_pragma (); + ++ if (c_language == clk_c) { ++ char *ev = getenv ("GCC_HONOUR_COPTS"); ++ int evv; ++ if (ev == NULL) ++ evv = 0; ++ else if ((*ev == '0') || (*ev == '\0')) ++ evv = 0; ++ else if (*ev == '1') ++ evv = 1; ++ else if (*ev == '2') ++ evv = 2; ++ else if (*ev == 's') ++ evv = -1; ++ else { ++ warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1"); ++ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ ++ } ++ if (evv == 1) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in lenient mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ warning (0, "someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } else if (evv == 2) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in strict mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ error ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ return false; ++ } ++ } else if (evv == 0) { ++ if (honour_copts != 1) ++ inform ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } ++ + return true; + } + +Index: gcc-4.1.2/gcc/c.opt +=================================================================== +--- gcc-4.1.2.orig/gcc/c.opt 2007-07-31 01:14:52.807979755 +0200 ++++ gcc-4.1.2/gcc/c.opt 2007-07-31 01:15:32.270228583 +0200 +@@ -185,6 +185,10 @@ + C ObjC RejectNegative + Make implicit function declarations an error + ++Werror-maybe-reset ++C ObjC C++ ObjC++ ++; Documented in common.opt ++ + Wfloat-equal + C ObjC C++ ObjC++ Var(warn_float_equal) + Warn if testing floating point numbers for equality +@@ -541,6 +545,9 @@ + fhonor-std + C++ ObjC++ + ++fhonour-copts ++C ObjC C++ ObjC++ RejectNegative ++ + fhosted + C ObjC + Assume normal C execution environment +Index: gcc-4.1.2/gcc/common.opt +=================================================================== +--- gcc-4.1.2.orig/gcc/common.opt 2007-07-31 01:14:52.815980213 +0200 ++++ gcc-4.1.2/gcc/common.opt 2007-07-31 01:17:41.997621326 +0200 +@@ -77,6 +77,10 @@ + Common Var(warnings_are_errors) + Treat all warnings as errors + ++Werror-maybe-reset ++Common ++If environment variable GCC_NO_WERROR is set, act as -Wno-error ++ + Wextra + Common + Print extra (possibly unwanted) warnings +@@ -451,6 +455,9 @@ + Common Report Var(flag_guess_branch_prob) + Enable guessing of branch probabilities + ++fhonour-copts ++Common RejectNegative ++ + ; Nonzero means ignore `#ident' directives. 0 means handle them. + ; Generate position-independent code for executables if possible + ; On SVR4 targets, it also controls whether or not to emit a +Index: gcc-4.1.2/gcc/opts.c +=================================================================== +--- gcc-4.1.2.orig/gcc/opts.c 2007-07-31 01:14:52.823980670 +0200 ++++ gcc-4.1.2/gcc/opts.c 2007-07-31 01:18:38.152821428 +0200 +@@ -569,8 +569,6 @@ + flag_schedule_insns_after_reload = 1; + #endif + flag_regmove = 1; +- flag_strict_aliasing = 1; +- flag_delete_null_pointer_checks = 1; + flag_reorder_blocks = 1; + flag_reorder_functions = 1; + flag_tree_store_ccp = 1; +@@ -586,6 +584,9 @@ + + if (optimize >= 3) + { ++ flag_strict_aliasing = 1; ++ flag_delete_null_pointer_checks = 1; ++ + flag_inline_functions = 1; + flag_unswitch_loops = 1; + flag_gcse_after_reload = 1; +@@ -759,6 +760,17 @@ + set_Wextra (value); + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ warnings_are_errors = 0; ++ } ++ break; ++ ++ case OPT_fhonour_copts: ++ break; ++ + case OPT_Wextra: + set_Wextra (value); + break; +Index: gcc-4.1.2/gcc/doc/cppopts.texi +=================================================================== +--- gcc-4.1.2.orig/gcc/doc/cppopts.texi 2007-07-31 01:14:52.827980895 +0200 ++++ gcc-4.1.2/gcc/doc/cppopts.texi 2007-07-31 01:15:32.362233824 +0200 +@@ -166,6 +166,11 @@ + Make all warnings into hard errors. Source code which triggers warnings + will be rejected. + ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ + @item -Wsystem-headers + @opindex Wsystem-headers + Issue warnings for code in system headers. These are normally unhelpful +Index: gcc-4.1.2/gcc/doc/invoke.texi +=================================================================== +--- gcc-4.1.2.orig/gcc/doc/invoke.texi 2007-07-31 01:14:59.592366375 +0200 ++++ gcc-4.1.2/gcc/doc/invoke.texi 2007-07-31 01:16:22.569094954 +0200 +@@ -222,7 +222,7 @@ + -Wc++-compat -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol + -Wconversion -Wno-deprecated-declarations @gol + -Wdisabled-optimization -Wno-div-by-zero -Wno-endif-labels @gol +--Werror -Werror-implicit-function-declaration @gol ++-Werror -Werror-maybe-reset -Werror-implicit-function-declaration @gol + -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol + -Wno-format-extra-args -Wformat-nonliteral @gol + -Wformat-security -Wformat-y2k @gol +@@ -3390,6 +3390,22 @@ + @opindex Werror + Make all warnings into errors. + ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ ++@item -fhonour-copts ++@opindex fhonour-copts ++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not ++given at least once, and warn if it is given more than once. ++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not ++given exactly once. ++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option ++is not given exactly once. ++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. ++This flag and environment variable only affect the C language. ++ + @item -Wstack-protector + This option is only active when @option{-fstack-protector} is active. It + warns about functions that will not be protected against stack smashing. +@@ -4679,7 +4695,7 @@ + Perform the optimizations of loop strength reduction and + elimination of iteration variables. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fthread-jumps + @opindex fthread-jumps +@@ -4826,7 +4842,7 @@ + @option{-fno-delete-null-pointer-checks} to disable this optimization + for programs which depend on that behavior. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fexpensive-optimizations + @opindex fexpensive-optimizations +@@ -5234,7 +5250,7 @@ + allowed to alias. For an example, see the C front-end function + @code{c_get_alias_set}. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -falign-functions + @itemx -falign-functions=@var{n} +Index: gcc-4.1.2/gcc/java/jvspec.c +=================================================================== +--- gcc-4.1.2.orig/gcc/java/jvspec.c 2007-07-31 01:14:52.847982035 +0200 ++++ gcc-4.1.2/gcc/java/jvspec.c 2007-07-31 01:15:32.454239068 +0200 +@@ -620,6 +620,7 @@ + class name. Append dummy `.c' that can be stripped by set_input so %b + is correct. */ + set_input (concat (main_class_name, "main.c", NULL)); ++ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ + err = do_spec (jvgenmain_spec); + if (err == 0) + { diff --git a/toolchain/gcc/patches/4.2.0/910-mbsd_multi.patch b/toolchain/gcc/patches/4.2.0/910-mbsd_multi.patch new file mode 100644 index 0000000000..439d0762f1 --- /dev/null +++ b/toolchain/gcc/patches/4.2.0/910-mbsd_multi.patch @@ -0,0 +1,293 @@ + + This patch brings over a few features from MirBSD: + * -fhonour-copts + If this option is not given, it's warned (depending + on environment variables). This is to catch errors + of misbuilt packages which override CFLAGS themselves. + * -Werror-maybe-reset + Has the effect of -Wno-error if GCC_NO_WERROR is + set and not '0', a no-operation otherwise. This is + to be able to use -Werror in "make" but prevent + GNU autoconf generated configure scripts from + freaking out. + * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks + the default for -O2/-Os, because they trigger gcc bugs + and can delete code with security implications. + + This patch was authored by Thorsten Glaser <tg@mirbsd.de> + with copyright assignment to the FSF in effect. + +Index: gcc-4.2.0/gcc/c-opts.c +=================================================================== +--- gcc-4.2.0.orig/gcc/c-opts.c 2007-07-31 02:27:12.007256629 +0200 ++++ gcc-4.2.0/gcc/c-opts.c 2007-07-31 02:27:39.324813371 +0200 +@@ -107,6 +107,9 @@ + /* Number of deferred options scanned for -include. */ + static size_t include_cursor; + ++/* Check if a port honours COPTS. */ ++static int honour_copts = 0; ++ + static void set_Wimplicit (int); + static void handle_OPT_d (const char *); + static void set_std_cxx98 (int); +@@ -449,6 +452,14 @@ + mesg_implicit_function_declaration = 2; + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ cpp_opts->warnings_are_errors = 0; ++ } ++ break; ++ + case OPT_Wformat: + set_Wformat (value); + break; +@@ -691,6 +702,12 @@ + flag_exceptions = value; + break; + ++ case OPT_fhonour_copts: ++ if (c_language == clk_c) { ++ honour_copts++; ++ } ++ break; ++ + case OPT_fimplement_inlines: + flag_implement_inlines = value; + break; +@@ -1151,6 +1168,47 @@ + /* Has to wait until now so that cpplib has its hash table. */ + init_pragma (); + ++ if (c_language == clk_c) { ++ char *ev = getenv ("GCC_HONOUR_COPTS"); ++ int evv; ++ if (ev == NULL) ++ evv = 0; ++ else if ((*ev == '0') || (*ev == '\0')) ++ evv = 0; ++ else if (*ev == '1') ++ evv = 1; ++ else if (*ev == '2') ++ evv = 2; ++ else if (*ev == 's') ++ evv = -1; ++ else { ++ warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1"); ++ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ ++ } ++ if (evv == 1) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in lenient mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ warning (0, "someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } else if (evv == 2) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in strict mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ error ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ return false; ++ } ++ } else if (evv == 0) { ++ if (honour_copts != 1) ++ inform ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } ++ + return true; + } + +Index: gcc-4.2.0/gcc/c.opt +=================================================================== +--- gcc-4.2.0.orig/gcc/c.opt 2007-07-31 02:27:12.015257093 +0200 ++++ gcc-4.2.0/gcc/c.opt 2007-07-31 02:27:39.328813597 +0200 +@@ -189,6 +189,10 @@ + C ObjC RejectNegative + Make implicit function declarations an error + ++Werror-maybe-reset ++C ObjC C++ ObjC++ ++; Documented in common.opt ++ + Wfloat-equal + C ObjC C++ ObjC++ Var(warn_float_equal) + Warn if testing floating point numbers for equality +@@ -544,6 +548,9 @@ + fhonor-std + C++ ObjC++ + ++fhonour-copts ++C ObjC C++ ObjC++ RejectNegative ++ + fhosted + C ObjC + Assume normal C execution environment +Index: gcc-4.2.0/gcc/common.opt +=================================================================== +--- gcc-4.2.0.orig/gcc/common.opt 2007-07-31 02:27:12.023257546 +0200 ++++ gcc-4.2.0/gcc/common.opt 2007-07-31 02:27:39.360815422 +0200 +@@ -81,6 +81,10 @@ + Common Joined + Treat specified warning as error + ++Werror-maybe-reset ++Common ++If environment variable GCC_NO_WERROR is set, act as -Wno-error ++ + Wextra + Common + Print extra (possibly unwanted) warnings +@@ -481,6 +485,9 @@ + Common Report Var(flag_guess_branch_prob) + Enable guessing of branch probabilities + ++fhonour-copts ++Common RejectNegative ++ + ; Nonzero means ignore `#ident' directives. 0 means handle them. + ; Generate position-independent code for executables if possible + ; On SVR4 targets, it also controls whether or not to emit a +Index: gcc-4.2.0/gcc/opts.c +=================================================================== +--- gcc-4.2.0.orig/gcc/opts.c 2007-07-31 02:27:12.031257991 +0200 ++++ gcc-4.2.0/gcc/opts.c 2007-07-31 02:28:36.320061346 +0200 +@@ -492,9 +492,6 @@ + flag_schedule_insns_after_reload = 1; + #endif + flag_regmove = 1; +- flag_strict_aliasing = 1; +- flag_strict_overflow = 1; +- flag_delete_null_pointer_checks = 1; + flag_reorder_blocks = 1; + flag_reorder_functions = 1; + flag_tree_store_ccp = 1; +@@ -510,6 +507,10 @@ + + if (optimize >= 3) + { ++ flag_strict_aliasing = 1; ++ flag_strict_overflow = 1; ++ flag_delete_null_pointer_checks = 1; ++ + flag_inline_functions = 1; + flag_unswitch_loops = 1; + flag_gcse_after_reload = 1; +@@ -711,6 +712,17 @@ + } + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ warnings_are_errors = 0; ++ } ++ break; ++ ++ case OPT_fhonour_copts: ++ break; ++ + case OPT_Wextra: + set_Wextra (value); + break; +Index: gcc-4.2.0/gcc/doc/cppopts.texi +=================================================================== +--- gcc-4.2.0.orig/gcc/doc/cppopts.texi 2007-07-31 02:27:12.039258455 +0200 ++++ gcc-4.2.0/gcc/doc/cppopts.texi 2007-07-31 02:27:39.408818157 +0200 +@@ -166,6 +166,11 @@ + Make all warnings into hard errors. Source code which triggers warnings + will be rejected. + ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ + @item -Wsystem-headers + @opindex Wsystem-headers + Issue warnings for code in system headers. These are normally unhelpful +Index: gcc-4.2.0/gcc/doc/invoke.texi +=================================================================== +--- gcc-4.2.0.orig/gcc/doc/invoke.texi 2007-07-31 02:27:12.047258920 +0200 ++++ gcc-4.2.0/gcc/doc/invoke.texi 2007-07-31 02:29:13.218164047 +0200 +@@ -226,7 +226,7 @@ + -Wc++-compat -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol + -Wconversion -Wno-deprecated-declarations @gol + -Wdisabled-optimization -Wno-div-by-zero -Wno-endif-labels @gol +--Werror -Werror=* -Werror-implicit-function-declaration @gol ++-Werror -Werror-maybe-reset -Werror=* -Werror-implicit-function-declaration @gol + -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol + -Wno-format-extra-args -Wformat-nonliteral @gol + -Wformat-security -Wformat-y2k @gol +@@ -3569,6 +3569,22 @@ + @option{-W}@var{foo}. However, @option{-Wno-error=}@var{foo} does not + imply anything. + ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ ++@item -fhonour-copts ++@opindex fhonour-copts ++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not ++given at least once, and warn if it is given more than once. ++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not ++given exactly once. ++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option ++is not given exactly once. ++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. ++This flag and environment variable only affect the C language. ++ + @item -Wstack-protector + @opindex Wstack-protector + This option is only active when @option{-fstack-protector} is active. It +@@ -4901,7 +4917,7 @@ + second branch or a point immediately following it, depending on whether + the condition is known to be true or false. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fcse-follow-jumps + @opindex fcse-follow-jumps +@@ -5019,7 +5035,7 @@ + @option{-fno-delete-null-pointer-checks} to disable this optimization + for programs which depend on that behavior. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fexpensive-optimizations + @opindex fexpensive-optimizations +@@ -5437,7 +5453,7 @@ + allowed to alias. For an example, see the C front-end function + @code{c_get_alias_set}. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fstrict-overflow + @opindex fstrict-overflow +Index: gcc-4.2.0/gcc/java/jvspec.c +=================================================================== +--- gcc-4.2.0.orig/gcc/java/jvspec.c 2007-07-31 02:27:12.055259364 +0200 ++++ gcc-4.2.0/gcc/java/jvspec.c 2007-07-31 02:27:39.484822490 +0200 +@@ -632,6 +632,7 @@ + class name. Append dummy `.c' that can be stripped by set_input so %b + is correct. */ + set_input (concat (main_class_name, "main.c", NULL)); ++ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ + err = do_spec (jvgenmain_spec); + if (err == 0) + { diff --git a/toolchain/gcc/patches/4.2.1/910-mbsd_multi.patch b/toolchain/gcc/patches/4.2.1/910-mbsd_multi.patch new file mode 100644 index 0000000000..439d0762f1 --- /dev/null +++ b/toolchain/gcc/patches/4.2.1/910-mbsd_multi.patch @@ -0,0 +1,293 @@ + + This patch brings over a few features from MirBSD: + * -fhonour-copts + If this option is not given, it's warned (depending + on environment variables). This is to catch errors + of misbuilt packages which override CFLAGS themselves. + * -Werror-maybe-reset + Has the effect of -Wno-error if GCC_NO_WERROR is + set and not '0', a no-operation otherwise. This is + to be able to use -Werror in "make" but prevent + GNU autoconf generated configure scripts from + freaking out. + * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks + the default for -O2/-Os, because they trigger gcc bugs + and can delete code with security implications. + + This patch was authored by Thorsten Glaser <tg@mirbsd.de> + with copyright assignment to the FSF in effect. + +Index: gcc-4.2.0/gcc/c-opts.c +=================================================================== +--- gcc-4.2.0.orig/gcc/c-opts.c 2007-07-31 02:27:12.007256629 +0200 ++++ gcc-4.2.0/gcc/c-opts.c 2007-07-31 02:27:39.324813371 +0200 +@@ -107,6 +107,9 @@ + /* Number of deferred options scanned for -include. */ + static size_t include_cursor; + ++/* Check if a port honours COPTS. */ ++static int honour_copts = 0; ++ + static void set_Wimplicit (int); + static void handle_OPT_d (const char *); + static void set_std_cxx98 (int); +@@ -449,6 +452,14 @@ + mesg_implicit_function_declaration = 2; + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ cpp_opts->warnings_are_errors = 0; ++ } ++ break; ++ + case OPT_Wformat: + set_Wformat (value); + break; +@@ -691,6 +702,12 @@ + flag_exceptions = value; + break; + ++ case OPT_fhonour_copts: ++ if (c_language == clk_c) { ++ honour_copts++; ++ } ++ break; ++ + case OPT_fimplement_inlines: + flag_implement_inlines = value; + break; +@@ -1151,6 +1168,47 @@ + /* Has to wait until now so that cpplib has its hash table. */ + init_pragma (); + ++ if (c_language == clk_c) { ++ char *ev = getenv ("GCC_HONOUR_COPTS"); ++ int evv; ++ if (ev == NULL) ++ evv = 0; ++ else if ((*ev == '0') || (*ev == '\0')) ++ evv = 0; ++ else if (*ev == '1') ++ evv = 1; ++ else if (*ev == '2') ++ evv = 2; ++ else if (*ev == 's') ++ evv = -1; ++ else { ++ warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1"); ++ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ ++ } ++ if (evv == 1) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in lenient mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ warning (0, "someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } else if (evv == 2) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in strict mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ error ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ return false; ++ } ++ } else if (evv == 0) { ++ if (honour_copts != 1) ++ inform ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } ++ + return true; + } + +Index: gcc-4.2.0/gcc/c.opt +=================================================================== +--- gcc-4.2.0.orig/gcc/c.opt 2007-07-31 02:27:12.015257093 +0200 ++++ gcc-4.2.0/gcc/c.opt 2007-07-31 02:27:39.328813597 +0200 +@@ -189,6 +189,10 @@ + C ObjC RejectNegative + Make implicit function declarations an error + ++Werror-maybe-reset ++C ObjC C++ ObjC++ ++; Documented in common.opt ++ + Wfloat-equal + C ObjC C++ ObjC++ Var(warn_float_equal) + Warn if testing floating point numbers for equality +@@ -544,6 +548,9 @@ + fhonor-std + C++ ObjC++ + ++fhonour-copts ++C ObjC C++ ObjC++ RejectNegative ++ + fhosted + C ObjC + Assume normal C execution environment +Index: gcc-4.2.0/gcc/common.opt +=================================================================== +--- gcc-4.2.0.orig/gcc/common.opt 2007-07-31 02:27:12.023257546 +0200 ++++ gcc-4.2.0/gcc/common.opt 2007-07-31 02:27:39.360815422 +0200 +@@ -81,6 +81,10 @@ + Common Joined + Treat specified warning as error + ++Werror-maybe-reset ++Common ++If environment variable GCC_NO_WERROR is set, act as -Wno-error ++ + Wextra + Common + Print extra (possibly unwanted) warnings +@@ -481,6 +485,9 @@ + Common Report Var(flag_guess_branch_prob) + Enable guessing of branch probabilities + ++fhonour-copts ++Common RejectNegative ++ + ; Nonzero means ignore `#ident' directives. 0 means handle them. + ; Generate position-independent code for executables if possible + ; On SVR4 targets, it also controls whether or not to emit a +Index: gcc-4.2.0/gcc/opts.c +=================================================================== +--- gcc-4.2.0.orig/gcc/opts.c 2007-07-31 02:27:12.031257991 +0200 ++++ gcc-4.2.0/gcc/opts.c 2007-07-31 02:28:36.320061346 +0200 +@@ -492,9 +492,6 @@ + flag_schedule_insns_after_reload = 1; + #endif + flag_regmove = 1; +- flag_strict_aliasing = 1; +- flag_strict_overflow = 1; +- flag_delete_null_pointer_checks = 1; + flag_reorder_blocks = 1; + flag_reorder_functions = 1; + flag_tree_store_ccp = 1; +@@ -510,6 +507,10 @@ + + if (optimize >= 3) + { ++ flag_strict_aliasing = 1; ++ flag_strict_overflow = 1; ++ flag_delete_null_pointer_checks = 1; ++ + flag_inline_functions = 1; + flag_unswitch_loops = 1; + flag_gcse_after_reload = 1; +@@ -711,6 +712,17 @@ + } + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ warnings_are_errors = 0; ++ } ++ break; ++ ++ case OPT_fhonour_copts: ++ break; ++ + case OPT_Wextra: + set_Wextra (value); + break; +Index: gcc-4.2.0/gcc/doc/cppopts.texi +=================================================================== +--- gcc-4.2.0.orig/gcc/doc/cppopts.texi 2007-07-31 02:27:12.039258455 +0200 ++++ gcc-4.2.0/gcc/doc/cppopts.texi 2007-07-31 02:27:39.408818157 +0200 +@@ -166,6 +166,11 @@ + Make all warnings into hard errors. Source code which triggers warnings + will be rejected. + ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ + @item -Wsystem-headers + @opindex Wsystem-headers + Issue warnings for code in system headers. These are normally unhelpful +Index: gcc-4.2.0/gcc/doc/invoke.texi +=================================================================== +--- gcc-4.2.0.orig/gcc/doc/invoke.texi 2007-07-31 02:27:12.047258920 +0200 ++++ gcc-4.2.0/gcc/doc/invoke.texi 2007-07-31 02:29:13.218164047 +0200 +@@ -226,7 +226,7 @@ + -Wc++-compat -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol + -Wconversion -Wno-deprecated-declarations @gol + -Wdisabled-optimization -Wno-div-by-zero -Wno-endif-labels @gol +--Werror -Werror=* -Werror-implicit-function-declaration @gol ++-Werror -Werror-maybe-reset -Werror=* -Werror-implicit-function-declaration @gol + -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol + -Wno-format-extra-args -Wformat-nonliteral @gol + -Wformat-security -Wformat-y2k @gol +@@ -3569,6 +3569,22 @@ + @option{-W}@var{foo}. However, @option{-Wno-error=}@var{foo} does not + imply anything. + ++@item -Werror-maybe-reset ++@opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ ++@item -fhonour-copts ++@opindex fhonour-copts ++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not ++given at least once, and warn if it is given more than once. ++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not ++given exactly once. ++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option ++is not given exactly once. ++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. ++This flag and environment variable only affect the C language. ++ + @item -Wstack-protector + @opindex Wstack-protector + This option is only active when @option{-fstack-protector} is active. It +@@ -4901,7 +4917,7 @@ + second branch or a point immediately following it, depending on whether + the condition is known to be true or false. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fcse-follow-jumps + @opindex fcse-follow-jumps +@@ -5019,7 +5035,7 @@ + @option{-fno-delete-null-pointer-checks} to disable this optimization + for programs which depend on that behavior. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fexpensive-optimizations + @opindex fexpensive-optimizations +@@ -5437,7 +5453,7 @@ + allowed to alias. For an example, see the C front-end function + @code{c_get_alias_set}. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fstrict-overflow + @opindex fstrict-overflow +Index: gcc-4.2.0/gcc/java/jvspec.c +=================================================================== +--- gcc-4.2.0.orig/gcc/java/jvspec.c 2007-07-31 02:27:12.055259364 +0200 ++++ gcc-4.2.0/gcc/java/jvspec.c 2007-07-31 02:27:39.484822490 +0200 +@@ -632,6 +632,7 @@ + class name. Append dummy `.c' that can be stripped by set_input so %b + is correct. */ + set_input (concat (main_class_name, "main.c", NULL)); ++ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ + err = do_spec (jvgenmain_spec); + if (err == 0) + { |