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 with copyright assignment to the FSF in effect. --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -108,6 +108,9 @@ static size_t deferred_count; /* 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); @@ -462,6 +465,14 @@ c_common_handle_option (size_t scode, co enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); 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; @@ -708,6 +719,12 @@ c_common_handle_option (size_t scode, co 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; @@ -1248,6 +1265,47 @@ c_common_init (void) /* 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 (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; } --- a/gcc/c.opt +++ b/gcc/c.opt @@ -207,6 +207,10 @@ Werror-implicit-function-declaration 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 @@ -590,6 +594,9 @@ C++ ObjC++ Optimization 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 @@ Werror= 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 @@ -528,6 +532,9 @@ fguess-branch-probability 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 @@ -830,9 +830,6 @@ decode_options (unsigned int argc, const 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; @@ -853,6 +850,10 @@ decode_options (unsigned int argc, const if (optimize >= 3) { + flag_strict_aliasing = 1; + flag_strict_overflow = 1; + flag_delete_null_pointer_checks = 1; + flag_predictive_commoning = 1; flag_inline_functions = 1; flag_unswitch_loops = 1; @@ -1444,6 +1445,17 @@ common_handle_option (size_t scode, cons enable_warning_as_error (arg, value, lang_mask); break; + case OPT_Werror_maybe_reset: + {
From: Alexey Brodkin <abrodkin@synopsys.com>
Subject: arc: enable unaligned access in kernel mode

This enables misaligned access handling even in kernel mode.
Some wireless drivers (ath9k-htc and mt7601u) use misaligned accesses
here and there and to cope with that without fixing stuff in the drivers
we're just gracefully handling it on ARC.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
---
 arch/arc/kernel/unaligned.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arc/kernel/unaligned.c
+++ b/arch/arc/kernel/unaligned.c
@@ -206,7 +206,7 @@ int misaligned_fixup(unsigned long addre
 	char buf[TASK_COMM_LEN];
 
 	/* handle user mode only and only if enabled by sysadmin */
-	if (!user_mode(regs) || !unaligned_enabled)
+	if (!unaligned_enabled)
 		return 1;
 
 	if (no_unaligned_warning) {