You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
299 lines
9.0 KiB
Diff
299 lines
9.0 KiB
Diff
|
|
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 = -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 ("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)
|
|
{
|