|
|
@@ -0,0 +1,253 @@
|
|
|
+
|
|
|
+ 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 at mirbsd.de>
|
|
|
+ with copyright assignment to the FSF in effect.
|
|
|
+
|
|
|
+--- a/gcc/c-opts.c
|
|
|
++++ b/gcc/c-opts.c
|
|
|
+@@ -105,6 +105,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);
|
|
|
+@@ -454,6 +457,9 @@
|
|
|
+ enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC);
|
|
|
+ break;
|
|
|
+
|
|
|
++ case OPT_Werror_maybe_reset:
|
|
|
++ break;
|
|
|
++
|
|
|
+ case OPT_Wformat:
|
|
|
+ set_Wformat (value);
|
|
|
+ break;
|
|
|
+@@ -690,6 +701,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;
|
|
|
+@@ -1209,6 +1226,47 @@
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
++ if (c_language == clk_c) {
|
|
|
++ char *ev = getenv ("GCC_HONOUR_COPTS");
|
|
|
++ int evv;
|
|
|
++ if (ev == NULL)
|
|
|
++ evv = -1;
|
|
|
++ 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 (0, "someone does not honour COPTS correctly, passed %d times",
|
|
|
++ honour_copts);
|
|
|
++ }
|
|
|
++ }
|
|
|
++
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+--- a/gcc/c.opt
|
|
|
++++ b/gcc/c.opt
|
|
|
+@@ -215,6 +215,10 @@
|
|
|
+ C ObjC RejectNegative Warning
|
|
|
+ This switch is deprecated; use -Werror=implicit-function-declaration instead
|
|
|
+
|
|
|
++Werror-maybe-reset
|
|
|
++C ObjC C++ ObjC++
|
|
|
++; Documented in common.opt
|
|
|
++
|
|
|
+ Wfloat-equal
|
|
|
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
|
|
|
+ Warn if testing floating point numbers for equality
|
|
|
+@@ -609,6 +613,9 @@
|
|
|
+ fhonor-std
|
|
|
+ C++ ObjC++
|
|
|
+
|
|
|
++fhonour-copts
|
|
|
++C ObjC C++ ObjC++ RejectNegative
|
|
|
++
|
|
|
+ fhosted
|
|
|
+ C ObjC
|
|
|
+ Assume normal C execution environment
|
|
|
+--- a/gcc/common.opt
|
|
|
++++ b/gcc/common.opt
|
|
|
+@@ -102,6 +102,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 Warning
|
|
|
+ Print extra (possibly unwanted) warnings
|
|
|
+@@ -573,6 +577,9 @@
|
|
|
+ Common Report Var(flag_guess_branch_prob) Optimization
|
|
|
+ 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
|
|
|
+--- a/gcc/opts.c
|
|
|
++++ b/gcc/opts.c
|
|
|
+@@ -896,8 +896,6 @@
|
|
|
+ flag_schedule_insns_after_reload = opt2;
|
|
|
+ #endif
|
|
|
+ flag_regmove = opt2;
|
|
|
+- flag_strict_aliasing = opt2;
|
|
|
+- flag_strict_overflow = opt2;
|
|
|
+ flag_reorder_blocks = opt2;
|
|
|
+ flag_reorder_functions = opt2;
|
|
|
+ flag_tree_vrp = opt2;
|
|
|
+@@ -922,6 +919,8 @@
|
|
|
+
|
|
|
+ /* -O3 optimizations. */
|
|
|
+ opt3 = (optimize >= 3);
|
|
|
++ flag_strict_aliasing = opt3;
|
|
|
++ flag_strict_overflow = opt3;
|
|
|
+ flag_predictive_commoning = opt3;
|
|
|
+ flag_inline_functions = opt3;
|
|
|
+ flag_unswitch_loops = opt3;
|
|
|
+@@ -1601,6 +1601,17 @@
|
|
|
+ enable_warning_as_error (arg, value, lang_mask);
|
|
|
+ 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_Wlarger_than_:
|
|
|
+ /* This form corresponds to -Wlarger-than-.
|
|
|
+ Kept for backward compatibility.
|
|
|
+--- a/gcc/doc/cppopts.texi
|
|
|
++++ b/gcc/doc/cppopts.texi
|
|
|
+@@ -164,6 +164,11 @@
|
|
|
+ Make all warnings into hard errors. Source code which triggers warnings
|
|
|
+ will be rejected.
|
|
|
+
|
|
|
++ at item -Werror-maybe-reset
|
|
|
++ at 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
|
|
|
+--- a/gcc/doc/invoke.texi
|
|
|
++++ b/gcc/doc/invoke.texi
|
|
|
+@@ -234,7 +234,7 @@
|
|
|
+ -Wconversion -Wcoverage-mismatch -Wno-deprecated @gol
|
|
|
+ -Wno-deprecated-declarations -Wdisabled-optimization @gol
|
|
|
+ -Wno-div-by-zero -Wempty-body -Wenum-compare -Wno-endif-labels @gol
|
|
|
+--Werror -Werror=* @gol
|
|
|
++-Werror -Werror=* -Werror-maybe-reset @gol
|
|
|
+ -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol
|
|
|
+ -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
|
|
|
+ -Wformat-security -Wformat-y2k @gol
|
|
|
+@@ -4161,6 +4161,22 @@
|
|
|
+ @option{-Wall} and by @option{-pedantic}, which can be disabled with
|
|
|
+ @option{-Wno-pointer-sign}.
|
|
|
+
|
|
|
++ at item -Werror-maybe-reset
|
|
|
++ at 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.
|
|
|
++
|
|
|
++ at item -fhonour-copts
|
|
|
++ at 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
|
|
|
+ @opindex Wno-stack-protector
|
|
|
+@@ -5699,7 +5715,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 -fsplit-wide-types
|
|
|
+ @opindex fsplit-wide-types
|
|
|
+--- a/gcc/java/jvspec.c
|
|
|
++++ b/gcc/java/jvspec.c
|
|
|
+@@ -670,6 +670,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)
|
|
|
+ {
|
Waldemar Brodkorb