1 commit 99368862e44740ff4fd33760893f04e14f9dbdf1
2 Author: Felix Fietkau <nbd@openwrt.org>
3 Date: Tue Jul 31 00:52:27 2007 +0000
5 Port the mbsd_multi patch from freewrt, which adds -fhonour-copts. This will emit warnings in packages that don't use our target cflags properly
9 This patch brings over a feature from MirBSD:
11 If this option is not given, it's warned (depending
12 on environment variables). This is to catch errors
13 of misbuilt packages which override CFLAGS themselves.
15 This patch was authored by Thorsten Glaser <tg at mirbsd.de>
16 with copyright assignment to the FSF in effect.
18 --- a/gcc/c-family/c-opts.cc
19 +++ b/gcc/c-family/c-opts.cc
20 @@ -104,6 +104,9 @@ static size_t include_cursor;
21 /* Whether any standard preincluded header has been preincluded. */
22 static bool done_preinclude;
24 +/* Check if a port honours COPTS. */
25 +static int honour_copts = 0;
27 static void handle_OPT_d (const char *);
28 static void set_std_cxx98 (int);
29 static void set_std_cxx11 (int);
30 @@ -475,6 +478,12 @@ c_common_handle_option (size_t scode, co
31 flag_no_builtin = !value;
34 + case OPT_fhonour_copts:
35 + if (c_language == clk_c) {
40 case OPT_fconstant_string_class_:
41 constant_string_class_name = arg;
43 @@ -1228,6 +1237,47 @@ c_common_init (void)
47 + if (c_language == clk_c) {
48 + char *ev = getenv ("GCC_HONOUR_COPTS");
52 + else if ((*ev == '0') || (*ev == '\0'))
54 + else if (*ev == '1')
56 + else if (*ev == '2')
58 + else if (*ev == 's')
61 + warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
62 + evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */
65 + if (honour_copts == 0) {
66 + error ("someone does not honour COPTS at all in lenient mode");
68 + } else if (honour_copts != 1) {
69 + warning (0, "someone does not honour COPTS correctly, passed %d times",
72 + } else if (evv == 2) {
73 + if (honour_copts == 0) {
74 + error ("someone does not honour COPTS at all in strict mode");
76 + } else if (honour_copts != 1) {
77 + error ("someone does not honour COPTS correctly, passed %d times",
81 + } else if (evv == 0) {
82 + if (honour_copts != 1)
83 + inform (UNKNOWN_LOCATION, "someone does not honour COPTS correctly, passed %d times",
91 --- a/gcc/c-family/c.opt
92 +++ b/gcc/c-family/c.opt
93 @@ -1837,6 +1837,9 @@ C++ ObjC++ Optimization Alias(fexception
95 C++ ObjC++ WarnRemoved
98 +C ObjC C++ ObjC++ RejectNegative
102 Assume normal C execution environment.
105 @@ -1801,6 +1801,9 @@ fharden-conditional-branches
106 Common Var(flag_harden_conditional_branches) Optimization
107 Harden conditional branches by checking reversed conditions.
110 +Common RejectNegative
112 ; Nonzero means ignore `#ident' directives. 0 means handle them.
113 ; Generate position-independent code for executables if possible
114 ; On SVR4 targets, it also controls whether or not to emit a
115 --- a/gcc/doc/invoke.texi
116 +++ b/gcc/doc/invoke.texi
117 @@ -10061,6 +10061,17 @@ This option is only supported for C and
118 @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
119 @option{-Wno-pointer-sign}.
121 +@item -fhonour-copts
122 +@opindex fhonour-copts
123 +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
124 +given at least once, and warn if it is given more than once.
125 +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
127 +If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
128 +is not given exactly once.
129 +The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
130 +This flag and environment variable only affect the C language.
132 @opindex Wstack-protector
133 @opindex Wno-stack-protector
134 @item -Wstack-protector
137 @@ -2767,6 +2767,9 @@ common_handle_option (struct gcc_options
138 add_comma_separated_to_vector (&opts->x_flag_ignored_attributes, arg);
141 + case OPT_fhonour_copts:
145 dc->warning_as_error_requested = value;