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

   1 commit 99368862e44740ff4fd33760893f04e14f9dbdf1
   2 Author: Felix Fietkau <nbd@openwrt.org>
   3 Date:   Tue Jul 31 00:52:27 2007 +0000
   4
   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
   6
   7     SVN-Revision: 8256
   8
   9         This patch brings over a feature from MirBSD:
  10         * -fhonour-copts
  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.
  14
  15         This patch was authored by Thorsten Glaser <tg at mirbsd.de>
  16         with copyright assignment to the FSF in effect.
  17
  18 --- a/gcc/c-family/c-opts.c
  19 +++ b/gcc/c-family/c-opts.c
  20 @@ -107,6 +107,9 @@ static dump_flags_t original_dump_flags;
  21  /* Whether any standard preincluded header has been preincluded.  */
  22  static bool done_preinclude;
  23
  24 +/* Check if a port honours COPTS.  */
  25 +static int honour_copts = 0;
  26 +
  27  static void handle_OPT_d (const char *);
  28  static void set_std_cxx98 (int);
  29  static void set_std_cxx11 (int);
  30 @@ -452,6 +455,12 @@ c_common_handle_option (size_t scode, co
  31        flag_no_builtin = !value;
  32        break;
  33
  34 +    case OPT_fhonour_copts:
  35 +      if (c_language == clk_c) {
  36 +        honour_copts++;
  37 +      }
  38 +      break;
  39 +
  40      case OPT_fconstant_string_class_:
  41        constant_string_class_name = arg;
  42        break;
  43 @@ -1138,6 +1147,47 @@ c_common_init (void)
  44        return false;
  45      }
  46
  47 +  if (c_language == clk_c) {
  48 +    char *ev = getenv ("GCC_HONOUR_COPTS");
  49 +    int evv;
  50 +    if (ev == NULL)
  51 +      evv = -1;
  52 +    else if ((*ev == '0') || (*ev == '\0'))
  53 +      evv = 0;
  54 +    else if (*ev == '1')
  55 +      evv = 1;
  56 +    else if (*ev == '2')
  57 +      evv = 2;
  58 +    else if (*ev == 's')
  59 +      evv = -1;
  60 +    else {
  61 +      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
  62 +      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
  63 +    }
  64 +    if (evv == 1) {
  65 +      if (honour_copts == 0) {
  66 +        error ("someone does not honour COPTS at all in lenient mode");
  67 +        return false;
  68 +      } else if (honour_copts != 1) {
  69 +        warning (0, "someone does not honour COPTS correctly, passed %d times",
  70 +         honour_copts);
  71 +      }
  72 +    } else if (evv == 2) {
  73 +      if (honour_copts == 0) {
  74 +        error ("someone does not honour COPTS at all in strict mode");
  75 +        return false;
  76 +      } else if (honour_copts != 1) {
  77 +        error ("someone does not honour COPTS correctly, passed %d times",
  78 +         honour_copts);
  79 +        return false;
  80 +      }
  81 +    } else if (evv == 0) {
  82 +      if (honour_copts != 1)
  83 +        inform (UNKNOWN_LOCATION, "someone does not honour COPTS correctly, passed %d times",
  84 +         honour_copts);
  85 +    }
  86 +  }
  87 +
  88    return true;
  89  }
  90
  91 --- a/gcc/c-family/c.opt
  92 +++ b/gcc/c-family/c.opt
  93 @@ -1521,6 +1521,9 @@ C++ ObjC++ Optimization Alias(fexception
  94  fhonor-std
  95  C++ ObjC++ Deprecated
  96
  97 +fhonour-copts
  98 +C ObjC C++ ObjC++ RejectNegative
  99 +
 100  fhosted
 101  C ObjC
 102  Assume normal C execution environment.
 103 --- a/gcc/common.opt
 104 +++ b/gcc/common.opt
 105 @@ -1589,6 +1589,9 @@ fguess-branch-probability
 106  Common Report Var(flag_guess_branch_prob) Optimization
 107  Enable guessing of branch probabilities.
 108
 109 +fhonour-copts
 110 +Common RejectNegative
 111 +
 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 @@ -7657,6 +7657,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}.
 120
 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
 126 +given exactly once.
 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.
 131 +
 132  @item -Wstack-protector
 133  @opindex Wstack-protector
 134  @opindex Wno-stack-protector
 135 --- a/gcc/opts.c
 136 +++ b/gcc/opts.c
 137 @@ -2314,6 +2314,9 @@ common_handle_option (struct gcc_options
 138        /* Currently handled in a prescan.  */
 139        break;
 140
 141 +    case OPT_fhonour_copts:
 142 +      break;
 143 +
 144      case OPT_Werror:
 145        dc->warning_as_error_requested = value;
 146        break;