From 43911ddd18b97d8ebd17d2959f36efa539d359b7 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Thu, 24 Mar 2022 22:34:30 +0100
Subject: [PATCH] Remove mysterious '-# Defining these options here in addition
 to common.opt is necessary' command-line option
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Before:

    $ [...]/gcc '-# Defining these options here in addition to common.opt is necessary' -S -x c /dev/null && echo MYSTERIOUS
    MYSTERIOUS

After:

    $ [...]/gcc '-# Defining these options here in addition to common.opt is necessary' -S -x c /dev/null && echo MYSTERIOUS
    gcc: error: unrecognized command-line option ‘-# Defining these options here in addition to common.opt is necessary’

This commit changes:

    --- [...]/build-gcc/gcc/optionlist	2022-03-24 22:12:07.936746648 +0100
    +++ [...]/build-gcc/gcc/optionlist	2022-03-24 22:30:06.976737341 +0100
    @@ -1,4 +1,3 @@
    -# Defining these options here in addition to common.opt is necessary# in order for the default -Wall setting of -Wuse-after-free=2 to take# effect.
     ###Driver
     -all-warningsAda AdaWhy AdaSCIL Alias(Wall)
     -all-warningsC ObjC C++ ObjC++ Warning Alias(Wall)
    [...]

    --- [...]/build-gcc/gcc/options.cc	2022-03-24 22:12:09.548727738 +0100
    +++ [...]/build-gcc/gcc/options.cc	2022-03-24 22:30:08.904727249 +0100
    @@ -3222,15 +3222,6 @@
     const struct cl_option cl_options[] =
     {
      /* [0] = */ {
    -    "-# Defining these options here in addition to common.opt is necessary",
    -    "# effect.",
    -    NULL,
    -    NULL,
    -    NULL, NULL, N_OPTS, N_OPTS, 68, /* .neg_idx = */ -1,
    -    0,
    -    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
    -    (unsigned short) -1, 0, CLVC_INTEGER, 0, -1, -1 },
    - /* [1] = */ {
         "-###",
         NULL,
         NULL,
    [...]

..., and re-numbers all following options.

    --- [...]/build-gcc/gcc/options.h	2022-03-21 23:24:25.894226828 +0100
    +++ [...]/build-gcc/gcc/options.h	2022-03-24 22:30:07.288735708 +0100
    @@ -9753,2118 +9753,2117 @@

     enum opt_code
     {
    -  OPT___Defining_these_options_here_in_addition_to_common_opt_is_necessary = 0,/* -# Defining these options here in addition to common.opt is necessary */
    [...]

..., and likewise re-numbers all following options.

Clean-up for commit 671a283636de75f7ed638ee6b01ed2d44361b8b6
"Add -Wuse-after-free [PR80532]".

	gcc/c-family/
	* c.opt: Properly quote comment.
---
 gcc/c-family/c.opt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 9a4828e..790d47c 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1377,9 +1377,9 @@ Wunused-const-variable=
 C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_unused_const_variable) Warning LangEnabledBy(C ObjC,Wunused-variable, 1, 0) IntegerRange(0, 2)
 Warn when a const variable is unused.
 
-# Defining these options here in addition to common.opt is necessary
-# in order for the default -Wall setting of -Wuse-after-free=2 to take
-# effect.
+; Defining these options here in addition to common.opt is necessary
+; in order for the default -Wall setting of -Wuse-after-free=2 to take
+; effect.
 
 Wuse-after-free
 LangEnabledBy(C ObjC C++ LTO ObjC++)
-- 
2.7.4