toolchain/gcc/patches/llvm/910-mbsd_multi.patch

   1
   2         This patch brings over a few features from MirBSD:
   3         * -fhonour-copts
   4           If this option is not given, it's warned (depending
   5           on environment variables). This is to catch errors
   6           of misbuilt packages which override CFLAGS themselves.
   7         * -Werror-maybe-reset
   8           Has the effect of -Wno-error if GCC_NO_WERROR is
   9           set and not '0', a no-operation otherwise. This is
  10           to be able to use -Werror in "make" but prevent
  11           GNU autoconf generated configure scripts from
  12           freaking out.
  13         * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
  14           the default for -O2/-Os, because they trigger gcc bugs
  15           and can delete code with security implications.
  16
  17         This patch was authored by Thorsten Glaser <tg@mirbsd.de>
  18         with copyright assignment to the FSF in effect.
  19
  20 --- a/gcc/c-opts.c
  21 +++ b/gcc/c-opts.c
  22 @@ -109,6 +109,9 @@ static size_t deferred_count;
  23  /* Number of deferred options scanned for -include.  */
  24  static size_t include_cursor;
  25
  26 +/* Check if a port honours COPTS.  */
  27 +static int honour_copts = 0;
  28 +
  29  static void set_Wimplicit (int);
  30  static void handle_OPT_d (const char *);
  31  static void set_std_cxx98 (int);
  32 @@ -502,6 +505,14 @@ c_common_handle_option (size_t scode, co
  33        mesg_implicit_function_declaration = 2;
  34        break;
  35
  36 +    case OPT_Werror_maybe_reset:
  37 +      {
  38 +       char *ev = getenv ("GCC_NO_WERROR");
  39 +       if ((ev != NULL) && (*ev != '0'))
  40 +         cpp_opts->warnings_are_errors = 0;
  41 +      }
  42 +      break;
  43 +
  44      case OPT_Wformat:
  45        set_Wformat (value);
  46        break;
  47 @@ -778,6 +789,12 @@ c_common_handle_option (size_t scode, co
  48        flag_exceptions = value;
  49        break;
  50
  51 +    case OPT_fhonour_copts:
  52 +      if (c_language == clk_c) {
  53 +       honour_copts++;
  54 +      }
  55 +      break;
  56 +
  57      case OPT_fimplement_inlines:
  58        flag_implement_inlines = value;
  59        break;
  60 @@ -1295,6 +1312,47 @@ c_common_init (void)
  61    /* Has to wait until now so that cpplib has its hash table.  */
  62    init_pragma ();
  63
  64 +  if (c_language == clk_c) {
  65 +    char *ev = getenv ("GCC_HONOUR_COPTS");
  66 +    int evv;
  67 +    if (ev == NULL)
  68 +      evv = -1;
  69 +    else if ((*ev == '0') || (*ev == '\0'))
  70 +      evv = 0;
  71 +    else if (*ev == '1')
  72 +      evv = 1;
  73 +    else if (*ev == '2')
  74 +      evv = 2;
  75 +    else if (*ev == 's')
  76 +      evv = -1;
  77 +    else {
  78 +      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
  79 +      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
  80 +    }
  81 +    if (evv == 1) {
  82 +      if (honour_copts == 0) {
  83 +       error ("someone does not honour COPTS at all in lenient mode");
  84 +       return false;
  85 +      } else if (honour_copts != 1) {
  86 +       warning (0, "someone does not honour COPTS correctly, passed %d times",
  87 +        honour_copts);
  88 +      }
  89 +    } else if (evv == 2) {
  90 +      if (honour_copts == 0) {
  91 +       error ("someone does not honour COPTS at all in strict mode");
  92 +       return false;
  93 +      } else if (honour_copts != 1) {
  94 +       error ("someone does not honour COPTS correctly, passed %d times",
  95 +        honour_copts);
  96 +       return false;
  97 +      }
  98 +    } else if (evv == 0) {
  99 +      if (honour_copts != 1)
 100 +       inform ("someone does not honour COPTS correctly, passed %d times",
 101 +        honour_copts);
 102 +    }
 103 +  }
 104 +
 105    return true;
 106  }
 107
 108 --- a/gcc/c.opt
 109 +++ b/gcc/c.opt
 110 @@ -220,6 +220,10 @@ C ObjC C++ ObjC++
 111  Warn about extra tokens at the end of prepreprocessor directives
 112  ; APPLE LOCAL end -Wextra-tokens
 113
 114 +Werror-maybe-reset
 115 +C ObjC C++ ObjC++
 116 +; Documented in common.opt
 117 +
 118  Wfloat-equal
 119  C ObjC C++ ObjC++ Var(warn_float_equal)
 120  Warn if testing floating point numbers for equality
 121 @@ -675,6 +679,9 @@ C++ ObjC++
 122  fhonor-std
 123  C++ ObjC++
 124
 125 +fhonour-copts
 126 +C ObjC C++ ObjC++ RejectNegative
 127 +
 128  fhosted
 129  C ObjC
 130  Assume normal C execution environment
 131 --- a/gcc/common.opt
 132 +++ b/gcc/common.opt
 133 @@ -81,6 +81,10 @@ Werror=
 134  Common Joined
 135  Treat specified warning as error
 136
 137 +Werror-maybe-reset
 138 +Common
 139 +If environment variable GCC_NO_WERROR is set, act as -Wno-error
 140 +
 141  Wextra
 142  Common
 143  Print extra (possibly unwanted) warnings
 144 @@ -607,6 +611,9 @@ Common Report Var(flag_guess_branch_prob
 145  Enable guessing of branch probabilities
 146  ; APPLE LOCAL end optimization pragmas 3124235/3420242
 147
 148 +fhonour-copts
 149 +Common RejectNegative
 150 +
 151  ; Nonzero means ignore `#ident' directives.  0 means handle them.
 152  ; Generate position-independent code for executables if possible
 153  ; On SVR4 targets, it also controls whether or not to emit a
 154 --- a/gcc/opts.c
 155 +++ b/gcc/opts.c
 156 @@ -507,9 +507,6 @@ void set_flags_from_O (unsigned int cmdl
 157  #endif
 158        flag_regmove = 1;
 159        /* APPLE LOCAL optimization pragmas 3124235/3420242 */
 160 -      if (cmdline) flag_strict_aliasing = 1;
 161 -      flag_strict_overflow = 1;
 162 -      flag_delete_null_pointer_checks = 1;
 163        flag_reorder_blocks = 1;
 164        /* APPLE LOCAL optimization pragmas 3124235/3420242 */
 165        if (cmdline) flag_reorder_functions = 1;
 166 @@ -536,6 +533,9 @@ void set_flags_from_O (unsigned int cmdl
 167
 168    if (optimize >= 3)
 169      {
 170 +      if (cmdline) flag_strict_aliasing = 1;
 171 +      flag_strict_overflow = 1;
 172 +      flag_delete_null_pointer_checks = 1;
 173        if (cmdline)
 174          flag_inline_functions = 1;
 175        flag_unswitch_loops = 1;
 176 @@ -873,6 +873,17 @@ common_handle_option (size_t scode, cons
 177        }
 178        break;
 179
 180 +    case OPT_Werror_maybe_reset:
 181 +      {
 182 +       char *ev = getenv ("GCC_NO_WERROR");
 183 +       if ((ev != NULL) && (*ev != '0'))
 184 +         warnings_are_errors = 0;
 185 +      }
 186 +      break;
 187 +
 188 +    case OPT_fhonour_copts:
 189 +      break;
 190 +
 191      case OPT_Wextra:
 192        set_Wextra (value);
 193        break;
 194 --- a/gcc/doc/cppopts.texi
 195 +++ b/gcc/doc/cppopts.texi
 196 @@ -166,6 +166,11 @@ in older programs.  This warning is on b
 197  Make all warnings into hard errors.  Source code which triggers warnings
 198  will be rejected.
 199
 200 +@item -Werror-maybe-reset
 201 +@opindex Werror-maybe-reset
 202 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
 203 +variable is set to anything other than 0 or empty.
 204 +
 205  @item -Wsystem-headers
 206  @opindex Wsystem-headers
 207  Issue warnings for code in system headers.  These are normally unhelpful
 208 --- a/gcc/doc/invoke.texi
 209 +++ b/gcc/doc/invoke.texi
 210 @@ -282,7 +282,7 @@ Objective-C and Objective-C++ Dialects}.
 211  -Wc++-compat -Wcast-align  -Wcast-qual  -Wchar-subscripts  -Wcomment @gol
 212  -Wconversion  -Wno-deprecated-declarations @gol
 213  -Wdisabled-optimization  -Wno-div-by-zero  -Wno-endif-labels @gol
 214 --Werror  -Werror=* -Werror-implicit-function-declaration @gol
 215 +-Werror -Werror-maybe-reset -Werror=* -Werror-implicit-function-declaration @gol
 216  @c APPLE LOCAL default to Wformat-security 5764921
 217  -Wfatal-errors  -Wfloat-equal  -Wno-format  -Wformat=2 @gol
 218  -Wno-format-extra-args -Wformat-nonliteral @gol
 219 @@ -4031,6 +4031,22 @@ Note that specifying @option{-Werror=}@v
 220  @option{-W}@var{foo}.  However, @option{-Wno-error=}@var{foo} does not
 221  imply anything.
 222
 223 +@item -Werror-maybe-reset
 224 +@opindex Werror-maybe-reset
 225 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
 226 +variable is set to anything other than 0 or empty.
 227 +
 228 +@item -fhonour-copts
 229 +@opindex fhonour-copts
 230 +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
 231 +given at least once, and warn if it is given more than once.
 232 +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
 233 +given exactly once.
 234 +If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
 235 +is not given exactly once.
 236 +The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
 237 +This flag and environment variable only affect the C language.
 238 +
 239  @item -Wstack-protector
 240  @opindex Wstack-protector
 241  This option is only active when @option{-fstack-protector} is active.  It
 242 @@ -5533,7 +5549,7 @@ second branch or a point immediately fol
 243  the condition is known to be true or false.
 244
 245  @c APPLE LOCAL 4231761 -Oz
 246 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}, @option{-Oz} (APPLE ONLY).
 247 +Enabled at levels @option{-O3}, @option{-Oz} (APPLE ONLY).
 248
 249  @item -fcse-follow-jumps
 250  @opindex fcse-follow-jumps
 251 @@ -5659,7 +5675,7 @@ safely dereference null pointers.  Use
 252  for programs which depend on that behavior.
 253
 254  @c APPLE LOCAL 4231761 -Oz
 255 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}, @option{-Oz} (APPLE ONLY).
 256 +Enabled at levels @option{-O3}, @option{-Oz} (APPLE ONLY).
 257
 258  @item -fexpensive-optimizations
 259  @opindex fexpensive-optimizations
 260 @@ -6103,7 +6119,7 @@ allowed to alias.  For an example, see t
 261  @code{c_get_alias_set}.
 262
 263  @c APPLE LOCAL 4231761 -Oz
 264 -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}, @option{-Oz} (APPLE ONLY).
 265 +Enabled at levels @option{-O3}, @option{-Oz} (APPLE ONLY).
 266
 267  @item -fstrict-overflow
 268  @opindex fstrict-overflow
 269 --- a/gcc/java/jvspec.c
 270 +++ b/gcc/java/jvspec.c
 271 @@ -632,6 +632,7 @@ lang_specific_pre_link (void)
 272       class name.  Append dummy `.c' that can be stripped by set_input so %b
 273       is correct.  */
 274    set_input (concat (main_class_name, "main.c", NULL));
 275 +  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
 276    err = do_spec (jvgenmain_spec);
 277    if (err == 0)
 278      {