[PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Egeyar Bagcioglu]

Hello,

I would like to propose the second version of the patches which introduce a compile option --record-gcc-command-line. When passed to gcc, it saves the command line invoking gcc into the produced object file. The option makes it trivial to trace back with which command a file was compiled and by which version of the gcc. It helps with debugging, reproducing bugs and repeating the build process.

The reviews addressed in this version include indentation changes, error handling and corner case coverage pointed out by Segher Boessenkool in the first two patches; while the new third patch is another corner case (lto) coverage requested by Martin Liska.

Although we discussed after the submission of the first version that there are several other options performing similar tasks, I believe we established that there is still a need for this specific functionality. Therefore, I am skipping in this email the comparison between this option and the existing options with similarities.

This functionality operates as the following: It saves gcc's argv into a temporary file, and passes --record-gcc-command-line <tempfilename> to cc1 or cc1plus. The functionality of the backend is implemented via a hook. This patch includes an example implementation of the hook for elf targets: elf_record_gcc_command_line function. This function reads the given file and writes gcc's version and the command line into a mergeable string section, .GCC.command.line. It creates one entry per invocation. By doing so, it makes it clear which options were used together in a single gcc invocation, even after linking.

Here is an *example usage* of the option:
[egeyar@localhost save-commandline]$ gcc main.c --record-gcc-command-line
[egeyar@localhost save-commandline]$ readelf -p .GCC.command.line a.out

String dump of section '.GCC.command.line':
  [     0]  10.0.1 20200227 (experimental) : gcc main.c --record-gcc-command-line


The following is a *second example* calling g++ with -save-temps and a repetition of options, where --save-temps saves the intermediate file, main.cmdline in this case. You can see that the options are recorded unprocessed:

[egeyar@localhost save-commandline]$ g++ main.c -save-temps --record-gcc-command-line -O0 -O2 -O3 -DFORTIFY=2 --record-gcc-command-line
[egeyar@localhost save-commandline]$ readelf -p .GCC.command.line a.out

String dump of section '.GCC.command.line':
  [     0]  10.0.1 20200227 (experimental) : g++ main.c -save-temps --record-gcc-command-line -O0 -O2 -O3 -DFORTIFY=2 --record-gcc-command-line


The first patch of this three-patch-series only extends the testsuite machinery, while the second patch implements the functionality and adds a test case for it. The third patch that alters libiberty is to make sure the .GCC.command.line section in LTO objects survive the linking and appear in the linked object.

In addition to the new test case, I built binutils as my test case after passing this option to CFLAGS. The added .GCC.command.line section of ld.bfd listed many compile commands as expected. Tested on x86_64-pc-linux-gnu.

Please review the patches, let me know what you think and apply if appropriate.

Regards
Egeyar

Egeyar Bagcioglu (3):
  Introduce dg-require-target-object-format
  Introduce the gcc option --record-gcc-command-line
  Keep .GCC.command.line sections of LTO objetcs.

 gcc/common.opt                                     |  4 +++
 gcc/config/elfos.h                                 |  5 +++
 gcc/doc/tm.texi                                    | 22 ++++++++++++
 gcc/doc/tm.texi.in                                 |  4 +++
 gcc/gcc.c                                          | 41 ++++++++++++++++++++++
 gcc/gcc.h                                          |  1 +
 gcc/target.def                                     | 30 ++++++++++++++++
 gcc/target.h                                       |  3 ++
 .../c-c++-common/record-gcc-command-line.c         |  8 +++++
 gcc/testsuite/lib/target-supports-dg.exp           | 11 ++++++
 gcc/toplev.c                                       | 13 +++++++
 gcc/varasm.c                                       | 40 +++++++++++++++++++++
 libiberty/simple-object.c                          |  3 ++
 13 files changed, 185 insertions(+)
 create mode 100644 gcc/testsuite/c-c++-common/record-gcc-command-line.c

-- 
1.8.3.1

[PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Egeyar Bagcioglu]

This patch is for .GCC.command.line sections in LTO objects to be copied
into the final objects as in the following example:

[egeyar@localhost lto]$ gcc -flto -O3 demo.c -c -g --record-gcc-command-line
[egeyar@localhost lto]$ gcc -flto -O2 demo2.c -c -g --record-gcc-command-line -DFORTIFY=2
[egeyar@localhost lto]$ gcc demo.o demo2.o -o a.out  
[egeyar@localhost lto]$ readelf -p .GCC.command.line a.out 

String dump of section '.GCC.command.line':
  [     0]  10.0.1 20200227 (experimental) : gcc -flto -O3 demo.c -c -g --record-gcc-command-line
  [    56]  10.0.1 20200227 (experimental) : gcc -flto -O2 demo2.c -c -g --record-gcc-command-line -DFORTIFY=2

Regards
Egeyar

libiberty:
2020-02-27  Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* simple-object.c (handle_lto_debug_sections): Name
	".GCC.command.line" among debug sections to be copied over
	from lto objects.
---
 libiberty/simple-object.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libiberty/simple-object.c b/libiberty/simple-object.c
index d9c648a..3b3ca9c 100644
--- a/libiberty/simple-object.c
+++ b/libiberty/simple-object.c
@@ -298,6 +298,9 @@ handle_lto_debug_sections (const char *name, int rename)
      COMDAT sections in objects produced by GCC.  */
   else if (strcmp (name, ".comment") == 0)
     return strcpy (newname, name);
+  /* Copy over .GCC.command.line section under the same name if present.  */
+  else if (strcmp (name, ".GCC.command.line") == 0)
+    return strcpy (newname, name);
   free (newname);
   return NULL;
 }
-- 
1.8.3.1

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Richard Biener]

On Tue, Mar 3, 2020 at 5:41 PM Egeyar Bagcioglu
<egeyar.bagcioglu@oracle.com> wrote:
>
> This patch is for .GCC.command.line sections in LTO objects to be copied
> into the final objects as in the following example:
>
> [egeyar@localhost lto]$ gcc -flto -O3 demo.c -c -g --record-gcc-command-line
> [egeyar@localhost lto]$ gcc -flto -O2 demo2.c -c -g --record-gcc-command-line -DFORTIFY=2
> [egeyar@localhost lto]$ gcc demo.o demo2.o -o a.out
> [egeyar@localhost lto]$ readelf -p .GCC.command.line a.out
>
> String dump of section '.GCC.command.line':
>   [     0]  10.0.1 20200227 (experimental) : gcc -flto -O3 demo.c -c -g --record-gcc-command-line
>   [    56]  10.0.1 20200227 (experimental) : gcc -flto -O2 demo2.c -c -g --record-gcc-command-line -DFORTIFY=2

--record-gcc-command-line is not a FSF GCC option, there's
-frecord-gcc-switches though which
(also) populates .GCC.command.line

OK.

Thanks,
Richard.

> Regards
> Egeyar
>
> libiberty:
> 2020-02-27  Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>
>
>         * simple-object.c (handle_lto_debug_sections): Name
>         ".GCC.command.line" among debug sections to be copied over
>         from lto objects.
> ---
>  libiberty/simple-object.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/libiberty/simple-object.c b/libiberty/simple-object.c
> index d9c648a..3b3ca9c 100644
> --- a/libiberty/simple-object.c
> +++ b/libiberty/simple-object.c
> @@ -298,6 +298,9 @@ handle_lto_debug_sections (const char *name, int rename)
>       COMDAT sections in objects produced by GCC.  */
>    else if (strcmp (name, ".comment") == 0)
>      return strcpy (newname, name);
> +  /* Copy over .GCC.command.line section under the same name if present.  */
> +  else if (strcmp (name, ".GCC.command.line") == 0)
> +    return strcpy (newname, name);
>    free (newname);
>    return NULL;
>  }
> --
> 1.8.3.1
>

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Egeyar Bagcioglu]

On 3/4/20 10:00 AM, Richard Biener wrote:
> On Tue, Mar 3, 2020 at 5:41 PM Egeyar Bagcioglu
> <egeyar.bagcioglu@oracle.com> wrote:
>> This patch is for .GCC.command.line sections in LTO objects to be copied
>> into the final objects as in the following example:
>>
>> [egeyar@localhost lto]$ gcc -flto -O3 demo.c -c -g --record-gcc-command-line
>> [egeyar@localhost lto]$ gcc -flto -O2 demo2.c -c -g --record-gcc-command-line -DFORTIFY=2
>> [egeyar@localhost lto]$ gcc demo.o demo2.o -o a.out
>> [egeyar@localhost lto]$ readelf -p .GCC.command.line a.out
>>
>> String dump of section '.GCC.command.line':
>>    [     0]  10.0.1 20200227 (experimental) : gcc -flto -O3 demo.c -c -g --record-gcc-command-line
>>    [    56]  10.0.1 20200227 (experimental) : gcc -flto -O2 demo2.c -c -g --record-gcc-command-line -DFORTIFY=2
> --record-gcc-command-line is not a FSF GCC option, there's
> -frecord-gcc-switches though which
> (also) populates .GCC.command.line

Right. This is also necessary for preserving the outcome of 
-frecord-gcc-switches option and that issue is reported to me by Martin 
Liska.

> OK.

Thanks Richard.

I do not have write-access to the GCC repo. I'd be glad if someone 
commits it for me.

Regards
Egeyar

>
> Thanks,
> Richard.
>
>> Regards
>> Egeyar
>>
>> libiberty:
>> 2020-02-27  Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>
>>
>>          * simple-object.c (handle_lto_debug_sections): Name
>>          ".GCC.command.line" among debug sections to be copied over
>>          from lto objects.
>> ---
>>   libiberty/simple-object.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/libiberty/simple-object.c b/libiberty/simple-object.c
>> index d9c648a..3b3ca9c 100644
>> --- a/libiberty/simple-object.c
>> +++ b/libiberty/simple-object.c
>> @@ -298,6 +298,9 @@ handle_lto_debug_sections (const char *name, int rename)
>>        COMDAT sections in objects produced by GCC.  */
>>     else if (strcmp (name, ".comment") == 0)
>>       return strcpy (newname, name);
>> +  /* Copy over .GCC.command.line section under the same name if present.  */
>> +  else if (strcmp (name, ".GCC.command.line") == 0)
>> +    return strcpy (newname, name);
>>     free (newname);
>>     return NULL;
>>   }
>> --
>> 1.8.3.1
>>

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Martin Liška]

On 3/4/20 4:25 PM, Egeyar Bagcioglu wrote:
> Thanks Richard.
> 
> I do not have write-access to the GCC repo. I'd be glad if someone commits it for me.

Can we please wait? I'm really convinced we do not want one another very similar
functionality. I would definitely recommend to change the semantics
of -frecord-gcc-switches to what the patchset does.

That's why I added Nick as he's the author of the original implementation.
Reasoning is provided in my previous email.

Martin

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Jakub Jelinek]

On Wed, Mar 04, 2020 at 06:23:10PM +0100, Martin Liška wrote:
> On 3/4/20 4:25 PM, Egeyar Bagcioglu wrote:
> > Thanks Richard.
> > 
> > I do not have write-access to the GCC repo. I'd be glad if someone commits it for me.
> 
> Can we please wait? I'm really convinced we do not want one another very similar
> functionality. I would definitely recommend to change the semantics
> of -frecord-gcc-switches to what the patchset does.
> 
> That's why I added Nick as he's the author of the original implementation.
> Reasoning is provided in my previous email.

Also, what is the reason for storing the option in a file, rather than say
putting them into an environment variable from which the backend can pick it
up?  I must say I don't really see advantages of this over
-grecord-gcc-switches, recording all options looks very bloaty and will
include mostly stuff you don't really care about (such as, e.g. the -I
options without knowing what was the current directory when the source file
has been compiled), on the other side will not record interesting options
that -grecord-gcc-switches records (say, if some code is compiled with
-march=native, this new option will record that, rather than what it really
is), but I won't stand in a way unless such an option would be on by
default.

	Jakub

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Martin Liška]

On 3/4/20 6:33 PM, Jakub Jelinek wrote:
> On Wed, Mar 04, 2020 at 06:23:10PM +0100, Martin Liška wrote:
>> On 3/4/20 4:25 PM, Egeyar Bagcioglu wrote:
>>> Thanks Richard.
>>>
>>> I do not have write-access to the GCC repo. I'd be glad if someone commits it for me.
>>
>> Can we please wait? I'm really convinced we do not want one another very similar
>> functionality. I would definitely recommend to change the semantics
>> of -frecord-gcc-switches to what the patchset does.
>>
>> That's why I added Nick as he's the author of the original implementation.
>> Reasoning is provided in my previous email.
> 
> Also, what is the reason for storing the option in a file, rather than say
> putting them into an environment variable from which the backend can pick it
> up?

That's smart suggestion! It would not be the first environment variable that
we use, right?

>  I must say I don't really see advantages of this over
> -grecord-gcc-switches, recording all options looks very bloaty and will
> include mostly stuff you don't really care about (such as, e.g. the -I
> options without knowing what was the current directory when the source file
> has been compiled), on the other side will not record interesting options
> that -grecord-gcc-switches records (say, if some code is compiled with
> -march=native, this new option will record that, rather than what it really
> is), but I won't stand in a way unless such an option would be on by
> default.

Yes, it's a minor disadvantage. On the other hand one can check the fortify
macros. I don't care much about them too, but what's the biggest benefit to me
is that each argument will not go into it's own mergeable section. Then
you will not see something like:

$ gcc -O0 foo.c -frecord-gcc-switches -c -g
$ gcc -Ofast bar.c -frecord-gcc-switches -c -g0
$ gcc foo.o bar.o
$ readelf -p .GCC.command.line a.out

String dump of section '.GCC.command.line':
   [     0]  foo.c
   [     6]  -mtune=generic
   [    15]  -march=x86-64
   [    23]  -g
   [    26]  -O0
   [    2a]  -frecord-gcc-switches
   [    40]  bar.c
   [    46]  -g0
   [    4a]  -Ofast

The output is useless and can't disambiguate each compiler
invocations.

Martin

> 
> 	Jakub
> 

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Jakub Jelinek]

On Wed, Mar 04, 2020 at 06:42:29PM +0100, Martin Liška wrote:
> >  I must say I don't really see advantages of this over
> > -grecord-gcc-switches, recording all options looks very bloaty and will
> > include mostly stuff you don't really care about (such as, e.g. the -I
> > options without knowing what was the current directory when the source file
> > has been compiled), on the other side will not record interesting options
> > that -grecord-gcc-switches records (say, if some code is compiled with
> > -march=native, this new option will record that, rather than what it really
> > is), but I won't stand in a way unless such an option would be on by
> > default.
> 
> Yes, it's a minor disadvantage. On the other hand one can check the fortify
> macros. I don't care much about them too, but what's the biggest benefit to me
> is that each argument will not go into it's own mergeable section. Then
> you will not see something like:

Well, the fortify macro is questionable, because as a macro, it can be
either specified on the command line, or e.g. defined in the source before
including headers, so -g3 seems much better way to query it.

> The output is useless and can't disambiguate each compiler
> invocations.

Sure, I'm not talking about -frecord-gcc-switches, that option is indeed
not really useful.

	Jakub

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Egeyar Bagcioglu]

On 3/4/20 6:33 PM, Jakub Jelinek wrote:
> On Wed, Mar 04, 2020 at 06:23:10PM +0100, Martin Liška wrote:
>> On 3/4/20 4:25 PM, Egeyar Bagcioglu wrote:
>>> Thanks Richard.
>>>
>>> I do not have write-access to the GCC repo. I'd be glad if someone commits it for me.
>> Can we please wait? I'm really convinced we do not want one another very similar
>> functionality. I would definitely recommend to change the semantics
>> of -frecord-gcc-switches to what the patchset does.
>>
>> That's why I added Nick as he's the author of the original implementation.
>> Reasoning is provided in my previous email.
> Also, what is the reason for storing the option in a file, rather than say
> putting them into an environment variable from which the backend can pick it
> up?

I needed to pass that information from one process to the other and I 
picked a way to do so. Moreover, passing files is what gcc does; 
therefore, it didn't seem unnatural to do so. Furthermore, gcc specs 
already has its way to create temporary file names so I didn't have to 
worry about what level of thread safety is acceptable. If you tell me 
why an environment variable is better, we can discuss and I might 
implement that too.

>    I must say I don't really see advantages of this over
> -grecord-gcc-switches, recording all options looks very bloaty and will
> include mostly stuff you don't really care about (such as, e.g. the -I
> options without knowing what was the current directory when the source file
> has been compiled), on the other side will not record interesting options
> that -grecord-gcc-switches records (say, if some code is compiled with
> -march=native, this new option will record that, rather than what it really
> is),

1) -grecord-gcc-switches is quite similar to -frecord-gcc-switches and 
my first and main arguement about the latter is valid for the former:
You cannot easily construct the right command line to invoke the same 
compilation from the switches. Switches are useful to check that the 
compiler is doing the expected. The command line is useful when you want 
the compiler to do the same thing again.

2) The output is exactly what gcc takes as command line to make that 
compilation. It is bloaty, surely, when so is what's provided to gcc to 
make it compile as desired. On the other hand, -grecord-gcc-switches is 
just much bloatier since it does not work alone. It's embedded in dwarf.

3) Many systems automatically strip dwarf, together with this 
information. I do not think there is an easy way to separate this 
information and keep it.

Since this comes up often, I'd like to emphasize that the internal 
switches of gcc are different than the user-given options of gcc. The 
purpose of this new option is really to catch the user given options of 
gcc and only them, so much so that I mark it SWITCH_IGNORE within the 
specs to avoid it propagated to any child processes of gcc. This option 
is simply to retrieve how the call was made to GCC. Currently, there are 
no other options giving us this information.

>   but I won't stand in a way unless such an option would be on by
> default.

I totally agree that this should not be on by default.

Best regards
Egeyar

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

Hi.

I'm sending the updated patch based on Egeyar's work.
It utilizes a new environmental variable and uses the currently
existing -frecord-gcc-switches option.

Thoughts?
Martin

[-- Attachment #2: 0001-Change-semantics-of-frecord-gcc-switches.patch --]
[-- Type: text/x-patch, Size: 12651 bytes --]

From 9436d12e7a540691c6f2d6e2db4730a138e5c458 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 5 Mar 2020 09:39:17 +0100
Subject: [PATCH] Change semantics of -frecord-gcc-switches.

gcc/ChangeLog:

2020-03-05  Martin Liska  <mliska@suse.cz>
	    Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* common.opt: Make flag_record_gcc_switches also
	a driver option.
	* doc/tm.texi: Regenerate.
	* gcc.c (set_driver_command_line_envvar): New.
	(driver_handle_option): Handle OPT_frecord_gcc_switches
	and export command line into a ENV variable.
	(driver::main): Save command line.
	(driver::set_commandline): New.
	* gcc.h (set_commandline): New.
	* target.def: Simplify documentation by removal
	of unused enum values.
	* target.h (elf_record_gcc_switches): Change function type.
	* toplev.c (init_asm_output): Update call.
	* varasm.c (elf_record_gcc_switches): Record GCC version
	string and content of GCC_DRIVER_COMMAND_LINE.
---
 gcc/common.opt  |  2 +-
 gcc/doc/tm.texi | 37 ++-----------------------------------
 gcc/gcc.c       | 41 +++++++++++++++++++++++++++++++++++++++++
 gcc/gcc.h       |  1 +
 gcc/target.def  | 37 ++-----------------------------------
 gcc/target.h    |  2 +-
 gcc/toplev.c    | 11 +----------
 gcc/varasm.c    | 46 ++++++++++------------------------------------
 8 files changed, 59 insertions(+), 118 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index fa9da505fc2..60ca5a521c5 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2246,7 +2246,7 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Driver Report Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
 freg-struct-return
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 19985adac3e..30c71d60aff 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8061,43 +8061,10 @@ need to override this if your target has special flags that might be
 set via @code{__attribute__}.
 @end deftypefn
 
-@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_SWITCHES (print_switch_type @var{type}, const char *@var{text})
+@deftypefn {Target Hook} void TARGET_ASM_RECORD_GCC_SWITCHES (void)
 Provides the target with the ability to record the gcc command line
 switches that have been passed to the compiler, and options that are
-enabled.  The @var{type} argument specifies what is being recorded.
-It can take the following values:
-
-@table @gcctabopt
-@item SWITCH_TYPE_PASSED
-@var{text} is a command line switch that has been set by the user.
-
-@item SWITCH_TYPE_ENABLED
-@var{text} is an option which has been enabled.  This might be as a
-direct result of a command line switch, or because it is enabled by
-default or because it has been enabled as a side effect of a different
-command line switch.  For example, the @option{-O2} switch enables
-various different individual optimization passes.
-
-@item SWITCH_TYPE_DESCRIPTIVE
-@var{text} is either NULL or some descriptive text which should be
-ignored.  If @var{text} is NULL then it is being used to warn the
-target hook that either recording is starting or ending.  The first
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the
-warning is for start up and the second time the warning is for
-wind down.  This feature is to allow the target hook to make any
-necessary preparations before it starts to record switches and to
-perform any necessary tidying up after it has finished recording
-switches.
-
-@item SWITCH_TYPE_LINE_START
-This option can be ignored by this target hook.
-
-@item  SWITCH_TYPE_LINE_END
-This option can be ignored by this target hook.
-@end table
-
-The hook's return value must be zero.  Other return values may be
-supported in the future.
+enabled.
 
 By default this hook is set to NULL, but an example implementation is
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 9f790db0daf..673ba2935f9 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,11 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv used to call gcc.  Necessary for
+   --record-gcc-command-line option.  */
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -3724,6 +3729,28 @@ set_source_date_epoch_envvar ()
   setenv ("SOURCE_DATE_EPOCH", source_date_epoch, 0);
 }
 
+/* Set GCC_DRIVER_COMMAND_LINE enviromental variable that is later
+   used by -frecord-gcc-switches option.  */
+
+static void
+set_driver_command_line_envvar ()
+{
+  unsigned int length = 0;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    length += strlen (driver_gcc_argv[i]) + 1;
+
+  char *buffer = (char *)xmalloc (length);
+  char *ptr = buffer;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    {
+      unsigned l = sprintf (ptr, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+      ptr += l;
+    }
+
+  setenv ("GCC_DRIVER_COMMAND_LINE", buffer, 0);
+  free (buffer);
+}
+
 /* Handle an option DECODED that is unknown to the option-processing
    machinery.  */
 
@@ -4289,6 +4316,10 @@ driver_handle_option (struct gcc_options *opts,
       handle_foffload_option (arg);
       break;
 
+    case OPT_frecord_gcc_switches:
+      set_driver_command_line_envvar ();
+      break;
+
     default:
       /* Various driver options need no special processing at this
 	 point, having been handled in a prescan above or being
@@ -7387,6 +7418,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -7430,6 +7462,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep command line for --record-gcc-command-line.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08f059..cde77fbaad7 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/target.def b/gcc/target.def
index b5e82ff826e..9cb9dab60ab 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -746,40 +746,7 @@ DEFHOOK
 (record_gcc_switches,
  "Provides the target with the ability to record the gcc command line\n\
 switches that have been passed to the compiler, and options that are\n\
-enabled.  The @var{type} argument specifies what is being recorded.\n\
-It can take the following values:\n\
-\n\
-@table @gcctabopt\n\
-@item SWITCH_TYPE_PASSED\n\
-@var{text} is a command line switch that has been set by the user.\n\
-\n\
-@item SWITCH_TYPE_ENABLED\n\
-@var{text} is an option which has been enabled.  This might be as a\n\
-direct result of a command line switch, or because it is enabled by\n\
-default or because it has been enabled as a side effect of a different\n\
-command line switch.  For example, the @option{-O2} switch enables\n\
-various different individual optimization passes.\n\
-\n\
-@item SWITCH_TYPE_DESCRIPTIVE\n\
-@var{text} is either NULL or some descriptive text which should be\n\
-ignored.  If @var{text} is NULL then it is being used to warn the\n\
-target hook that either recording is starting or ending.  The first\n\
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the\n\
-warning is for start up and the second time the warning is for\n\
-wind down.  This feature is to allow the target hook to make any\n\
-necessary preparations before it starts to record switches and to\n\
-perform any necessary tidying up after it has finished recording\n\
-switches.\n\
-\n\
-@item SWITCH_TYPE_LINE_START\n\
-This option can be ignored by this target hook.\n\
-\n\
-@item  SWITCH_TYPE_LINE_END\n\
-This option can be ignored by this target hook.\n\
-@end table\n\
-\n\
-The hook's return value must be zero.  Other return values may be\n\
-supported in the future.\n\
+enabled.\n\
 \n\
 By default this hook is set to NULL, but an example implementation is\n\
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},\n\
@@ -787,7 +754,7 @@ it records the switches as ASCII text inside a new, string mergeable\n\
 section in the assembler output file.  The name of the new section is\n\
 provided by the @code{TARGET_ASM_RECORD_GCC_SWITCHES_SECTION} target\n\
 hook.",
- int, (print_switch_type type, const char *text),
+ void, (void),
  NULL)
 
 /* The name of the section that the example ELF implementation of
diff --git a/gcc/target.h b/gcc/target.h
index 2f47c577d00..f01ce812c60 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -99,7 +99,7 @@ extern unsigned HOST_WIDE_INT by_pieces_ninsns (unsigned HOST_WIDE_INT,
 typedef int (* print_switch_fn_type) (print_switch_type, const char *);
 
 /* An example implementation for ELF targets.  Defined in varasm.c  */
-extern int elf_record_gcc_switches (print_switch_type type, const char *);
+extern void elf_record_gcc_switches (void);
 
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 4c8be502c71..9df9d630e16 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -871,16 +871,7 @@ init_asm_output (const char *name)
       if (flag_record_gcc_switches)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
-	    {
-	      /* Let the target know that we are about to start recording.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	      /* Now record the switches.  */
-	      print_switch_values (targetm.asm_out.record_gcc_switches);
-	      /* Let the target know that the recording is over.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	    }
+	    targetm.asm_out.record_gcc_switches ();
 	  else
 	    inform (UNKNOWN_LOCATION,
 		    "%<-frecord-gcc-switches%> is not supported by "
diff --git a/gcc/varasm.c b/gcc/varasm.c
index dc6da6c0b5b..0dfb243adad 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -7803,45 +7804,18 @@ output_object_blocks (void)
    we want to emit NUL strings terminators into the object file we have to use
    ASM_OUTPUT_SKIP.  */
 
-int
-elf_record_gcc_switches (print_switch_type type, const char * name)
+void
+elf_record_gcc_switches ()
 {
-  switch (type)
-    {
-    case SWITCH_TYPE_PASSED:
-      ASM_OUTPUT_ASCII (asm_out_file, name, strlen (name));
-      ASM_OUTPUT_SKIP (asm_out_file, HOST_WIDE_INT_1U);
-      break;
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (name == NULL)
-	{
-	  /* Distinguish between invocations where name is NULL.  */
-	  static bool started = false;
-
-	  if (!started)
-	    {
-	      section * sec;
-
-	      sec = get_section (targetm.asm_out.record_gcc_switches_section,
-				 SECTION_DEBUG
-				 | SECTION_MERGE
-				 | SECTION_STRINGS
-				 | (SECTION_ENTSIZE & 1),
-				 NULL);
-	      switch_to_section (sec);
-	      started = true;
-	    }
-	}
+  section *sec = get_section (targetm.asm_out.record_gcc_switches_section,
+			      SECTION_DEBUG | SECTION_MERGE
+			      | SECTION_STRINGS | (SECTION_ENTSIZE & 1), NULL);
+  switch_to_section (sec);
 
-    default:
-      break;
-    }
+  ASM_OUTPUT_ASCII (asm_out_file, version_string, strlen (version_string));
 
-  /* The return value is currently ignored by the caller, but must be 0.
-     For -fverbose-asm the return value would be the number of characters
-     emitted into the assembler file.  */
-  return 0;
+  const char *cmdline = getenv ("GCC_DRIVER_COMMAND_LINE");
+  ASM_OUTPUT_ASCII (asm_out_file, cmdline, strlen (cmdline) + 1);
 }
 
 /* Emit text to declare externally defined symbols. It is needed to
-- 
2.25.1

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Egeyar Bagcioglu]

> I'm sending the updated patch based on Egeyar's work.
> It utilizes a new environmental variable and uses the currently
> existing -frecord-gcc-switches option.
>
> Thoughts?

I am leaving it to the more experienced to comment on redefining the 
functionality of -frecord-gcc-switches.

The code seems pretty neat to me. Thanks Martin!

Best regards
Egeyar

[stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 4938 bytes --]

Hi.

I'm sending enhanced patch that makes the following changes:
- a new option -frecord-gcc-switches-format is added; the option
   selects format (processed, driver) for all options that record
   GCC command line
- Dwarf gen_produce_string is now used in -fverbose-asm
- The .s file is affected in the following way:

BEFORE:

# GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
#	compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP

# GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
# options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
# -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
# -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
# -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
# -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
# -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
# -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
# -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
# -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
# -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
# -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
# -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
# --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
# -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
# options enabled:  -faggressive-loop-optimizations -fassume-phsa
# -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
# -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
# -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
# -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
# -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
# -fira-share-spill-slots -fivopts -fkeep-static-consts
# -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
# -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
# -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
# -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
# -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
# -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
# -fsemantic-interposition -fshow-column -fshrink-wrap-separate
# -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
# -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
# -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
# -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
# -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
# -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
# -mabm -madx -maes -malign-stringops -mavx -mavx2
# -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
# -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
# -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
# -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
# -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
# -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves

AFTER:

# GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
# GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g

That's the biggest change I made, but I hope it's acceptable.
Apart from that the patch simplifies and unifies places where save_decoded_options
options are transformed back to string representation.

Patch can bootstrap on x86_64-linux-gnu and survives regression tests.

Ready to be installed in next stage1?
Thanks,
Martin

[-- Attachment #2: 0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch --]
[-- Type: text/x-patch, Size: 31657 bytes --]

From a6514e12007a8cffa1a6a060196b28c5ada131c3 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 5 Mar 2020 09:39:17 +0100
Subject: [PATCH] Change semantics of -frecord-gcc-switches and add
 -frecord-gcc-switches-format.

gcc/ChangeLog:

2020-03-17  Martin Liska  <mliska@suse.cz>

	* common.opt: Add new option -frecord-gcc-switches-format.
	* doc/invoke.texi: Document the new option.
	* doc/tm.texi: Remove print_switch_type documentation
	entry.
	* dwarf2out.c (gen_producer_string): Move to varasm.c
	and ignore also OPT_frecord_gcc_switches and
	OPT_frecord_gcc_switches_format_.
	(dwarf2out_early_finish): Print corresponding producer format string.
	* flag-types.h (enum record_gcc_switches_format):
	* gcc.c (set_driver_command_line_envvar): New function.
	(driver_handle_option): Always save command line options.
	(driver::main): Save command line.
	(driver::set_commandline): New.
	* gcc.h (driver::set_commandline): New.
	* opts.c (get_producer_string): Moved from dwarf2out.c.
	(get_driver_command_line): New function.
	* opts.h (get_producer_string): New.
	(get_driver_command_line): Likewise.
	* target.def: Remove documentation foor print_switch_type.
	* target.h (enum print_switch_type):  Remove.
	(elf_record_gcc_switches): Change to void type.
	* toplev.c (MAX_LINE): Remove.
	(print_to_asm_out_file): Remove.
	(print_to_stderr): Remove.
	(print_single_switch): Likewise.
	(print_switch_values): Likewise.
	(init_asm_output): Call directly record_gcc_switches.
	(process_options): Print options to stderr.
	* varasm.c (elf_record_gcc_switches): Support
	new flag_record_gcc_switches_format option.
---
 gcc/common.opt      |  15 +++-
 gcc/doc/invoke.texi |  23 +++++-
 gcc/doc/tm.texi     |  37 +--------
 gcc/dwarf2out.c     | 125 ++++--------------------------
 gcc/flag-types.h    |   7 ++
 gcc/gcc.c           |  39 ++++++++++
 gcc/gcc.h           |   1 +
 gcc/opts.c          | 121 +++++++++++++++++++++++++++++
 gcc/opts.h          |   6 ++
 gcc/target.def      |  37 +--------
 gcc/target.h        |  14 +---
 gcc/toplev.c        | 180 +++++---------------------------------------
 gcc/varasm.c        |  59 ++++++---------
 13 files changed, 270 insertions(+), 394 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index 4368910cb54..7809c734ee1 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2246,9 +2246,22 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Driver Report Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
+Enum
+Name(record_gcc_switches_format) Type(enum record_gcc_switches_format)
+
+EnumValue
+Enum(record_gcc_switches_format) String(processed) Value(RECORD_GCC_SWITCHES_PROCESSED)
+
+EnumValue
+Enum(record_gcc_switches_format) String(driver) Value(RECORD_GCC_SWITCHES_DRIVER)
+
+frecord-gcc-switches-format=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_format) Enum(record_gcc_switches_format) Init(RECORD_GCC_SWITCHES_PROCESSED)
+-frecord-gcc-switches-format=[processed|driver]	Format of recorded gcc command line switches.
+
 freg-struct-return
 Common Report Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 96a95162696..7925990e320 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -622,7 +622,7 @@ Objective-C and Objective-C++ Dialects}.
 -finhibit-size-directive  -fcommon  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC  -fpie  -fPIE  -fno-plt @gol
 -fno-jump-tables @gol
--frecord-gcc-switches @gol
+-frecord-gcc-switches -frecord-gcc-switches-format @gol
 -freg-struct-return  -fshort-enums  -fshort-wchar @gol
 -fverbose-asm  -fpack-struct[=@var{n}]  @gol
 -fleading-underscore  -ftls-model=@var{model} @gol
@@ -15070,6 +15070,27 @@ comments, so it never reaches the object file.
 See also @option{-grecord-gcc-switches} for another
 way of storing compiler options into the object file.
 
+@item -frecord-gcc-switches-format=@var{format}
+@opindex frecord-gcc-switches-format
+This switch controls the output format of options that record
+the command line.  The affected options are @option{-frecord-gcc-switches},
+@option{-grecord-gcc-switches} and @option{-fverbose-asm}.
+
+The @var{format} argument should be one of the following:
+
+@table @samp
+
+@item processed
+
+Options are printed after processing by the compiler driver.
+It is the default option value.
+
+@item driver
+
+Options are printed as provided to the compiler driver.
+
+@end table
+
 @item -fpic
 @opindex fpic
 @cindex global offset table
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 3560cfae74f..56d493eed21 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8061,43 +8061,10 @@ need to override this if your target has special flags that might be
 set via @code{__attribute__}.
 @end deftypefn
 
-@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_SWITCHES (print_switch_type @var{type}, const char *@var{text})
+@deftypefn {Target Hook} void TARGET_ASM_RECORD_GCC_SWITCHES (void)
 Provides the target with the ability to record the gcc command line
 switches that have been passed to the compiler, and options that are
-enabled.  The @var{type} argument specifies what is being recorded.
-It can take the following values:
-
-@table @gcctabopt
-@item SWITCH_TYPE_PASSED
-@var{text} is a command line switch that has been set by the user.
-
-@item SWITCH_TYPE_ENABLED
-@var{text} is an option which has been enabled.  This might be as a
-direct result of a command line switch, or because it is enabled by
-default or because it has been enabled as a side effect of a different
-command line switch.  For example, the @option{-O2} switch enables
-various different individual optimization passes.
-
-@item SWITCH_TYPE_DESCRIPTIVE
-@var{text} is either NULL or some descriptive text which should be
-ignored.  If @var{text} is NULL then it is being used to warn the
-target hook that either recording is starting or ending.  The first
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the
-warning is for start up and the second time the warning is for
-wind down.  This feature is to allow the target hook to make any
-necessary preparations before it starts to record switches and to
-perform any necessary tidying up after it has finished recording
-switches.
-
-@item SWITCH_TYPE_LINE_START
-This option can be ignored by this target hook.
-
-@item  SWITCH_TYPE_LINE_END
-This option can be ignored by this target hook.
-@end table
-
-The hook's return value must be zero.  Other return values may be
-supported in the future.
+enabled.
 
 By default this hook is set to NULL, but an example implementation is
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index bb45279ea56..2e8ed4e946d 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24314,116 +24314,6 @@ gen_ptr_to_mbr_type_die (tree type, dw_die_ref context_die)
 
 static char *producer_string;
 
-/* Return a heap allocated producer string including command line options
-   if -grecord-gcc-switches.  */
-
-static char *
-gen_producer_string (void)
-{
-  size_t j;
-  auto_vec<const char *> switches;
-  const char *language_string = lang_hooks.name;
-  char *producer, *tail;
-  const char *p;
-  size_t len = dwarf_record_gcc_switches ? 0 : 3;
-  size_t plen = strlen (language_string) + 1 + strlen (version_string);
-
-  for (j = 1; dwarf_record_gcc_switches && j < save_decoded_options_count; j++)
-    switch (save_decoded_options[j].opt_index)
-      {
-      case OPT_o:
-      case OPT_d:
-      case OPT_dumpbase:
-      case OPT_dumpdir:
-      case OPT_auxbase:
-      case OPT_auxbase_strip:
-      case OPT_quiet:
-      case OPT_version:
-      case OPT_v:
-      case OPT_w:
-      case OPT_L:
-      case OPT_D:
-      case OPT_I:
-      case OPT_U:
-      case OPT_SPECIAL_unknown:
-      case OPT_SPECIAL_ignore:
-      case OPT_SPECIAL_warn_removed:
-      case OPT_SPECIAL_program_name:
-      case OPT_SPECIAL_input_file:
-      case OPT_grecord_gcc_switches:
-      case OPT__output_pch_:
-      case OPT_fdiagnostics_show_location_:
-      case OPT_fdiagnostics_show_option:
-      case OPT_fdiagnostics_show_caret:
-      case OPT_fdiagnostics_show_labels:
-      case OPT_fdiagnostics_show_line_numbers:
-      case OPT_fdiagnostics_color_:
-      case OPT_fdiagnostics_format_:
-      case OPT_fverbose_asm:
-      case OPT____:
-      case OPT__sysroot_:
-      case OPT_nostdinc:
-      case OPT_nostdinc__:
-      case OPT_fpreprocessed:
-      case OPT_fltrans_output_list_:
-      case OPT_fresolution_:
-      case OPT_fdebug_prefix_map_:
-      case OPT_fmacro_prefix_map_:
-      case OPT_ffile_prefix_map_:
-      case OPT_fcompare_debug:
-      case OPT_fchecking:
-      case OPT_fchecking_:
-	/* Ignore these.  */
-	continue;
-      case OPT_flto_:
-	{
-	  const char *lto_canonical = "-flto";
-	  switches.safe_push (lto_canonical);
-	  len += strlen (lto_canonical) + 1;
-	  break;
-	}
-      default:
-        if (cl_options[save_decoded_options[j].opt_index].flags
-	    & CL_NO_DWARF_RECORD)
-	  continue;
-        gcc_checking_assert (save_decoded_options[j].canonical_option[0][0]
-			     == '-');
-        switch (save_decoded_options[j].canonical_option[0][1])
-	  {
-	  case 'M':
-	  case 'i':
-	  case 'W':
-	    continue;
-	  case 'f':
-	    if (strncmp (save_decoded_options[j].canonical_option[0] + 2,
-			 "dump", 4) == 0)
-	      continue;
-	    break;
-	  default:
-	    break;
-	  }
-	switches.safe_push (save_decoded_options[j].orig_option_with_args_text);
-	len += strlen (save_decoded_options[j].orig_option_with_args_text) + 1;
-	break;
-      }
-
-  producer = XNEWVEC (char, plen + 1 + len + 1);
-  tail = producer;
-  sprintf (tail, "%s %s", language_string, version_string);
-  tail += plen;
-
-  FOR_EACH_VEC_ELT (switches, j, p)
-    {
-      len = strlen (p);
-      *tail = ' ';
-      memcpy (tail + 1, p, len);
-      tail += len + 1;
-    }
-
-  *tail = '\0';
-  return producer;
-}
-
 /* Given a C and/or C++ language/version string return the "highest".
    C++ is assumed to be "higher" than C in this case.  Used for merging
    LTO translation unit languages.  */
@@ -31986,7 +31876,20 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
-  producer_string = gen_producer_string ();
+  producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+
+  if (dwarf_record_gcc_switches)
+    {
+      char *producer_string_old = producer_string;
+      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	producer_string = concat (producer_string, " ",
+				  get_driver_command_line (), NULL);
+      else
+	producer_string = get_producer_string (lang_hooks.name,
+					       save_decoded_options,
+					       save_decoded_options_count);
+      free (producer_string_old);
+    }
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
 
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index b092c563f3d..20ff86e2af5 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -381,4 +381,11 @@ enum parloops_schedule_type
   PARLOOPS_SCHEDULE_RUNTIME
 };
 
+/* Record GCC options type.  */
+enum record_gcc_switches_format
+{
+  RECORD_GCC_SWITCHES_PROCESSED = 0,
+  RECORD_GCC_SWITCHES_DRIVER
+};
+
 #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 9f790db0daf..b4315750079 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,11 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv used to call gcc.  Necessary for
+   --record-gcc-command-line option.  */
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -3724,6 +3729,28 @@ set_source_date_epoch_envvar ()
   setenv ("SOURCE_DATE_EPOCH", source_date_epoch, 0);
 }
 
+/* Set GCC_DRIVER_COMMAND_LINE enviromental variable that is later
+   used by -frecord-gcc-switches option.  */
+
+static void
+set_driver_command_line_envvar ()
+{
+  unsigned int length = 0;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    length += strlen (driver_gcc_argv[i]) + 1;
+
+  char *buffer = (char *)xmalloc (length);
+  char *ptr = buffer;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    {
+      unsigned l = sprintf (ptr, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+      ptr += l;
+    }
+
+  setenv ("GCC_DRIVER_COMMAND_LINE", buffer, 0);
+  free (buffer);
+}
+
 /* Handle an option DECODED that is unknown to the option-processing
    machinery.  */
 
@@ -4296,6 +4323,8 @@ driver_handle_option (struct gcc_options *opts,
       break;
     }
 
+  set_driver_command_line_envvar ();
+
   if (do_save)
     save_switch (decoded->canonical_option[0],
 		 decoded->canonical_option_num_elements - 1,
@@ -7387,6 +7416,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -7430,6 +7460,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep command line for --record-gcc-command-line.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08f059..cde77fbaad7 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/opts.c b/gcc/opts.c
index ac160ed8404..e5ec6bef62a 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "spellcheck.h"
 #include "opt-suggestions.h"
 #include "diagnostic-color.h"
+#include "version.h"
 
 static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
 
@@ -3132,3 +3133,123 @@ get_option_url (diagnostic_context *, int option_index)
   else
     return NULL;
 }
+
+/* Return a heap allocated producer string including command line options.  */
+
+char *
+get_producer_string (const char *language_string, cl_decoded_option *options,
+		     unsigned int options_count)
+{
+  size_t j;
+  auto_vec<const char *> switches;
+  char *producer, *tail;
+  const char *p;
+  size_t len = 0;
+  size_t plen = strlen (language_string) + 1 + strlen (version_string);
+
+  for (j = 0; j < options_count; j++)
+    switch (options[j].opt_index)
+      {
+      case OPT_o:
+      case OPT_d:
+      case OPT_dumpbase:
+      case OPT_dumpdir:
+      case OPT_auxbase:
+      case OPT_auxbase_strip:
+      case OPT_quiet:
+      case OPT_version:
+      case OPT_v:
+      case OPT_w:
+      case OPT_L:
+      case OPT_D:
+      case OPT_I:
+      case OPT_U:
+      case OPT_SPECIAL_unknown:
+      case OPT_SPECIAL_ignore:
+      case OPT_SPECIAL_warn_removed:
+      case OPT_SPECIAL_program_name:
+      case OPT_SPECIAL_input_file:
+      case OPT_grecord_gcc_switches:
+      case OPT_frecord_gcc_switches:
+      case OPT_frecord_gcc_switches_format_:
+      case OPT__output_pch_:
+      case OPT_fdiagnostics_show_location_:
+      case OPT_fdiagnostics_show_option:
+      case OPT_fdiagnostics_show_caret:
+      case OPT_fdiagnostics_show_labels:
+      case OPT_fdiagnostics_show_line_numbers:
+      case OPT_fdiagnostics_color_:
+      case OPT_fdiagnostics_format_:
+      case OPT_fverbose_asm:
+      case OPT____:
+      case OPT__sysroot_:
+      case OPT_nostdinc:
+      case OPT_nostdinc__:
+      case OPT_fpreprocessed:
+      case OPT_fltrans_output_list_:
+      case OPT_fresolution_:
+      case OPT_fdebug_prefix_map_:
+      case OPT_fmacro_prefix_map_:
+      case OPT_ffile_prefix_map_:
+      case OPT_fcompare_debug:
+      case OPT_fchecking:
+      case OPT_fchecking_:
+	/* Ignore these.  */
+	continue;
+      case OPT_flto_:
+	{
+	  const char *lto_canonical = "-flto";
+	  switches.safe_push (lto_canonical);
+	  len += strlen (lto_canonical) + 1;
+	  break;
+	}
+      default:
+	if (cl_options[options[j].opt_index].flags
+	    & CL_NO_DWARF_RECORD)
+	  continue;
+	gcc_checking_assert (options[j].canonical_option[0][0] == '-');
+	switch (options[j].canonical_option[0][1])
+	  {
+	  case 'M':
+	  case 'i':
+	  case 'W':
+	    continue;
+	  case 'f':
+	    if (strncmp (options[j].canonical_option[0] + 2,
+			 "dump", 4) == 0)
+	      continue;
+	    break;
+	  default:
+	    break;
+	  }
+	switches.safe_push (options[j].orig_option_with_args_text);
+	len += strlen (options[j].orig_option_with_args_text) + 1;
+	break;
+      }
+
+  producer = XNEWVEC (char, plen + 1 + len + 1);
+  tail = producer;
+  sprintf (tail, "%s %s", language_string, version_string);
+  tail += plen;
+
+  FOR_EACH_VEC_ELT (switches, j, p)
+    {
+      len = strlen (p);
+      *tail = ' ';
+      memcpy (tail + 1, p, len);
+      tail += len + 1;
+    }
+
+  *tail = '\0';
+  return producer;
+}
+
+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  const char *cmdline = getenv ("GCC_DRIVER_COMMAND_LINE");
+  return cmdline != NULL ? cmdline : "";
+}
diff --git a/gcc/opts.h b/gcc/opts.h
index 8f594b46e33..fc3cd4b4596 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -465,6 +465,12 @@ extern void parse_options_from_collect_gcc_options (const char *, obstack *,
 
 extern void prepend_xassembler_to_collect_as_options (const char *, obstack *);
 
+extern char *get_producer_string (const char *language_string,
+				  cl_decoded_option *options,
+				  unsigned int options_count);
+
+extern const char *get_driver_command_line ();
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/target.def b/gcc/target.def
index b5e82ff826e..9cb9dab60ab 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -746,40 +746,7 @@ DEFHOOK
 (record_gcc_switches,
  "Provides the target with the ability to record the gcc command line\n\
 switches that have been passed to the compiler, and options that are\n\
-enabled.  The @var{type} argument specifies what is being recorded.\n\
-It can take the following values:\n\
-\n\
-@table @gcctabopt\n\
-@item SWITCH_TYPE_PASSED\n\
-@var{text} is a command line switch that has been set by the user.\n\
-\n\
-@item SWITCH_TYPE_ENABLED\n\
-@var{text} is an option which has been enabled.  This might be as a\n\
-direct result of a command line switch, or because it is enabled by\n\
-default or because it has been enabled as a side effect of a different\n\
-command line switch.  For example, the @option{-O2} switch enables\n\
-various different individual optimization passes.\n\
-\n\
-@item SWITCH_TYPE_DESCRIPTIVE\n\
-@var{text} is either NULL or some descriptive text which should be\n\
-ignored.  If @var{text} is NULL then it is being used to warn the\n\
-target hook that either recording is starting or ending.  The first\n\
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the\n\
-warning is for start up and the second time the warning is for\n\
-wind down.  This feature is to allow the target hook to make any\n\
-necessary preparations before it starts to record switches and to\n\
-perform any necessary tidying up after it has finished recording\n\
-switches.\n\
-\n\
-@item SWITCH_TYPE_LINE_START\n\
-This option can be ignored by this target hook.\n\
-\n\
-@item  SWITCH_TYPE_LINE_END\n\
-This option can be ignored by this target hook.\n\
-@end table\n\
-\n\
-The hook's return value must be zero.  Other return values may be\n\
-supported in the future.\n\
+enabled.\n\
 \n\
 By default this hook is set to NULL, but an example implementation is\n\
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},\n\
@@ -787,7 +754,7 @@ it records the switches as ASCII text inside a new, string mergeable\n\
 section in the assembler output file.  The name of the new section is\n\
 provided by the @code{TARGET_ASM_RECORD_GCC_SWITCHES_SECTION} target\n\
 hook.",
- int, (print_switch_type type, const char *text),
+ void, (void),
  NULL)
 
 /* The name of the section that the example ELF implementation of
diff --git a/gcc/target.h b/gcc/target.h
index 2f47c577d00..8421f78915f 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -68,16 +68,6 @@ union cumulative_args_t { void *p; };
 
 #endif /* !CHECKING_P */
 
-/* Types used by the record_gcc_switches() target function.  */
-enum print_switch_type
-{
-  SWITCH_TYPE_PASSED,		/* A switch passed on the command line.  */
-  SWITCH_TYPE_ENABLED,		/* An option that is currently enabled.  */
-  SWITCH_TYPE_DESCRIPTIVE,	/* Descriptive text, not a switch or option.  */
-  SWITCH_TYPE_LINE_START,	/* Please emit any necessary text at the start of a line.  */
-  SWITCH_TYPE_LINE_END		/* Please emit a line terminator.  */
-};
-
 /* Types of memory operation understood by the "by_pieces" infrastructure.
    Used by the TARGET_USE_BY_PIECES_INFRASTRUCTURE_P target hook and
    internally by the functions in expr.c.  */
@@ -96,10 +86,8 @@ extern unsigned HOST_WIDE_INT by_pieces_ninsns (unsigned HOST_WIDE_INT,
 						unsigned int,
 						by_pieces_operation);
 
-typedef int (* print_switch_fn_type) (print_switch_type, const char *);
-
 /* An example implementation for ELF targets.  Defined in varasm.c  */
-extern int elf_record_gcc_switches (print_switch_type type, const char *);
+extern void elf_record_gcc_switches (void);
 
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 4c8be502c71..4128a547ea4 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -114,9 +114,6 @@ static void compile_file (void);
 /* True if we don't need a backend (e.g. preprocessing only).  */
 static bool no_backend;
 
-/* Length of line when printing switch values.  */
-#define MAX_LINE 75
-
 /* Decoded options, and number of such options.  */
 struct cl_decoded_option *save_decoded_options;
 unsigned int save_decoded_options_count;
@@ -684,149 +681,6 @@ print_version (FILE *file, const char *indent, bool show_global_state)
     }
 }
 
-static int
-print_to_asm_out_file (print_switch_type type, const char * text)
-{
-  bool prepend_sep = true;
-
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', asm_out_file);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      fputs (ASM_COMMENT_START, asm_out_file);
-      return strlen (ASM_COMMENT_START);
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (ASM_COMMENT_START[0] == 0)
-	prepend_sep = false;
-      /* FALLTHRU */
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      if (prepend_sep)
-	fputc (' ', asm_out_file);
-      fputs (text, asm_out_file);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-static int
-print_to_stderr (print_switch_type type, const char * text)
-{
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', stderr);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      return 0;
-
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      fputc (' ', stderr);
-      /* FALLTHRU */
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      fputs (text, stderr);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-/* Print an option value and return the adjusted position in the line.
-   ??? print_fn doesn't handle errors, eg disk full; presumably other
-   code will catch a disk full though.  */
-
-static int
-print_single_switch (print_switch_fn_type print_fn,
-		     int pos,
-		     print_switch_type type,
-		     const char * text)
-{
-  /* The ultrix fprintf returns 0 on success, so compute the result
-     we want here since we need it for the following test.  The +1
-     is for the separator character that will probably be emitted.  */
-  int len = strlen (text) + 1;
-
-  if (pos != 0
-      && pos + len > MAX_LINE)
-    {
-      print_fn (SWITCH_TYPE_LINE_END, NULL);
-      pos = 0;
-    }
-
-  if (pos == 0)
-    pos += print_fn (SWITCH_TYPE_LINE_START, NULL);
-
-  print_fn (type, text);
-  return pos + len;
-}
-
-/* Print active target switches using PRINT_FN.
-   POS is the current cursor position and MAX is the size of a "line".
-   Each line begins with INDENT and ends with TERM.
-   Each switch is separated from the next by SEP.  */
-
-static void
-print_switch_values (print_switch_fn_type print_fn)
-{
-  int pos = 0;
-  size_t j;
-
-  /* Print the options as passed.  */
-  pos = print_single_switch (print_fn, pos,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options passed: "));
-
-  for (j = 1; j < save_decoded_options_count; j++)
-    {
-      switch (save_decoded_options[j].opt_index)
-	{
-	case OPT_o:
-	case OPT_d:
-	case OPT_dumpbase:
-	case OPT_dumpdir:
-	case OPT_auxbase:
-	case OPT_quiet:
-	case OPT_version:
-	  /* Ignore these.  */
-	  continue;
-	}
-
-      pos = print_single_switch (print_fn, pos, SWITCH_TYPE_PASSED,
-				 save_decoded_options[j].orig_option_with_args_text);
-    }
-
-  if (pos > 0)
-    print_fn (SWITCH_TYPE_LINE_END, NULL);
-
-  /* Print the -f and -m options that have been enabled.
-     We don't handle language specific options but printing argv
-     should suffice.  */
-  pos = print_single_switch (print_fn, 0,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options enabled: "));
-
-  unsigned lang_mask = lang_hooks.option_lang_mask ();
-  for (j = 0; j < cl_options_count; j++)
-    if (cl_options[j].cl_report
-	&& option_enabled (j, lang_mask, &global_options) > 0)
-      pos = print_single_switch (print_fn, pos,
-				 SWITCH_TYPE_ENABLED, cl_options[j].opt_text);
-
-  print_fn (SWITCH_TYPE_LINE_END, NULL);
-}
-
 /* Open assembly code output file.  Do this even if -fsyntax-only is
    on, because then the driver will have provided the name of a
    temporary file or bit bucket for us.  NAME is the file specified on
@@ -871,16 +725,7 @@ init_asm_output (const char *name)
       if (flag_record_gcc_switches)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
-	    {
-	      /* Let the target know that we are about to start recording.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	      /* Now record the switches.  */
-	      print_switch_values (targetm.asm_out.record_gcc_switches);
-	      /* Let the target know that the recording is over.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	    }
+	    targetm.asm_out.record_gcc_switches ();
 	  else
 	    inform (UNKNOWN_LOCATION,
 		    "%<-frecord-gcc-switches%> is not supported by "
@@ -889,11 +734,16 @@ init_asm_output (const char *name)
 
       if (flag_verbose_asm)
 	{
-	  /* Print the list of switches in effect
-	     into the assembler file as comments.  */
 	  print_version (asm_out_file, ASM_COMMENT_START, true);
-	  print_switch_values (print_to_asm_out_file);
-	  putc ('\n', asm_out_file);
+	  fputs (ASM_COMMENT_START, asm_out_file);
+	  fputc (' ', asm_out_file);
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), asm_out_file);
+	  else
+	    fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count),
+		   asm_out_file);
+	  fputc ('\n', asm_out_file);
 	}
     }
 }
@@ -1520,8 +1370,14 @@ process_options (void)
   if (version_flag)
     {
       print_version (stderr, "", true);
-      if (! quiet_flag)
-	print_switch_values (print_to_stderr);
+      if (!quiet_flag)
+	{
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), stderr);
+	  else
+	    fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count), stderr);
+	}
     }
 
   if (flag_syntax_only)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index dc6da6c0b5b..1b23b5f4cc4 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -57,6 +58,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "asan.h"
 #include "rtl-iter.h"
 #include "file-prefix-map.h" /* remap_debug_filename()  */
+#include "toplev.h"
+#include "opts.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data declarations.  */
@@ -7803,45 +7806,29 @@ output_object_blocks (void)
    we want to emit NUL strings terminators into the object file we have to use
    ASM_OUTPUT_SKIP.  */
 
-int
-elf_record_gcc_switches (print_switch_type type, const char * name)
+void
+elf_record_gcc_switches ()
 {
-  switch (type)
-    {
-    case SWITCH_TYPE_PASSED:
-      ASM_OUTPUT_ASCII (asm_out_file, name, strlen (name));
-      ASM_OUTPUT_SKIP (asm_out_file, HOST_WIDE_INT_1U);
-      break;
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (name == NULL)
-	{
-	  /* Distinguish between invocations where name is NULL.  */
-	  static bool started = false;
-
-	  if (!started)
-	    {
-	      section * sec;
-
-	      sec = get_section (targetm.asm_out.record_gcc_switches_section,
-				 SECTION_DEBUG
-				 | SECTION_MERGE
-				 | SECTION_STRINGS
-				 | (SECTION_ENTSIZE & 1),
-				 NULL);
-	      switch_to_section (sec);
-	      started = true;
-	    }
-	}
+  section *sec = get_section (targetm.asm_out.record_gcc_switches_section,
+			      SECTION_DEBUG | SECTION_MERGE
+			      | SECTION_STRINGS | (SECTION_ENTSIZE & 1), NULL);
+  switch_to_section (sec);
 
-    default:
-      break;
+  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+    {
+      ASM_OUTPUT_ASCII (asm_out_file, version_string, strlen (version_string));
+      ASM_OUTPUT_ASCII (asm_out_file, " ", 1);
+      const char *cmdline = get_driver_command_line ();
+      ASM_OUTPUT_ASCII (asm_out_file, cmdline, strlen (cmdline) + 1);
+    }
+  else
+    {
+      const char *producer_string
+	= get_producer_string (lang_hooks.name, save_decoded_options,
+			       save_decoded_options_count);
+      ASM_OUTPUT_ASCII (asm_out_file, producer_string,
+			strlen (producer_string) + 1);
     }
-
-  /* The return value is currently ignored by the caller, but must be 0.
-     For -fverbose-asm the return value would be the number of characters
-     emitted into the assembler file.  */
-  return 0;
 }
 
 /* Emit text to declare externally defined symbols. It is needed to
-- 
2.25.1

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Egeyar Bagcioglu]

Hi Martin,

I like the patch. It definitely serves our purposes at Oracle and 
provides another way to do what my previous patches did as well.

1) It keeps the backwards compatibility regarding -frecord-gcc-switches; 
therefore, removes my related doubts about your previous patch.

2) It still makes use of -frecord-gcc-switches. The new option is only 
to control the format. This addresses some previous objections to having 
a new option doing something similar. Now the new option controls the 
behaviour of the existing one and that behaviour can be further extended.

3) It uses an environment variable as Jakub suggested.

The patch looks good and I confirm that it works for our purposes.

Having said that, I have to ask for recognition in this patch for my and 
my company's contributions. Can you please keep my name and my work 
email in the changelog and in the commit message?

Thanks
Egeyar



On 3/17/20 2:53 PM, Martin Liška wrote:
> Hi.
>
> I'm sending enhanced patch that makes the following changes:
> - a new option -frecord-gcc-switches-format is added; the option
>   selects format (processed, driver) for all options that record
>   GCC command line
> - Dwarf gen_produce_string is now used in -fverbose-asm
> - The .s file is affected in the following way:
>
> BEFORE:
>
> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 
> 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
> #    compiled by GNU C version 9.2.1 20200128 [revision 
> 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR 
> version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>
> # GGC heuristics: --param ggc-min-expand=100 --param 
> ggc-min-heapsize=131072
> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi 
> -mno-sgx
> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 
> -msse4.1
> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er 
> -mno-avx512cd
> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma 
> -mno-avx512vbmi
> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero 
> -mno-pku
> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
> # -fira-share-spill-slots -fivopts -fkeep-static-consts
> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
> # -frecord-gcc-switches -freg-struct-return 
> -fsched-critical-path-heuristic
> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math 
> -ftree-cselim
> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im 
> -ftree-loop-ivcanon
> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 
> -m80387
> # -mabm -madx -maes -malign-stringops -mavx -mavx2
> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero 
> -mcx16
> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>
> AFTER:
>
> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx 
> -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe 
> -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop 
> -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 
> -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase 
> -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f 
> -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 
> -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw 
> -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps 
> -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid 
> -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes 
> -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b 
> -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd 
> -mno-avx512vp2intersect --param=l1-cache-size=32 
> --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>
> That's the biggest change I made, but I hope it's acceptable.
> Apart from that the patch simplifies and unifies places where 
> save_decoded_options
> options are transformed back to string representation.
>
> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>
> Ready to be installed in next stage1?
> Thanks,
> Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 6252 bytes --]

On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
> Hi Martin,
> 
> I like the patch. It definitely serves our purposes at Oracle and provides another way to do what my previous patches did as well.
> 
> 1) It keeps the backwards compatibility regarding -frecord-gcc-switches; therefore, removes my related doubts about your previous patch.
> 
> 2) It still makes use of -frecord-gcc-switches. The new option is only to control the format. This addresses some previous objections to having a new option doing something similar. Now the new option controls the behaviour of the existing one and that behaviour can be further extended.
> 
> 3) It uses an environment variable as Jakub suggested.
> 
> The patch looks good and I confirm that it works for our purposes.

Hello.

Thank you for the support.

> 
> Having said that, I have to ask for recognition in this patch for my and my company's contributions. Can you please keep my name and my work email in the changelog and in the commit message?

Sure, sorry I forgot.

Martin

> 
> Thanks
> Egeyar
> 
> 
> 
> On 3/17/20 2:53 PM, Martin Liška wrote:
>> Hi.
>>
>> I'm sending enhanced patch that makes the following changes:
>> - a new option -frecord-gcc-switches-format is added; the option
>>   selects format (processed, driver) for all options that record
>>   GCC command line
>> - Dwarf gen_produce_string is now used in -fverbose-asm
>> - The .s file is affected in the following way:
>>
>> BEFORE:
>>
>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>> #    compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>
>> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>> # -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
>> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>>
>> AFTER:
>>
>> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>>
>> That's the biggest change I made, but I hope it's acceptable.
>> Apart from that the patch simplifies and unifies places where save_decoded_options
>> options are transformed back to string representation.
>>
>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>
>> Ready to be installed in next stage1?
>> Thanks,
>> Martin
> 


[-- Attachment #2: 0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch --]
[-- Type: text/x-patch, Size: 31710 bytes --]

From 60653c2c37d8c2f0eec171c3ab9a1b7487b82e0f Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 5 Mar 2020 09:39:17 +0100
Subject: [PATCH] Change semantics of -frecord-gcc-switches and add
 -frecord-gcc-switches-format.

gcc/ChangeLog:

2020-03-17  Martin Liska  <mliska@suse.cz>
	    Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* common.opt: Add new option -frecord-gcc-switches-format.
	* doc/invoke.texi: Document the new option.
	* doc/tm.texi: Remove print_switch_type documentation
	entry.
	* dwarf2out.c (gen_producer_string): Move to varasm.c
	and ignore also OPT_frecord_gcc_switches and
	OPT_frecord_gcc_switches_format_.
	(dwarf2out_early_finish): Print corresponding producer format string.
	* flag-types.h (enum record_gcc_switches_format):
	* gcc.c (set_driver_command_line_envvar): New function.
	(driver_handle_option): Always save command line options.
	(driver::main): Save command line.
	(driver::set_commandline): New.
	* gcc.h (driver::set_commandline): New.
	* opts.c (get_producer_string): Moved from dwarf2out.c.
	(get_driver_command_line): New function.
	* opts.h (get_producer_string): New.
	(get_driver_command_line): Likewise.
	* target.def: Remove documentation foor print_switch_type.
	* target.h (enum print_switch_type):  Remove.
	(elf_record_gcc_switches): Change to void type.
	* toplev.c (MAX_LINE): Remove.
	(print_to_asm_out_file): Remove.
	(print_to_stderr): Remove.
	(print_single_switch): Likewise.
	(print_switch_values): Likewise.
	(init_asm_output): Call directly record_gcc_switches.
	(process_options): Print options to stderr.
	* varasm.c (elf_record_gcc_switches): Support
	new flag_record_gcc_switches_format option.
---
 gcc/common.opt      |  15 +++-
 gcc/doc/invoke.texi |  23 +++++-
 gcc/doc/tm.texi     |  37 +--------
 gcc/dwarf2out.c     | 125 ++++--------------------------
 gcc/flag-types.h    |   7 ++
 gcc/gcc.c           |  39 ++++++++++
 gcc/gcc.h           |   1 +
 gcc/opts.c          | 121 +++++++++++++++++++++++++++++
 gcc/opts.h          |   6 ++
 gcc/target.def      |  37 +--------
 gcc/target.h        |  14 +---
 gcc/toplev.c        | 180 +++++---------------------------------------
 gcc/varasm.c        |  59 ++++++---------
 13 files changed, 270 insertions(+), 394 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index 4368910cb54..7809c734ee1 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2246,9 +2246,22 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Driver Report Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
+Enum
+Name(record_gcc_switches_format) Type(enum record_gcc_switches_format)
+
+EnumValue
+Enum(record_gcc_switches_format) String(processed) Value(RECORD_GCC_SWITCHES_PROCESSED)
+
+EnumValue
+Enum(record_gcc_switches_format) String(driver) Value(RECORD_GCC_SWITCHES_DRIVER)
+
+frecord-gcc-switches-format=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_format) Enum(record_gcc_switches_format) Init(RECORD_GCC_SWITCHES_PROCESSED)
+-frecord-gcc-switches-format=[processed|driver]	Format of recorded gcc command line switches.
+
 freg-struct-return
 Common Report Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 96a95162696..7925990e320 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -622,7 +622,7 @@ Objective-C and Objective-C++ Dialects}.
 -finhibit-size-directive  -fcommon  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC  -fpie  -fPIE  -fno-plt @gol
 -fno-jump-tables @gol
--frecord-gcc-switches @gol
+-frecord-gcc-switches -frecord-gcc-switches-format @gol
 -freg-struct-return  -fshort-enums  -fshort-wchar @gol
 -fverbose-asm  -fpack-struct[=@var{n}]  @gol
 -fleading-underscore  -ftls-model=@var{model} @gol
@@ -15070,6 +15070,27 @@ comments, so it never reaches the object file.
 See also @option{-grecord-gcc-switches} for another
 way of storing compiler options into the object file.
 
+@item -frecord-gcc-switches-format=@var{format}
+@opindex frecord-gcc-switches-format
+This switch controls the output format of options that record
+the command line.  The affected options are @option{-frecord-gcc-switches},
+@option{-grecord-gcc-switches} and @option{-fverbose-asm}.
+
+The @var{format} argument should be one of the following:
+
+@table @samp
+
+@item processed
+
+Options are printed after processing by the compiler driver.
+It is the default option value.
+
+@item driver
+
+Options are printed as provided to the compiler driver.
+
+@end table
+
 @item -fpic
 @opindex fpic
 @cindex global offset table
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 3560cfae74f..56d493eed21 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8061,43 +8061,10 @@ need to override this if your target has special flags that might be
 set via @code{__attribute__}.
 @end deftypefn
 
-@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_SWITCHES (print_switch_type @var{type}, const char *@var{text})
+@deftypefn {Target Hook} void TARGET_ASM_RECORD_GCC_SWITCHES (void)
 Provides the target with the ability to record the gcc command line
 switches that have been passed to the compiler, and options that are
-enabled.  The @var{type} argument specifies what is being recorded.
-It can take the following values:
-
-@table @gcctabopt
-@item SWITCH_TYPE_PASSED
-@var{text} is a command line switch that has been set by the user.
-
-@item SWITCH_TYPE_ENABLED
-@var{text} is an option which has been enabled.  This might be as a
-direct result of a command line switch, or because it is enabled by
-default or because it has been enabled as a side effect of a different
-command line switch.  For example, the @option{-O2} switch enables
-various different individual optimization passes.
-
-@item SWITCH_TYPE_DESCRIPTIVE
-@var{text} is either NULL or some descriptive text which should be
-ignored.  If @var{text} is NULL then it is being used to warn the
-target hook that either recording is starting or ending.  The first
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the
-warning is for start up and the second time the warning is for
-wind down.  This feature is to allow the target hook to make any
-necessary preparations before it starts to record switches and to
-perform any necessary tidying up after it has finished recording
-switches.
-
-@item SWITCH_TYPE_LINE_START
-This option can be ignored by this target hook.
-
-@item  SWITCH_TYPE_LINE_END
-This option can be ignored by this target hook.
-@end table
-
-The hook's return value must be zero.  Other return values may be
-supported in the future.
+enabled.
 
 By default this hook is set to NULL, but an example implementation is
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index bb45279ea56..2e8ed4e946d 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24314,116 +24314,6 @@ gen_ptr_to_mbr_type_die (tree type, dw_die_ref context_die)
 
 static char *producer_string;
 
-/* Return a heap allocated producer string including command line options
-   if -grecord-gcc-switches.  */
-
-static char *
-gen_producer_string (void)
-{
-  size_t j;
-  auto_vec<const char *> switches;
-  const char *language_string = lang_hooks.name;
-  char *producer, *tail;
-  const char *p;
-  size_t len = dwarf_record_gcc_switches ? 0 : 3;
-  size_t plen = strlen (language_string) + 1 + strlen (version_string);
-
-  for (j = 1; dwarf_record_gcc_switches && j < save_decoded_options_count; j++)
-    switch (save_decoded_options[j].opt_index)
-      {
-      case OPT_o:
-      case OPT_d:
-      case OPT_dumpbase:
-      case OPT_dumpdir:
-      case OPT_auxbase:
-      case OPT_auxbase_strip:
-      case OPT_quiet:
-      case OPT_version:
-      case OPT_v:
-      case OPT_w:
-      case OPT_L:
-      case OPT_D:
-      case OPT_I:
-      case OPT_U:
-      case OPT_SPECIAL_unknown:
-      case OPT_SPECIAL_ignore:
-      case OPT_SPECIAL_warn_removed:
-      case OPT_SPECIAL_program_name:
-      case OPT_SPECIAL_input_file:
-      case OPT_grecord_gcc_switches:
-      case OPT__output_pch_:
-      case OPT_fdiagnostics_show_location_:
-      case OPT_fdiagnostics_show_option:
-      case OPT_fdiagnostics_show_caret:
-      case OPT_fdiagnostics_show_labels:
-      case OPT_fdiagnostics_show_line_numbers:
-      case OPT_fdiagnostics_color_:
-      case OPT_fdiagnostics_format_:
-      case OPT_fverbose_asm:
-      case OPT____:
-      case OPT__sysroot_:
-      case OPT_nostdinc:
-      case OPT_nostdinc__:
-      case OPT_fpreprocessed:
-      case OPT_fltrans_output_list_:
-      case OPT_fresolution_:
-      case OPT_fdebug_prefix_map_:
-      case OPT_fmacro_prefix_map_:
-      case OPT_ffile_prefix_map_:
-      case OPT_fcompare_debug:
-      case OPT_fchecking:
-      case OPT_fchecking_:
-	/* Ignore these.  */
-	continue;
-      case OPT_flto_:
-	{
-	  const char *lto_canonical = "-flto";
-	  switches.safe_push (lto_canonical);
-	  len += strlen (lto_canonical) + 1;
-	  break;
-	}
-      default:
-        if (cl_options[save_decoded_options[j].opt_index].flags
-	    & CL_NO_DWARF_RECORD)
-	  continue;
-        gcc_checking_assert (save_decoded_options[j].canonical_option[0][0]
-			     == '-');
-        switch (save_decoded_options[j].canonical_option[0][1])
-	  {
-	  case 'M':
-	  case 'i':
-	  case 'W':
-	    continue;
-	  case 'f':
-	    if (strncmp (save_decoded_options[j].canonical_option[0] + 2,
-			 "dump", 4) == 0)
-	      continue;
-	    break;
-	  default:
-	    break;
-	  }
-	switches.safe_push (save_decoded_options[j].orig_option_with_args_text);
-	len += strlen (save_decoded_options[j].orig_option_with_args_text) + 1;
-	break;
-      }
-
-  producer = XNEWVEC (char, plen + 1 + len + 1);
-  tail = producer;
-  sprintf (tail, "%s %s", language_string, version_string);
-  tail += plen;
-
-  FOR_EACH_VEC_ELT (switches, j, p)
-    {
-      len = strlen (p);
-      *tail = ' ';
-      memcpy (tail + 1, p, len);
-      tail += len + 1;
-    }
-
-  *tail = '\0';
-  return producer;
-}
-
 /* Given a C and/or C++ language/version string return the "highest".
    C++ is assumed to be "higher" than C in this case.  Used for merging
    LTO translation unit languages.  */
@@ -31986,7 +31876,20 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
-  producer_string = gen_producer_string ();
+  producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+
+  if (dwarf_record_gcc_switches)
+    {
+      char *producer_string_old = producer_string;
+      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	producer_string = concat (producer_string, " ",
+				  get_driver_command_line (), NULL);
+      else
+	producer_string = get_producer_string (lang_hooks.name,
+					       save_decoded_options,
+					       save_decoded_options_count);
+      free (producer_string_old);
+    }
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
 
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index b092c563f3d..20ff86e2af5 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -381,4 +381,11 @@ enum parloops_schedule_type
   PARLOOPS_SCHEDULE_RUNTIME
 };
 
+/* Record GCC options type.  */
+enum record_gcc_switches_format
+{
+  RECORD_GCC_SWITCHES_PROCESSED = 0,
+  RECORD_GCC_SWITCHES_DRIVER
+};
+
 #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 9f790db0daf..b4315750079 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,11 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv used to call gcc.  Necessary for
+   --record-gcc-command-line option.  */
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -3724,6 +3729,28 @@ set_source_date_epoch_envvar ()
   setenv ("SOURCE_DATE_EPOCH", source_date_epoch, 0);
 }
 
+/* Set GCC_DRIVER_COMMAND_LINE enviromental variable that is later
+   used by -frecord-gcc-switches option.  */
+
+static void
+set_driver_command_line_envvar ()
+{
+  unsigned int length = 0;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    length += strlen (driver_gcc_argv[i]) + 1;
+
+  char *buffer = (char *)xmalloc (length);
+  char *ptr = buffer;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    {
+      unsigned l = sprintf (ptr, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+      ptr += l;
+    }
+
+  setenv ("GCC_DRIVER_COMMAND_LINE", buffer, 0);
+  free (buffer);
+}
+
 /* Handle an option DECODED that is unknown to the option-processing
    machinery.  */
 
@@ -4296,6 +4323,8 @@ driver_handle_option (struct gcc_options *opts,
       break;
     }
 
+  set_driver_command_line_envvar ();
+
   if (do_save)
     save_switch (decoded->canonical_option[0],
 		 decoded->canonical_option_num_elements - 1,
@@ -7387,6 +7416,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -7430,6 +7460,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep command line for --record-gcc-command-line.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08f059..cde77fbaad7 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/opts.c b/gcc/opts.c
index ac160ed8404..e5ec6bef62a 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "spellcheck.h"
 #include "opt-suggestions.h"
 #include "diagnostic-color.h"
+#include "version.h"
 
 static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
 
@@ -3132,3 +3133,123 @@ get_option_url (diagnostic_context *, int option_index)
   else
     return NULL;
 }
+
+/* Return a heap allocated producer string including command line options.  */
+
+char *
+get_producer_string (const char *language_string, cl_decoded_option *options,
+		     unsigned int options_count)
+{
+  size_t j;
+  auto_vec<const char *> switches;
+  char *producer, *tail;
+  const char *p;
+  size_t len = 0;
+  size_t plen = strlen (language_string) + 1 + strlen (version_string);
+
+  for (j = 0; j < options_count; j++)
+    switch (options[j].opt_index)
+      {
+      case OPT_o:
+      case OPT_d:
+      case OPT_dumpbase:
+      case OPT_dumpdir:
+      case OPT_auxbase:
+      case OPT_auxbase_strip:
+      case OPT_quiet:
+      case OPT_version:
+      case OPT_v:
+      case OPT_w:
+      case OPT_L:
+      case OPT_D:
+      case OPT_I:
+      case OPT_U:
+      case OPT_SPECIAL_unknown:
+      case OPT_SPECIAL_ignore:
+      case OPT_SPECIAL_warn_removed:
+      case OPT_SPECIAL_program_name:
+      case OPT_SPECIAL_input_file:
+      case OPT_grecord_gcc_switches:
+      case OPT_frecord_gcc_switches:
+      case OPT_frecord_gcc_switches_format_:
+      case OPT__output_pch_:
+      case OPT_fdiagnostics_show_location_:
+      case OPT_fdiagnostics_show_option:
+      case OPT_fdiagnostics_show_caret:
+      case OPT_fdiagnostics_show_labels:
+      case OPT_fdiagnostics_show_line_numbers:
+      case OPT_fdiagnostics_color_:
+      case OPT_fdiagnostics_format_:
+      case OPT_fverbose_asm:
+      case OPT____:
+      case OPT__sysroot_:
+      case OPT_nostdinc:
+      case OPT_nostdinc__:
+      case OPT_fpreprocessed:
+      case OPT_fltrans_output_list_:
+      case OPT_fresolution_:
+      case OPT_fdebug_prefix_map_:
+      case OPT_fmacro_prefix_map_:
+      case OPT_ffile_prefix_map_:
+      case OPT_fcompare_debug:
+      case OPT_fchecking:
+      case OPT_fchecking_:
+	/* Ignore these.  */
+	continue;
+      case OPT_flto_:
+	{
+	  const char *lto_canonical = "-flto";
+	  switches.safe_push (lto_canonical);
+	  len += strlen (lto_canonical) + 1;
+	  break;
+	}
+      default:
+	if (cl_options[options[j].opt_index].flags
+	    & CL_NO_DWARF_RECORD)
+	  continue;
+	gcc_checking_assert (options[j].canonical_option[0][0] == '-');
+	switch (options[j].canonical_option[0][1])
+	  {
+	  case 'M':
+	  case 'i':
+	  case 'W':
+	    continue;
+	  case 'f':
+	    if (strncmp (options[j].canonical_option[0] + 2,
+			 "dump", 4) == 0)
+	      continue;
+	    break;
+	  default:
+	    break;
+	  }
+	switches.safe_push (options[j].orig_option_with_args_text);
+	len += strlen (options[j].orig_option_with_args_text) + 1;
+	break;
+      }
+
+  producer = XNEWVEC (char, plen + 1 + len + 1);
+  tail = producer;
+  sprintf (tail, "%s %s", language_string, version_string);
+  tail += plen;
+
+  FOR_EACH_VEC_ELT (switches, j, p)
+    {
+      len = strlen (p);
+      *tail = ' ';
+      memcpy (tail + 1, p, len);
+      tail += len + 1;
+    }
+
+  *tail = '\0';
+  return producer;
+}
+
+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  const char *cmdline = getenv ("GCC_DRIVER_COMMAND_LINE");
+  return cmdline != NULL ? cmdline : "";
+}
diff --git a/gcc/opts.h b/gcc/opts.h
index 8f594b46e33..fc3cd4b4596 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -465,6 +465,12 @@ extern void parse_options_from_collect_gcc_options (const char *, obstack *,
 
 extern void prepend_xassembler_to_collect_as_options (const char *, obstack *);
 
+extern char *get_producer_string (const char *language_string,
+				  cl_decoded_option *options,
+				  unsigned int options_count);
+
+extern const char *get_driver_command_line ();
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/target.def b/gcc/target.def
index b5e82ff826e..9cb9dab60ab 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -746,40 +746,7 @@ DEFHOOK
 (record_gcc_switches,
  "Provides the target with the ability to record the gcc command line\n\
 switches that have been passed to the compiler, and options that are\n\
-enabled.  The @var{type} argument specifies what is being recorded.\n\
-It can take the following values:\n\
-\n\
-@table @gcctabopt\n\
-@item SWITCH_TYPE_PASSED\n\
-@var{text} is a command line switch that has been set by the user.\n\
-\n\
-@item SWITCH_TYPE_ENABLED\n\
-@var{text} is an option which has been enabled.  This might be as a\n\
-direct result of a command line switch, or because it is enabled by\n\
-default or because it has been enabled as a side effect of a different\n\
-command line switch.  For example, the @option{-O2} switch enables\n\
-various different individual optimization passes.\n\
-\n\
-@item SWITCH_TYPE_DESCRIPTIVE\n\
-@var{text} is either NULL or some descriptive text which should be\n\
-ignored.  If @var{text} is NULL then it is being used to warn the\n\
-target hook that either recording is starting or ending.  The first\n\
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the\n\
-warning is for start up and the second time the warning is for\n\
-wind down.  This feature is to allow the target hook to make any\n\
-necessary preparations before it starts to record switches and to\n\
-perform any necessary tidying up after it has finished recording\n\
-switches.\n\
-\n\
-@item SWITCH_TYPE_LINE_START\n\
-This option can be ignored by this target hook.\n\
-\n\
-@item  SWITCH_TYPE_LINE_END\n\
-This option can be ignored by this target hook.\n\
-@end table\n\
-\n\
-The hook's return value must be zero.  Other return values may be\n\
-supported in the future.\n\
+enabled.\n\
 \n\
 By default this hook is set to NULL, but an example implementation is\n\
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},\n\
@@ -787,7 +754,7 @@ it records the switches as ASCII text inside a new, string mergeable\n\
 section in the assembler output file.  The name of the new section is\n\
 provided by the @code{TARGET_ASM_RECORD_GCC_SWITCHES_SECTION} target\n\
 hook.",
- int, (print_switch_type type, const char *text),
+ void, (void),
  NULL)
 
 /* The name of the section that the example ELF implementation of
diff --git a/gcc/target.h b/gcc/target.h
index 2f47c577d00..8421f78915f 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -68,16 +68,6 @@ union cumulative_args_t { void *p; };
 
 #endif /* !CHECKING_P */
 
-/* Types used by the record_gcc_switches() target function.  */
-enum print_switch_type
-{
-  SWITCH_TYPE_PASSED,		/* A switch passed on the command line.  */
-  SWITCH_TYPE_ENABLED,		/* An option that is currently enabled.  */
-  SWITCH_TYPE_DESCRIPTIVE,	/* Descriptive text, not a switch or option.  */
-  SWITCH_TYPE_LINE_START,	/* Please emit any necessary text at the start of a line.  */
-  SWITCH_TYPE_LINE_END		/* Please emit a line terminator.  */
-};
-
 /* Types of memory operation understood by the "by_pieces" infrastructure.
    Used by the TARGET_USE_BY_PIECES_INFRASTRUCTURE_P target hook and
    internally by the functions in expr.c.  */
@@ -96,10 +86,8 @@ extern unsigned HOST_WIDE_INT by_pieces_ninsns (unsigned HOST_WIDE_INT,
 						unsigned int,
 						by_pieces_operation);
 
-typedef int (* print_switch_fn_type) (print_switch_type, const char *);
-
 /* An example implementation for ELF targets.  Defined in varasm.c  */
-extern int elf_record_gcc_switches (print_switch_type type, const char *);
+extern void elf_record_gcc_switches (void);
 
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 4c8be502c71..4128a547ea4 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -114,9 +114,6 @@ static void compile_file (void);
 /* True if we don't need a backend (e.g. preprocessing only).  */
 static bool no_backend;
 
-/* Length of line when printing switch values.  */
-#define MAX_LINE 75
-
 /* Decoded options, and number of such options.  */
 struct cl_decoded_option *save_decoded_options;
 unsigned int save_decoded_options_count;
@@ -684,149 +681,6 @@ print_version (FILE *file, const char *indent, bool show_global_state)
     }
 }
 
-static int
-print_to_asm_out_file (print_switch_type type, const char * text)
-{
-  bool prepend_sep = true;
-
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', asm_out_file);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      fputs (ASM_COMMENT_START, asm_out_file);
-      return strlen (ASM_COMMENT_START);
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (ASM_COMMENT_START[0] == 0)
-	prepend_sep = false;
-      /* FALLTHRU */
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      if (prepend_sep)
-	fputc (' ', asm_out_file);
-      fputs (text, asm_out_file);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-static int
-print_to_stderr (print_switch_type type, const char * text)
-{
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', stderr);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      return 0;
-
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      fputc (' ', stderr);
-      /* FALLTHRU */
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      fputs (text, stderr);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-/* Print an option value and return the adjusted position in the line.
-   ??? print_fn doesn't handle errors, eg disk full; presumably other
-   code will catch a disk full though.  */
-
-static int
-print_single_switch (print_switch_fn_type print_fn,
-		     int pos,
-		     print_switch_type type,
-		     const char * text)
-{
-  /* The ultrix fprintf returns 0 on success, so compute the result
-     we want here since we need it for the following test.  The +1
-     is for the separator character that will probably be emitted.  */
-  int len = strlen (text) + 1;
-
-  if (pos != 0
-      && pos + len > MAX_LINE)
-    {
-      print_fn (SWITCH_TYPE_LINE_END, NULL);
-      pos = 0;
-    }
-
-  if (pos == 0)
-    pos += print_fn (SWITCH_TYPE_LINE_START, NULL);
-
-  print_fn (type, text);
-  return pos + len;
-}
-
-/* Print active target switches using PRINT_FN.
-   POS is the current cursor position and MAX is the size of a "line".
-   Each line begins with INDENT and ends with TERM.
-   Each switch is separated from the next by SEP.  */
-
-static void
-print_switch_values (print_switch_fn_type print_fn)
-{
-  int pos = 0;
-  size_t j;
-
-  /* Print the options as passed.  */
-  pos = print_single_switch (print_fn, pos,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options passed: "));
-
-  for (j = 1; j < save_decoded_options_count; j++)
-    {
-      switch (save_decoded_options[j].opt_index)
-	{
-	case OPT_o:
-	case OPT_d:
-	case OPT_dumpbase:
-	case OPT_dumpdir:
-	case OPT_auxbase:
-	case OPT_quiet:
-	case OPT_version:
-	  /* Ignore these.  */
-	  continue;
-	}
-
-      pos = print_single_switch (print_fn, pos, SWITCH_TYPE_PASSED,
-				 save_decoded_options[j].orig_option_with_args_text);
-    }
-
-  if (pos > 0)
-    print_fn (SWITCH_TYPE_LINE_END, NULL);
-
-  /* Print the -f and -m options that have been enabled.
-     We don't handle language specific options but printing argv
-     should suffice.  */
-  pos = print_single_switch (print_fn, 0,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options enabled: "));
-
-  unsigned lang_mask = lang_hooks.option_lang_mask ();
-  for (j = 0; j < cl_options_count; j++)
-    if (cl_options[j].cl_report
-	&& option_enabled (j, lang_mask, &global_options) > 0)
-      pos = print_single_switch (print_fn, pos,
-				 SWITCH_TYPE_ENABLED, cl_options[j].opt_text);
-
-  print_fn (SWITCH_TYPE_LINE_END, NULL);
-}
-
 /* Open assembly code output file.  Do this even if -fsyntax-only is
    on, because then the driver will have provided the name of a
    temporary file or bit bucket for us.  NAME is the file specified on
@@ -871,16 +725,7 @@ init_asm_output (const char *name)
       if (flag_record_gcc_switches)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
-	    {
-	      /* Let the target know that we are about to start recording.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	      /* Now record the switches.  */
-	      print_switch_values (targetm.asm_out.record_gcc_switches);
-	      /* Let the target know that the recording is over.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	    }
+	    targetm.asm_out.record_gcc_switches ();
 	  else
 	    inform (UNKNOWN_LOCATION,
 		    "%<-frecord-gcc-switches%> is not supported by "
@@ -889,11 +734,16 @@ init_asm_output (const char *name)
 
       if (flag_verbose_asm)
 	{
-	  /* Print the list of switches in effect
-	     into the assembler file as comments.  */
 	  print_version (asm_out_file, ASM_COMMENT_START, true);
-	  print_switch_values (print_to_asm_out_file);
-	  putc ('\n', asm_out_file);
+	  fputs (ASM_COMMENT_START, asm_out_file);
+	  fputc (' ', asm_out_file);
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), asm_out_file);
+	  else
+	    fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count),
+		   asm_out_file);
+	  fputc ('\n', asm_out_file);
 	}
     }
 }
@@ -1520,8 +1370,14 @@ process_options (void)
   if (version_flag)
     {
       print_version (stderr, "", true);
-      if (! quiet_flag)
-	print_switch_values (print_to_stderr);
+      if (!quiet_flag)
+	{
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), stderr);
+	  else
+	    fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count), stderr);
+	}
     }
 
   if (flag_syntax_only)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index dc6da6c0b5b..1b23b5f4cc4 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -57,6 +58,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "asan.h"
 #include "rtl-iter.h"
 #include "file-prefix-map.h" /* remap_debug_filename()  */
+#include "toplev.h"
+#include "opts.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data declarations.  */
@@ -7803,45 +7806,29 @@ output_object_blocks (void)
    we want to emit NUL strings terminators into the object file we have to use
    ASM_OUTPUT_SKIP.  */
 
-int
-elf_record_gcc_switches (print_switch_type type, const char * name)
+void
+elf_record_gcc_switches ()
 {
-  switch (type)
-    {
-    case SWITCH_TYPE_PASSED:
-      ASM_OUTPUT_ASCII (asm_out_file, name, strlen (name));
-      ASM_OUTPUT_SKIP (asm_out_file, HOST_WIDE_INT_1U);
-      break;
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (name == NULL)
-	{
-	  /* Distinguish between invocations where name is NULL.  */
-	  static bool started = false;
-
-	  if (!started)
-	    {
-	      section * sec;
-
-	      sec = get_section (targetm.asm_out.record_gcc_switches_section,
-				 SECTION_DEBUG
-				 | SECTION_MERGE
-				 | SECTION_STRINGS
-				 | (SECTION_ENTSIZE & 1),
-				 NULL);
-	      switch_to_section (sec);
-	      started = true;
-	    }
-	}
+  section *sec = get_section (targetm.asm_out.record_gcc_switches_section,
+			      SECTION_DEBUG | SECTION_MERGE
+			      | SECTION_STRINGS | (SECTION_ENTSIZE & 1), NULL);
+  switch_to_section (sec);
 
-    default:
-      break;
+  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+    {
+      ASM_OUTPUT_ASCII (asm_out_file, version_string, strlen (version_string));
+      ASM_OUTPUT_ASCII (asm_out_file, " ", 1);
+      const char *cmdline = get_driver_command_line ();
+      ASM_OUTPUT_ASCII (asm_out_file, cmdline, strlen (cmdline) + 1);
+    }
+  else
+    {
+      const char *producer_string
+	= get_producer_string (lang_hooks.name, save_decoded_options,
+			       save_decoded_options_count);
+      ASM_OUTPUT_ASCII (asm_out_file, producer_string,
+			strlen (producer_string) + 1);
     }
-
-  /* The return value is currently ignored by the caller, but must be 0.
-     For -fverbose-asm the return value would be the number of characters
-     emitted into the assembler file.  */
-  return 0;
 }
 
 /* Emit text to declare externally defined symbols. It is needed to
-- 
2.25.1

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Egeyar Bagcioglu]

[-- Attachment #1: Type: text/plain, Size: 7037 bytes --]



On 3/18/20 10:05 AM, Martin Liška wrote:
> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>> Hi Martin,
>>
>> I like the patch. It definitely serves our purposes at Oracle and 
>> provides another way to do what my previous patches did as well.
>>
>> 1) It keeps the backwards compatibility regarding 
>> -frecord-gcc-switches; therefore, removes my related doubts about 
>> your previous patch.
>>
>> 2) It still makes use of -frecord-gcc-switches. The new option is 
>> only to control the format. This addresses some previous objections 
>> to having a new option doing something similar. Now the new option 
>> controls the behaviour of the existing one and that behaviour can be 
>> further extended.
>>
>> 3) It uses an environment variable as Jakub suggested.
>>
>> The patch looks good and I confirm that it works for our purposes.
>
> Hello.
>
> Thank you for the support.
>
>>
>> Having said that, I have to ask for recognition in this patch for my 
>> and my company's contributions. Can you please keep my name and my 
>> work email in the changelog and in the commit message?
>
> Sure, sorry I forgot.

Hi Martin,

I noticed that some comments in the patch were still referring to 
--record-gcc-command-line, the option I suggested earlier. I updated 
those comments to mention -frecord-gcc-switches-format instead and also 
added my name to the patch as you agreed above. I attached the updated 
patch. We are starting to use this patch in the specific domain where we 
need its functionality.

Regards
Egeyar


>
> Martin
>
>>
>> Thanks
>> Egeyar
>>
>>
>>
>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>> Hi.
>>>
>>> I'm sending enhanced patch that makes the following changes:
>>> - a new option -frecord-gcc-switches-format is added; the option
>>>   selects format (processed, driver) for all options that record
>>>   GCC command line
>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>> - The .s file is affected in the following way:
>>>
>>> BEFORE:
>>>
>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 
>>> 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>> #    compiled by GNU C version 9.2.1 20200128 [revision 
>>> 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR 
>>> version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>
>>> # GGC heuristics: --param ggc-min-expand=100 --param 
>>> ggc-min-heapsize=131072
>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi 
>>> -mno-sgx
>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 
>>> -msse4.1
>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er 
>>> -mno-avx512cd
>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma 
>>> -mno-avx512vbmi
>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero 
>>> -mno-pku
>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri 
>>> -mno-movdir64b
>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact 
>>> -ffunction-cse
>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging 
>>> -fmath-errno
>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>> # -frecord-gcc-switches -freg-struct-return 
>>> -fsched-critical-path-heuristic
>>> # -fsched-dep-count-heuristic -fsched-group-heuristic 
>>> -fsched-interblock
>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep 
>>> -fschedule-fusion
>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math 
>>> -ftree-cselim
>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im 
>>> -ftree-loop-ivcanon
>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 
>>> -m80387
>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero 
>>> -mcx16
>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr 
>>> -mglibc
>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf 
>>> -msha
>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt 
>>> -mxsaves
>>>
>>> AFTER:
>>>
>>> # GGC heuristics: --param ggc-min-expand=30 --param 
>>> ggc-min-heapsize=4096
>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx 
>>> -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe 
>>> -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 
>>> -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm 
>>> -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd 
>>> -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt 
>>> -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf 
>>> -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq 
>>> -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi 
>>> -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero 
>>> -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 
>>> -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg 
>>> -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite 
>>> -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect 
>>> --param=l1-cache-size=32 --param=l1-cache-line-size=64 
>>> --param=l2-cache-size=512 -mtune=znver1 -g
>>>
>>> That's the biggest change I made, but I hope it's acceptable.
>>> Apart from that the patch simplifies and unifies places where 
>>> save_decoded_options
>>> options are transformed back to string representation.
>>>
>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>
>>> Ready to be installed in next stage1?
>>> Thanks,
>>> Martin
>>
>


[-- Attachment #2: frecord-gcc-switches-format.patch --]
[-- Type: text/x-patch, Size: 31752 bytes --]

From a6514e12007a8cffa1a6a060196b28c5ada131c3 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 5 Mar 2020 09:39:17 +0100
Subject: [PATCH] Change semantics of -frecord-gcc-switches and add
 -frecord-gcc-switches-format.

gcc/ChangeLog:

2020-03-17  Martin Liska  <mliska@suse.cz>
            Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* common.opt: Add new option -frecord-gcc-switches-format.
	* doc/invoke.texi: Document the new option.
	* doc/tm.texi: Remove print_switch_type documentation
	entry.
	* dwarf2out.c (gen_producer_string): Move to varasm.c
	and ignore also OPT_frecord_gcc_switches and
	OPT_frecord_gcc_switches_format_.
	(dwarf2out_early_finish): Print corresponding producer format string.
	* flag-types.h (enum record_gcc_switches_format):
	* gcc.c (set_driver_command_line_envvar): New function.
	(driver_handle_option): Always save command line options.
	(driver::main): Save command line.
	(driver::set_commandline): New.
	* gcc.h (driver::set_commandline): New.
	* opts.c (get_producer_string): Moved from dwarf2out.c.
	(get_driver_command_line): New function.
	* opts.h (get_producer_string): New.
	(get_driver_command_line): Likewise.
	* target.def: Remove documentation foor print_switch_type.
	* target.h (enum print_switch_type):  Remove.
	(elf_record_gcc_switches): Change to void type.
	* toplev.c (MAX_LINE): Remove.
	(print_to_asm_out_file): Remove.
	(print_to_stderr): Remove.
	(print_single_switch): Likewise.
	(print_switch_values): Likewise.
	(init_asm_output): Call directly record_gcc_switches.
	(process_options): Print options to stderr.
	* varasm.c (elf_record_gcc_switches): Support
	new flag_record_gcc_switches_format option.
---
 gcc/common.opt      |  15 +++-
 gcc/doc/invoke.texi |  23 +++++-
 gcc/doc/tm.texi     |  37 +--------
 gcc/dwarf2out.c     | 125 ++++--------------------------
 gcc/flag-types.h    |   7 ++
 gcc/gcc.c           |  39 ++++++++++
 gcc/gcc.h           |   1 +
 gcc/opts.c          | 121 +++++++++++++++++++++++++++++
 gcc/opts.h          |   6 ++
 gcc/target.def      |  37 +--------
 gcc/target.h        |  14 +---
 gcc/toplev.c        | 180 +++++---------------------------------------
 gcc/varasm.c        |  59 ++++++---------
 13 files changed, 270 insertions(+), 394 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index 4368910cb54..7809c734ee1 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2246,9 +2246,22 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Driver Report Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
+Enum
+Name(record_gcc_switches_format) Type(enum record_gcc_switches_format)
+
+EnumValue
+Enum(record_gcc_switches_format) String(processed) Value(RECORD_GCC_SWITCHES_PROCESSED)
+
+EnumValue
+Enum(record_gcc_switches_format) String(driver) Value(RECORD_GCC_SWITCHES_DRIVER)
+
+frecord-gcc-switches-format=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_format) Enum(record_gcc_switches_format) Init(RECORD_GCC_SWITCHES_PROCESSED)
+-frecord-gcc-switches-format=[processed|driver]	Format of recorded gcc command line switches.
+
 freg-struct-return
 Common Report Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 96a95162696..7925990e320 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -622,7 +622,7 @@ Objective-C and Objective-C++ Dialects}.
 -finhibit-size-directive  -fcommon  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC  -fpie  -fPIE  -fno-plt @gol
 -fno-jump-tables @gol
--frecord-gcc-switches @gol
+-frecord-gcc-switches -frecord-gcc-switches-format @gol
 -freg-struct-return  -fshort-enums  -fshort-wchar @gol
 -fverbose-asm  -fpack-struct[=@var{n}]  @gol
 -fleading-underscore  -ftls-model=@var{model} @gol
@@ -15070,6 +15070,27 @@ comments, so it never reaches the object file.
 See also @option{-grecord-gcc-switches} for another
 way of storing compiler options into the object file.
 
+@item -frecord-gcc-switches-format=@var{format}
+@opindex frecord-gcc-switches-format
+This switch controls the output format of options that record
+the command line.  The affected options are @option{-frecord-gcc-switches},
+@option{-grecord-gcc-switches} and @option{-fverbose-asm}.
+
+The @var{format} argument should be one of the following:
+
+@table @samp
+
+@item processed
+
+Options are printed after processing by the compiler driver.
+It is the default option value.
+
+@item driver
+
+Options are printed as provided to the compiler driver.
+
+@end table
+
 @item -fpic
 @opindex fpic
 @cindex global offset table
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 3560cfae74f..56d493eed21 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8061,43 +8061,10 @@ need to override this if your target has special flags that might be
 set via @code{__attribute__}.
 @end deftypefn
 
-@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_SWITCHES (print_switch_type @var{type}, const char *@var{text})
+@deftypefn {Target Hook} void TARGET_ASM_RECORD_GCC_SWITCHES (void)
 Provides the target with the ability to record the gcc command line
 switches that have been passed to the compiler, and options that are
-enabled.  The @var{type} argument specifies what is being recorded.
-It can take the following values:
-
-@table @gcctabopt
-@item SWITCH_TYPE_PASSED
-@var{text} is a command line switch that has been set by the user.
-
-@item SWITCH_TYPE_ENABLED
-@var{text} is an option which has been enabled.  This might be as a
-direct result of a command line switch, or because it is enabled by
-default or because it has been enabled as a side effect of a different
-command line switch.  For example, the @option{-O2} switch enables
-various different individual optimization passes.
-
-@item SWITCH_TYPE_DESCRIPTIVE
-@var{text} is either NULL or some descriptive text which should be
-ignored.  If @var{text} is NULL then it is being used to warn the
-target hook that either recording is starting or ending.  The first
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the
-warning is for start up and the second time the warning is for
-wind down.  This feature is to allow the target hook to make any
-necessary preparations before it starts to record switches and to
-perform any necessary tidying up after it has finished recording
-switches.
-
-@item SWITCH_TYPE_LINE_START
-This option can be ignored by this target hook.
-
-@item  SWITCH_TYPE_LINE_END
-This option can be ignored by this target hook.
-@end table
-
-The hook's return value must be zero.  Other return values may be
-supported in the future.
+enabled.
 
 By default this hook is set to NULL, but an example implementation is
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index bb45279ea56..2e8ed4e946d 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24314,116 +24314,6 @@ gen_ptr_to_mbr_type_die (tree type, dw_die_ref context_die)
 
 static char *producer_string;
 
-/* Return a heap allocated producer string including command line options
-   if -grecord-gcc-switches.  */
-
-static char *
-gen_producer_string (void)
-{
-  size_t j;
-  auto_vec<const char *> switches;
-  const char *language_string = lang_hooks.name;
-  char *producer, *tail;
-  const char *p;
-  size_t len = dwarf_record_gcc_switches ? 0 : 3;
-  size_t plen = strlen (language_string) + 1 + strlen (version_string);
-
-  for (j = 1; dwarf_record_gcc_switches && j < save_decoded_options_count; j++)
-    switch (save_decoded_options[j].opt_index)
-      {
-      case OPT_o:
-      case OPT_d:
-      case OPT_dumpbase:
-      case OPT_dumpdir:
-      case OPT_auxbase:
-      case OPT_auxbase_strip:
-      case OPT_quiet:
-      case OPT_version:
-      case OPT_v:
-      case OPT_w:
-      case OPT_L:
-      case OPT_D:
-      case OPT_I:
-      case OPT_U:
-      case OPT_SPECIAL_unknown:
-      case OPT_SPECIAL_ignore:
-      case OPT_SPECIAL_warn_removed:
-      case OPT_SPECIAL_program_name:
-      case OPT_SPECIAL_input_file:
-      case OPT_grecord_gcc_switches:
-      case OPT__output_pch_:
-      case OPT_fdiagnostics_show_location_:
-      case OPT_fdiagnostics_show_option:
-      case OPT_fdiagnostics_show_caret:
-      case OPT_fdiagnostics_show_labels:
-      case OPT_fdiagnostics_show_line_numbers:
-      case OPT_fdiagnostics_color_:
-      case OPT_fdiagnostics_format_:
-      case OPT_fverbose_asm:
-      case OPT____:
-      case OPT__sysroot_:
-      case OPT_nostdinc:
-      case OPT_nostdinc__:
-      case OPT_fpreprocessed:
-      case OPT_fltrans_output_list_:
-      case OPT_fresolution_:
-      case OPT_fdebug_prefix_map_:
-      case OPT_fmacro_prefix_map_:
-      case OPT_ffile_prefix_map_:
-      case OPT_fcompare_debug:
-      case OPT_fchecking:
-      case OPT_fchecking_:
-	/* Ignore these.  */
-	continue;
-      case OPT_flto_:
-	{
-	  const char *lto_canonical = "-flto";
-	  switches.safe_push (lto_canonical);
-	  len += strlen (lto_canonical) + 1;
-	  break;
-	}
-      default:
-        if (cl_options[save_decoded_options[j].opt_index].flags
-	    & CL_NO_DWARF_RECORD)
-	  continue;
-        gcc_checking_assert (save_decoded_options[j].canonical_option[0][0]
-			     == '-');
-        switch (save_decoded_options[j].canonical_option[0][1])
-	  {
-	  case 'M':
-	  case 'i':
-	  case 'W':
-	    continue;
-	  case 'f':
-	    if (strncmp (save_decoded_options[j].canonical_option[0] + 2,
-			 "dump", 4) == 0)
-	      continue;
-	    break;
-	  default:
-	    break;
-	  }
-	switches.safe_push (save_decoded_options[j].orig_option_with_args_text);
-	len += strlen (save_decoded_options[j].orig_option_with_args_text) + 1;
-	break;
-      }
-
-  producer = XNEWVEC (char, plen + 1 + len + 1);
-  tail = producer;
-  sprintf (tail, "%s %s", language_string, version_string);
-  tail += plen;
-
-  FOR_EACH_VEC_ELT (switches, j, p)
-    {
-      len = strlen (p);
-      *tail = ' ';
-      memcpy (tail + 1, p, len);
-      tail += len + 1;
-    }
-
-  *tail = '\0';
-  return producer;
-}
-
 /* Given a C and/or C++ language/version string return the "highest".
    C++ is assumed to be "higher" than C in this case.  Used for merging
    LTO translation unit languages.  */
@@ -31986,7 +31876,20 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
-  producer_string = gen_producer_string ();
+  producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+
+  if (dwarf_record_gcc_switches)
+    {
+      char *producer_string_old = producer_string;
+      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	producer_string = concat (producer_string, " ",
+				  get_driver_command_line (), NULL);
+      else
+	producer_string = get_producer_string (lang_hooks.name,
+					       save_decoded_options,
+					       save_decoded_options_count);
+      free (producer_string_old);
+    }
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
 
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index b092c563f3d..20ff86e2af5 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -381,4 +381,11 @@ enum parloops_schedule_type
   PARLOOPS_SCHEDULE_RUNTIME
 };
 
+/* Record GCC options type.  */
+enum record_gcc_switches_format
+{
+  RECORD_GCC_SWITCHES_PROCESSED = 0,
+  RECORD_GCC_SWITCHES_DRIVER
+};
+
 #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 9f790db0daf..b4315750079 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,12 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv provided to the driver.  Necessary to keep for when
+   -frecord-gcc-switches-format=driver is given.  */
+
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -3724,6 +3729,28 @@ set_source_date_epoch_envvar ()
   setenv ("SOURCE_DATE_EPOCH", source_date_epoch, 0);
 }
 
+/* Set GCC_DRIVER_COMMAND_LINE enviromental variable that is later
+   used by -frecord-gcc-switches option.  */
+
+static void
+set_driver_command_line_envvar ()
+{
+  unsigned int length = 0;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    length += strlen (driver_gcc_argv[i]) + 1;
+
+  char *buffer = (char *)xmalloc (length);
+  char *ptr = buffer;
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    {
+      unsigned l = sprintf (ptr, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+      ptr += l;
+    }
+
+  setenv ("GCC_DRIVER_COMMAND_LINE", buffer, 0);
+  free (buffer);
+}
+
 /* Handle an option DECODED that is unknown to the option-processing
    machinery.  */
 
@@ -4296,6 +4323,8 @@ driver_handle_option (struct gcc_options *opts,
       break;
     }
 
+  set_driver_command_line_envvar ();
+
   if (do_save)
     save_switch (decoded->canonical_option[0],
 		 decoded->canonical_option_num_elements - 1,
@@ -7387,6 +7416,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -7430,6 +7460,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep the command line for -frecord-gcc-switches-format=driver.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08f059..cde77fbaad7 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/opts.c b/gcc/opts.c
index ac160ed8404..e5ec6bef62a 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "spellcheck.h"
 #include "opt-suggestions.h"
 #include "diagnostic-color.h"
+#include "version.h"
 
 static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
 
@@ -3132,3 +3133,123 @@ get_option_url (diagnostic_context *, int option_index)
   else
     return NULL;
 }
+
+/* Return a heap allocated producer string including command line options.  */
+
+char *
+get_producer_string (const char *language_string, cl_decoded_option *options,
+		     unsigned int options_count)
+{
+  size_t j;
+  auto_vec<const char *> switches;
+  char *producer, *tail;
+  const char *p;
+  size_t len = 0;
+  size_t plen = strlen (language_string) + 1 + strlen (version_string);
+
+  for (j = 0; j < options_count; j++)
+    switch (options[j].opt_index)
+      {
+      case OPT_o:
+      case OPT_d:
+      case OPT_dumpbase:
+      case OPT_dumpdir:
+      case OPT_auxbase:
+      case OPT_auxbase_strip:
+      case OPT_quiet:
+      case OPT_version:
+      case OPT_v:
+      case OPT_w:
+      case OPT_L:
+      case OPT_D:
+      case OPT_I:
+      case OPT_U:
+      case OPT_SPECIAL_unknown:
+      case OPT_SPECIAL_ignore:
+      case OPT_SPECIAL_warn_removed:
+      case OPT_SPECIAL_program_name:
+      case OPT_SPECIAL_input_file:
+      case OPT_grecord_gcc_switches:
+      case OPT_frecord_gcc_switches:
+      case OPT_frecord_gcc_switches_format_:
+      case OPT__output_pch_:
+      case OPT_fdiagnostics_show_location_:
+      case OPT_fdiagnostics_show_option:
+      case OPT_fdiagnostics_show_caret:
+      case OPT_fdiagnostics_show_labels:
+      case OPT_fdiagnostics_show_line_numbers:
+      case OPT_fdiagnostics_color_:
+      case OPT_fdiagnostics_format_:
+      case OPT_fverbose_asm:
+      case OPT____:
+      case OPT__sysroot_:
+      case OPT_nostdinc:
+      case OPT_nostdinc__:
+      case OPT_fpreprocessed:
+      case OPT_fltrans_output_list_:
+      case OPT_fresolution_:
+      case OPT_fdebug_prefix_map_:
+      case OPT_fmacro_prefix_map_:
+      case OPT_ffile_prefix_map_:
+      case OPT_fcompare_debug:
+      case OPT_fchecking:
+      case OPT_fchecking_:
+	/* Ignore these.  */
+	continue;
+      case OPT_flto_:
+	{
+	  const char *lto_canonical = "-flto";
+	  switches.safe_push (lto_canonical);
+	  len += strlen (lto_canonical) + 1;
+	  break;
+	}
+      default:
+	if (cl_options[options[j].opt_index].flags
+	    & CL_NO_DWARF_RECORD)
+	  continue;
+	gcc_checking_assert (options[j].canonical_option[0][0] == '-');
+	switch (options[j].canonical_option[0][1])
+	  {
+	  case 'M':
+	  case 'i':
+	  case 'W':
+	    continue;
+	  case 'f':
+	    if (strncmp (options[j].canonical_option[0] + 2,
+			 "dump", 4) == 0)
+	      continue;
+	    break;
+	  default:
+	    break;
+	  }
+	switches.safe_push (options[j].orig_option_with_args_text);
+	len += strlen (options[j].orig_option_with_args_text) + 1;
+	break;
+      }
+
+  producer = XNEWVEC (char, plen + 1 + len + 1);
+  tail = producer;
+  sprintf (tail, "%s %s", language_string, version_string);
+  tail += plen;
+
+  FOR_EACH_VEC_ELT (switches, j, p)
+    {
+      len = strlen (p);
+      *tail = ' ';
+      memcpy (tail + 1, p, len);
+      tail += len + 1;
+    }
+
+  *tail = '\0';
+  return producer;
+}
+
+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  const char *cmdline = getenv ("GCC_DRIVER_COMMAND_LINE");
+  return cmdline != NULL ? cmdline : "";
+}
diff --git a/gcc/opts.h b/gcc/opts.h
index 8f594b46e33..fc3cd4b4596 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -465,6 +465,12 @@ extern void parse_options_from_collect_gcc_options (const char *, obstack *,
 
 extern void prepend_xassembler_to_collect_as_options (const char *, obstack *);
 
+extern char *get_producer_string (const char *language_string,
+				  cl_decoded_option *options,
+				  unsigned int options_count);
+
+extern const char *get_driver_command_line ();
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/target.def b/gcc/target.def
index b5e82ff826e..9cb9dab60ab 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -746,40 +746,7 @@ DEFHOOK
 (record_gcc_switches,
  "Provides the target with the ability to record the gcc command line\n\
 switches that have been passed to the compiler, and options that are\n\
-enabled.  The @var{type} argument specifies what is being recorded.\n\
-It can take the following values:\n\
-\n\
-@table @gcctabopt\n\
-@item SWITCH_TYPE_PASSED\n\
-@var{text} is a command line switch that has been set by the user.\n\
-\n\
-@item SWITCH_TYPE_ENABLED\n\
-@var{text} is an option which has been enabled.  This might be as a\n\
-direct result of a command line switch, or because it is enabled by\n\
-default or because it has been enabled as a side effect of a different\n\
-command line switch.  For example, the @option{-O2} switch enables\n\
-various different individual optimization passes.\n\
-\n\
-@item SWITCH_TYPE_DESCRIPTIVE\n\
-@var{text} is either NULL or some descriptive text which should be\n\
-ignored.  If @var{text} is NULL then it is being used to warn the\n\
-target hook that either recording is starting or ending.  The first\n\
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the\n\
-warning is for start up and the second time the warning is for\n\
-wind down.  This feature is to allow the target hook to make any\n\
-necessary preparations before it starts to record switches and to\n\
-perform any necessary tidying up after it has finished recording\n\
-switches.\n\
-\n\
-@item SWITCH_TYPE_LINE_START\n\
-This option can be ignored by this target hook.\n\
-\n\
-@item  SWITCH_TYPE_LINE_END\n\
-This option can be ignored by this target hook.\n\
-@end table\n\
-\n\
-The hook's return value must be zero.  Other return values may be\n\
-supported in the future.\n\
+enabled.\n\
 \n\
 By default this hook is set to NULL, but an example implementation is\n\
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},\n\
@@ -787,7 +754,7 @@ it records the switches as ASCII text inside a new, string mergeable\n\
 section in the assembler output file.  The name of the new section is\n\
 provided by the @code{TARGET_ASM_RECORD_GCC_SWITCHES_SECTION} target\n\
 hook.",
- int, (print_switch_type type, const char *text),
+ void, (void),
  NULL)
 
 /* The name of the section that the example ELF implementation of
diff --git a/gcc/target.h b/gcc/target.h
index 2f47c577d00..8421f78915f 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -68,16 +68,6 @@ union cumulative_args_t { void *p; };
 
 #endif /* !CHECKING_P */
 
-/* Types used by the record_gcc_switches() target function.  */
-enum print_switch_type
-{
-  SWITCH_TYPE_PASSED,		/* A switch passed on the command line.  */
-  SWITCH_TYPE_ENABLED,		/* An option that is currently enabled.  */
-  SWITCH_TYPE_DESCRIPTIVE,	/* Descriptive text, not a switch or option.  */
-  SWITCH_TYPE_LINE_START,	/* Please emit any necessary text at the start of a line.  */
-  SWITCH_TYPE_LINE_END		/* Please emit a line terminator.  */
-};
-
 /* Types of memory operation understood by the "by_pieces" infrastructure.
    Used by the TARGET_USE_BY_PIECES_INFRASTRUCTURE_P target hook and
    internally by the functions in expr.c.  */
@@ -96,10 +86,8 @@ extern unsigned HOST_WIDE_INT by_pieces_ninsns (unsigned HOST_WIDE_INT,
 						unsigned int,
 						by_pieces_operation);
 
-typedef int (* print_switch_fn_type) (print_switch_type, const char *);
-
 /* An example implementation for ELF targets.  Defined in varasm.c  */
-extern int elf_record_gcc_switches (print_switch_type type, const char *);
+extern void elf_record_gcc_switches (void);
 
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 4c8be502c71..4128a547ea4 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -114,9 +114,6 @@ static void compile_file (void);
 /* True if we don't need a backend (e.g. preprocessing only).  */
 static bool no_backend;
 
-/* Length of line when printing switch values.  */
-#define MAX_LINE 75
-
 /* Decoded options, and number of such options.  */
 struct cl_decoded_option *save_decoded_options;
 unsigned int save_decoded_options_count;
@@ -684,149 +681,6 @@ print_version (FILE *file, const char *indent, bool show_global_state)
     }
 }
 
-static int
-print_to_asm_out_file (print_switch_type type, const char * text)
-{
-  bool prepend_sep = true;
-
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', asm_out_file);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      fputs (ASM_COMMENT_START, asm_out_file);
-      return strlen (ASM_COMMENT_START);
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (ASM_COMMENT_START[0] == 0)
-	prepend_sep = false;
-      /* FALLTHRU */
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      if (prepend_sep)
-	fputc (' ', asm_out_file);
-      fputs (text, asm_out_file);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-static int
-print_to_stderr (print_switch_type type, const char * text)
-{
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', stderr);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      return 0;
-
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      fputc (' ', stderr);
-      /* FALLTHRU */
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      fputs (text, stderr);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-/* Print an option value and return the adjusted position in the line.
-   ??? print_fn doesn't handle errors, eg disk full; presumably other
-   code will catch a disk full though.  */
-
-static int
-print_single_switch (print_switch_fn_type print_fn,
-		     int pos,
-		     print_switch_type type,
-		     const char * text)
-{
-  /* The ultrix fprintf returns 0 on success, so compute the result
-     we want here since we need it for the following test.  The +1
-     is for the separator character that will probably be emitted.  */
-  int len = strlen (text) + 1;
-
-  if (pos != 0
-      && pos + len > MAX_LINE)
-    {
-      print_fn (SWITCH_TYPE_LINE_END, NULL);
-      pos = 0;
-    }
-
-  if (pos == 0)
-    pos += print_fn (SWITCH_TYPE_LINE_START, NULL);
-
-  print_fn (type, text);
-  return pos + len;
-}
-
-/* Print active target switches using PRINT_FN.
-   POS is the current cursor position and MAX is the size of a "line".
-   Each line begins with INDENT and ends with TERM.
-   Each switch is separated from the next by SEP.  */
-
-static void
-print_switch_values (print_switch_fn_type print_fn)
-{
-  int pos = 0;
-  size_t j;
-
-  /* Print the options as passed.  */
-  pos = print_single_switch (print_fn, pos,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options passed: "));
-
-  for (j = 1; j < save_decoded_options_count; j++)
-    {
-      switch (save_decoded_options[j].opt_index)
-	{
-	case OPT_o:
-	case OPT_d:
-	case OPT_dumpbase:
-	case OPT_dumpdir:
-	case OPT_auxbase:
-	case OPT_quiet:
-	case OPT_version:
-	  /* Ignore these.  */
-	  continue;
-	}
-
-      pos = print_single_switch (print_fn, pos, SWITCH_TYPE_PASSED,
-				 save_decoded_options[j].orig_option_with_args_text);
-    }
-
-  if (pos > 0)
-    print_fn (SWITCH_TYPE_LINE_END, NULL);
-
-  /* Print the -f and -m options that have been enabled.
-     We don't handle language specific options but printing argv
-     should suffice.  */
-  pos = print_single_switch (print_fn, 0,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options enabled: "));
-
-  unsigned lang_mask = lang_hooks.option_lang_mask ();
-  for (j = 0; j < cl_options_count; j++)
-    if (cl_options[j].cl_report
-	&& option_enabled (j, lang_mask, &global_options) > 0)
-      pos = print_single_switch (print_fn, pos,
-				 SWITCH_TYPE_ENABLED, cl_options[j].opt_text);
-
-  print_fn (SWITCH_TYPE_LINE_END, NULL);
-}
-
 /* Open assembly code output file.  Do this even if -fsyntax-only is
    on, because then the driver will have provided the name of a
    temporary file or bit bucket for us.  NAME is the file specified on
@@ -871,16 +725,7 @@ init_asm_output (const char *name)
       if (flag_record_gcc_switches)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
-	    {
-	      /* Let the target know that we are about to start recording.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	      /* Now record the switches.  */
-	      print_switch_values (targetm.asm_out.record_gcc_switches);
-	      /* Let the target know that the recording is over.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	    }
+	    targetm.asm_out.record_gcc_switches ();
 	  else
 	    inform (UNKNOWN_LOCATION,
 		    "%<-frecord-gcc-switches%> is not supported by "
@@ -889,11 +734,16 @@ init_asm_output (const char *name)
 
       if (flag_verbose_asm)
 	{
-	  /* Print the list of switches in effect
-	     into the assembler file as comments.  */
 	  print_version (asm_out_file, ASM_COMMENT_START, true);
-	  print_switch_values (print_to_asm_out_file);
-	  putc ('\n', asm_out_file);
+	  fputs (ASM_COMMENT_START, asm_out_file);
+	  fputc (' ', asm_out_file);
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), asm_out_file);
+	  else
+	    fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count),
+		   asm_out_file);
+	  fputc ('\n', asm_out_file);
 	}
     }
 }
@@ -1520,8 +1370,14 @@ process_options (void)
   if (version_flag)
     {
       print_version (stderr, "", true);
-      if (! quiet_flag)
-	print_switch_values (print_to_stderr);
+      if (!quiet_flag)
+	{
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), stderr);
+	  else
+	    fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count), stderr);
+	}
     }
 
   if (flag_syntax_only)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index dc6da6c0b5b..1b23b5f4cc4 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -57,6 +58,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "asan.h"
 #include "rtl-iter.h"
 #include "file-prefix-map.h" /* remap_debug_filename()  */
+#include "toplev.h"
+#include "opts.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data declarations.  */
@@ -7803,45 +7806,29 @@ output_object_blocks (void)
    we want to emit NUL strings terminators into the object file we have to use
    ASM_OUTPUT_SKIP.  */
 
-int
-elf_record_gcc_switches (print_switch_type type, const char * name)
+void
+elf_record_gcc_switches ()
 {
-  switch (type)
-    {
-    case SWITCH_TYPE_PASSED:
-      ASM_OUTPUT_ASCII (asm_out_file, name, strlen (name));
-      ASM_OUTPUT_SKIP (asm_out_file, HOST_WIDE_INT_1U);
-      break;
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (name == NULL)
-	{
-	  /* Distinguish between invocations where name is NULL.  */
-	  static bool started = false;
-
-	  if (!started)
-	    {
-	      section * sec;
-
-	      sec = get_section (targetm.asm_out.record_gcc_switches_section,
-				 SECTION_DEBUG
-				 | SECTION_MERGE
-				 | SECTION_STRINGS
-				 | (SECTION_ENTSIZE & 1),
-				 NULL);
-	      switch_to_section (sec);
-	      started = true;
-	    }
-	}
+  section *sec = get_section (targetm.asm_out.record_gcc_switches_section,
+			      SECTION_DEBUG | SECTION_MERGE
+			      | SECTION_STRINGS | (SECTION_ENTSIZE & 1), NULL);
+  switch_to_section (sec);
 
-    default:
-      break;
+  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+    {
+      ASM_OUTPUT_ASCII (asm_out_file, version_string, strlen (version_string));
+      ASM_OUTPUT_ASCII (asm_out_file, " ", 1);
+      const char *cmdline = get_driver_command_line ();
+      ASM_OUTPUT_ASCII (asm_out_file, cmdline, strlen (cmdline) + 1);
+    }
+  else
+    {
+      const char *producer_string
+	= get_producer_string (lang_hooks.name, save_decoded_options,
+			       save_decoded_options_count);
+      ASM_OUTPUT_ASCII (asm_out_file, producer_string,
+			strlen (producer_string) + 1);
     }
-
-  /* The return value is currently ignored by the caller, but must be 0.
-     For -fverbose-asm the return value would be the number of characters
-     emitted into the assembler file.  */
-  return 0;
 }
 
 /* Emit text to declare externally defined symbols. It is needed to

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 4/3/20 8:15 PM, Egeyar Bagcioglu wrote:
> Hi Martin,

Hello.

> 
> I noticed that some comments in the patch were still referring to --record-gcc-command-line, the option I suggested earlier. I updated those comments to mention -frecord-gcc-switches-format instead and also added my name to the patch as you agreed above.

Yes, thank you for it.

> I attached the updated patch. We are starting to use this patch in the specific domain where we need its functionality.

Great, that would allow us to have the patch tested.

Martin

> 
> Regards
> Egeyar

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

We're in stage1: PING^1

On 4/3/20 8:15 PM, Egeyar Bagcioglu wrote:
> 
> 
> On 3/18/20 10:05 AM, Martin Liška wrote:
>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>>> Hi Martin,
>>>
>>> I like the patch. It definitely serves our purposes at Oracle and provides another way to do what my previous patches did as well.
>>>
>>> 1) It keeps the backwards compatibility regarding -frecord-gcc-switches; therefore, removes my related doubts about your previous patch.
>>>
>>> 2) It still makes use of -frecord-gcc-switches. The new option is only to control the format. This addresses some previous objections to having a new option doing something similar. Now the new option controls the behaviour of the existing one and that behaviour can be further extended.
>>>
>>> 3) It uses an environment variable as Jakub suggested.
>>>
>>> The patch looks good and I confirm that it works for our purposes.
>>
>> Hello.
>>
>> Thank you for the support.
>>
>>>
>>> Having said that, I have to ask for recognition in this patch for my and my company's contributions. Can you please keep my name and my work email in the changelog and in the commit message?
>>
>> Sure, sorry I forgot.
> 
> Hi Martin,
> 
> I noticed that some comments in the patch were still referring to --record-gcc-command-line, the option I suggested earlier. I updated those comments to mention -frecord-gcc-switches-format instead and also added my name to the patch as you agreed above. I attached the updated patch. We are starting to use this patch in the specific domain where we need its functionality.
> 
> Regards
> Egeyar
> 
> 
>>
>> Martin
>>
>>>
>>> Thanks
>>> Egeyar
>>>
>>>
>>>
>>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>>> Hi.
>>>>
>>>> I'm sending enhanced patch that makes the following changes:
>>>> - a new option -frecord-gcc-switches-format is added; the option
>>>>   selects format (processed, driver) for all options that record
>>>>   GCC command line
>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>>> - The .s file is affected in the following way:
>>>>
>>>> BEFORE:
>>>>
>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>>> #    compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>>
>>>> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>>> # -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>>>>
>>>> AFTER:
>>>>
>>>> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>>>>
>>>> That's the biggest change I made, but I hope it's acceptable.
>>>> Apart from that the patch simplifies and unifies places where save_decoded_options
>>>> options are transformed back to string representation.
>>>>
>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>>
>>>> Ready to be installed in next stage1?
>>>> Thanks,
>>>> Martin
>>>
>>
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^2

On 5/15/20 11:58 AM, Martin Liška wrote:
> We're in stage1: PING^1
> 
> On 4/3/20 8:15 PM, Egeyar Bagcioglu wrote:
>>
>>
>> On 3/18/20 10:05 AM, Martin Liška wrote:
>>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>>>> Hi Martin,
>>>>
>>>> I like the patch. It definitely serves our purposes at Oracle and provides another way to do what my previous patches did as well.
>>>>
>>>> 1) It keeps the backwards compatibility regarding -frecord-gcc-switches; therefore, removes my related doubts about your previous patch.
>>>>
>>>> 2) It still makes use of -frecord-gcc-switches. The new option is only to control the format. This addresses some previous objections to having a new option doing something similar. Now the new option controls the behaviour of the existing one and that behaviour can be further extended.
>>>>
>>>> 3) It uses an environment variable as Jakub suggested.
>>>>
>>>> The patch looks good and I confirm that it works for our purposes.
>>>
>>> Hello.
>>>
>>> Thank you for the support.
>>>
>>>>
>>>> Having said that, I have to ask for recognition in this patch for my and my company's contributions. Can you please keep my name and my work email in the changelog and in the commit message?
>>>
>>> Sure, sorry I forgot.
>>
>> Hi Martin,
>>
>> I noticed that some comments in the patch were still referring to --record-gcc-command-line, the option I suggested earlier. I updated those comments to mention -frecord-gcc-switches-format instead and also added my name to the patch as you agreed above. I attached the updated patch. We are starting to use this patch in the specific domain where we need its functionality.
>>
>> Regards
>> Egeyar
>>
>>
>>>
>>> Martin
>>>
>>>>
>>>> Thanks
>>>> Egeyar
>>>>
>>>>
>>>>
>>>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>>>> Hi.
>>>>>
>>>>> I'm sending enhanced patch that makes the following changes:
>>>>> - a new option -frecord-gcc-switches-format is added; the option
>>>>>   selects format (processed, driver) for all options that record
>>>>>   GCC command line
>>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>>>> - The .s file is affected in the following way:
>>>>>
>>>>> BEFORE:
>>>>>
>>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>>>> #    compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>>>
>>>>> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
>>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
>>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
>>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
>>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
>>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
>>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
>>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>>>> # -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
>>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
>>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
>>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
>>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
>>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>>>>>
>>>>> AFTER:
>>>>>
>>>>> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
>>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>>>>>
>>>>> That's the biggest change I made, but I hope it's acceptable.
>>>>> Apart from that the patch simplifies and unifies places where save_decoded_options
>>>>> options are transformed back to string representation.
>>>>>
>>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>>>
>>>>> Ready to be installed in next stage1?
>>>>> Thanks,
>>>>> Martin
>>>>
>>>
>>
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^3

On 6/2/20 11:16 AM, Martin Liška wrote:
> PING^2
> 
> On 5/15/20 11:58 AM, Martin Liška wrote:
>> We're in stage1: PING^1
>>
>> On 4/3/20 8:15 PM, Egeyar Bagcioglu wrote:
>>>
>>>
>>> On 3/18/20 10:05 AM, Martin Liška wrote:
>>>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>>>>> Hi Martin,
>>>>>
>>>>> I like the patch. It definitely serves our purposes at Oracle and provides another way to do what my previous patches did as well.
>>>>>
>>>>> 1) It keeps the backwards compatibility regarding -frecord-gcc-switches; therefore, removes my related doubts about your previous patch.
>>>>>
>>>>> 2) It still makes use of -frecord-gcc-switches. The new option is only to control the format. This addresses some previous objections to having a new option doing something similar. Now the new option controls the behaviour of the existing one and that behaviour can be further extended.
>>>>>
>>>>> 3) It uses an environment variable as Jakub suggested.
>>>>>
>>>>> The patch looks good and I confirm that it works for our purposes.
>>>>
>>>> Hello.
>>>>
>>>> Thank you for the support.
>>>>
>>>>>
>>>>> Having said that, I have to ask for recognition in this patch for my and my company's contributions. Can you please keep my name and my work email in the changelog and in the commit message?
>>>>
>>>> Sure, sorry I forgot.
>>>
>>> Hi Martin,
>>>
>>> I noticed that some comments in the patch were still referring to --record-gcc-command-line, the option I suggested earlier. I updated those comments to mention -frecord-gcc-switches-format instead and also added my name to the patch as you agreed above. I attached the updated patch. We are starting to use this patch in the specific domain where we need its functionality.
>>>
>>> Regards
>>> Egeyar
>>>
>>>
>>>>
>>>> Martin
>>>>
>>>>>
>>>>> Thanks
>>>>> Egeyar
>>>>>
>>>>>
>>>>>
>>>>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>>>>> Hi.
>>>>>>
>>>>>> I'm sending enhanced patch that makes the following changes:
>>>>>> - a new option -frecord-gcc-switches-format is added; the option
>>>>>>   selects format (processed, driver) for all options that record
>>>>>>   GCC command line
>>>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>>>>> - The .s file is affected in the following way:
>>>>>>
>>>>>> BEFORE:
>>>>>>
>>>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>>>>> #    compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>>>>
>>>>>> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
>>>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
>>>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
>>>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
>>>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>>>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
>>>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
>>>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>>>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
>>>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>>>>> # -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
>>>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>>>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>>>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>>>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>>>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
>>>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
>>>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
>>>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
>>>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>>>>>>
>>>>>> AFTER:
>>>>>>
>>>>>> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
>>>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>>>>>>
>>>>>> That's the biggest change I made, but I hope it's acceptable.
>>>>>> Apart from that the patch simplifies and unifies places where save_decoded_options
>>>>>> options are transformed back to string representation.
>>>>>>
>>>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>>>>
>>>>>> Ready to be installed in next stage1?
>>>>>> Thanks,
>>>>>> Martin
>>>>>
>>>>
>>>
>>
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Qing Zhao]

PING^4. 

Our company is waiting for this patch to be committed to upstream.

Thanks a lot.

Qing

> On Jun 16, 2020, at 7:49 AM, Martin Liška <mliska@suse.cz> wrote:
> 
> PING^3
> 
> On 6/2/20 11:16 AM, Martin Liška wrote:
>> PING^2
>> On 5/15/20 11:58 AM, Martin Liška wrote:
>>> We're in stage1: PING^1
>>> 
>>> On 4/3/20 8:15 PM, Egeyar Bagcioglu wrote:
>>>> 
>>>> 
>>>> On 3/18/20 10:05 AM, Martin Liška wrote:
>>>>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>>>>>> Hi Martin,
>>>>>> 
>>>>>> I like the patch. It definitely serves our purposes at Oracle and provides another way to do what my previous patches did as well.
>>>>>> 
>>>>>> 1) It keeps the backwards compatibility regarding -frecord-gcc-switches; therefore, removes my related doubts about your previous patch.
>>>>>> 
>>>>>> 2) It still makes use of -frecord-gcc-switches. The new option is only to control the format. This addresses some previous objections to having a new option doing something similar. Now the new option controls the behaviour of the existing one and that behaviour can be further extended.
>>>>>> 
>>>>>> 3) It uses an environment variable as Jakub suggested.
>>>>>> 
>>>>>> The patch looks good and I confirm that it works for our purposes.
>>>>> 
>>>>> Hello.
>>>>> 
>>>>> Thank you for the support.
>>>>> 
>>>>>> 
>>>>>> Having said that, I have to ask for recognition in this patch for my and my company's contributions. Can you please keep my name and my work email in the changelog and in the commit message?
>>>>> 
>>>>> Sure, sorry I forgot.
>>>> 
>>>> Hi Martin,
>>>> 
>>>> I noticed that some comments in the patch were still referring to --record-gcc-command-line, the option I suggested earlier. I updated those comments to mention -frecord-gcc-switches-format instead and also added my name to the patch as you agreed above. I attached the updated patch. We are starting to use this patch in the specific domain where we need its functionality.
>>>> 
>>>> Regards
>>>> Egeyar
>>>> 
>>>> 
>>>>> 
>>>>> Martin
>>>>> 
>>>>>> 
>>>>>> Thanks
>>>>>> Egeyar
>>>>>> 
>>>>>> 
>>>>>> 
>>>>>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>>>>>> Hi.
>>>>>>> 
>>>>>>> I'm sending enhanced patch that makes the following changes:
>>>>>>> - a new option -frecord-gcc-switches-format is added; the option
>>>>>>>   selects format (processed, driver) for all options that record
>>>>>>>   GCC command line
>>>>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>>>>>> - The .s file is affected in the following way:
>>>>>>> 
>>>>>>> BEFORE:
>>>>>>> 
>>>>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>>>>>> #    compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>>>>> 
>>>>>>> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
>>>>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>>>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>>>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
>>>>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
>>>>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>>>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
>>>>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>>>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>>>>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
>>>>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>>>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
>>>>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>>>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>>>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>>>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>>>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>>>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>>>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>>>>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>>>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>>>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>>>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
>>>>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>>>>>> # -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
>>>>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>>>>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>>>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>>>>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>>>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>>>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>>>>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>>>>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>>>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>>>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
>>>>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>>>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
>>>>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
>>>>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>>>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
>>>>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>>>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>>>>>>> 
>>>>>>> AFTER:
>>>>>>> 
>>>>>>> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
>>>>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>>>>>>> 
>>>>>>> That's the biggest change I made, but I hope it's acceptable.
>>>>>>> Apart from that the patch simplifies and unifies places where save_decoded_options
>>>>>>> options are transformed back to string representation.
>>>>>>> 
>>>>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>>>>> 
>>>>>>> Ready to be installed in next stage1?
>>>>>>> Thanks,
>>>>>>> Martin
>>>>>> 
>>>>> 
>>>> 
>>> 
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 7/21/20 6:24 PM, Qing Zhao wrote:
> 4.
> 
> Our company is waiting for this patch to be committed to upstream.

Hello.

Please note that patch review can sometimes take some time.
You can still install the patch to your local branch and note that
the next major release will be released in about 9 months.

Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Qing Zhao]

Hi,

Thanks a lot for the info.

> On Jul 23, 2020, at 5:07 AM, Martin Liška <mliska@suse.cz> wrote:
> 
> On 7/21/20 6:24 PM, Qing Zhao wrote:
>> 4.
>> Our company is waiting for this patch to be committed to upstream.
> 
> Hello.
> 
> Please note that patch review can sometimes take some time.

Yes, I understand. 
However, this patch has been submitted for review since March this year, 4 months passed.
Just want to make sure that this patch is not ignored and someone will take a look at it.

> You can still install the patch to your local branch and note that
> the next major release will be released in about 9 months.

Our production build of GCC needs this patch for our important application. 
So, if this patch will be changed due to some new comments from the reviewers, the back porting will
Need to be redone later, it’s really not convenient for us. 

I am hoping the review process of this patch can be done soon, it has been waiting for so long time already.

Thanks.

Qing

> 
> Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 7/23/20 5:01 PM, Qing Zhao wrote:
> Hi,
> 
> Thanks a lot for the info.
> 
>> On Jul 23, 2020, at 5:07 AM, Martin Liška <mliska@suse.cz> wrote:
>>
>> On 7/21/20 6:24 PM, Qing Zhao wrote:
>>> 4.
>>> Our company is waiting for this patch to be committed to upstream.
>>
>> Hello.
>>
>> Please note that patch review can sometimes take some time.
> 
> Yes, I understand.
> However, this patch has been submitted for review since March this year, 4 months passed.
> Just want to make sure that this patch is not ignored and someone will take a look at it.

No, it's not ignored and I you can rely on that it will appear in GCC 11.1.

> 
>> You can still install the patch to your local branch and note that
>> the next major release will be released in about 9 months.
> 
> Our production build of GCC needs this patch for our important application.
> So, if this patch will be changed due to some new comments from the reviewers, the back porting will
> Need to be redone later, it’s really not convenient for us.

Fully agree with that.

> 
> I am hoping the review process of this patch can be done soon, it has been waiting for so long time already.

Adding Jeff to CC, who can hopefully help us here.

Martin

> 
> Thanks.
> 
> Qing
> 
>>
>> Martin
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^5

On 7/21/20 6:24 PM, Qing Zhao wrote:
> PING^4.
> 
> Our company is waiting for this patch to be committed to upstream.
> 
> Thanks a lot.
> 
> Qing
> 
>> On Jun 16, 2020, at 7:49 AM, Martin Liška <mliska@suse.cz> wrote:
>>
>> PING^3
>>
>> On 6/2/20 11:16 AM, Martin Liška wrote:
>>> PING^2
>>> On 5/15/20 11:58 AM, Martin Liška wrote:
>>>> We're in stage1: PING^1
>>>>
>>>> On 4/3/20 8:15 PM, Egeyar Bagcioglu wrote:
>>>>>
>>>>>
>>>>> On 3/18/20 10:05 AM, Martin Liška wrote:
>>>>>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>>>>>>> Hi Martin,
>>>>>>>
>>>>>>> I like the patch. It definitely serves our purposes at Oracle and provides another way to do what my previous patches did as well.
>>>>>>>
>>>>>>> 1) It keeps the backwards compatibility regarding -frecord-gcc-switches; therefore, removes my related doubts about your previous patch.
>>>>>>>
>>>>>>> 2) It still makes use of -frecord-gcc-switches. The new option is only to control the format. This addresses some previous objections to having a new option doing something similar. Now the new option controls the behaviour of the existing one and that behaviour can be further extended.
>>>>>>>
>>>>>>> 3) It uses an environment variable as Jakub suggested.
>>>>>>>
>>>>>>> The patch looks good and I confirm that it works for our purposes.
>>>>>>
>>>>>> Hello.
>>>>>>
>>>>>> Thank you for the support.
>>>>>>
>>>>>>>
>>>>>>> Having said that, I have to ask for recognition in this patch for my and my company's contributions. Can you please keep my name and my work email in the changelog and in the commit message?
>>>>>>
>>>>>> Sure, sorry I forgot.
>>>>>
>>>>> Hi Martin,
>>>>>
>>>>> I noticed that some comments in the patch were still referring to --record-gcc-command-line, the option I suggested earlier. I updated those comments to mention -frecord-gcc-switches-format instead and also added my name to the patch as you agreed above. I attached the updated patch. We are starting to use this patch in the specific domain where we need its functionality.
>>>>>
>>>>> Regards
>>>>> Egeyar
>>>>>
>>>>>
>>>>>>
>>>>>> Martin
>>>>>>
>>>>>>>
>>>>>>> Thanks
>>>>>>> Egeyar
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>>>>>>> Hi.
>>>>>>>>
>>>>>>>> I'm sending enhanced patch that makes the following changes:
>>>>>>>> - a new option -frecord-gcc-switches-format is added; the option
>>>>>>>>    selects format (processed, driver) for all options that record
>>>>>>>>    GCC command line
>>>>>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>>>>>>> - The .s file is affected in the following way:
>>>>>>>>
>>>>>>>> BEFORE:
>>>>>>>>
>>>>>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>>>>>>> #    compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>>>>>>
>>>>>>>> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
>>>>>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>>>>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>>>>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
>>>>>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
>>>>>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>>>>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
>>>>>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>>>>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>>>>>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
>>>>>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>>>>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
>>>>>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>>>>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>>>>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>>>>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>>>>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>>>>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>>>>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>>>>>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>>>>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>>>>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>>>>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
>>>>>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>>>>>>> # -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
>>>>>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>>>>>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>>>>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>>>>>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>>>>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>>>>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>>>>>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>>>>>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>>>>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>>>>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
>>>>>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>>>>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
>>>>>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
>>>>>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>>>>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
>>>>>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>>>>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>>>>>>>>
>>>>>>>> AFTER:
>>>>>>>>
>>>>>>>> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
>>>>>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>>>>>>>>
>>>>>>>> That's the biggest change I made, but I hope it's acceptable.
>>>>>>>> Apart from that the patch simplifies and unifies places where save_decoded_options
>>>>>>>> options are transformed back to string representation.
>>>>>>>>
>>>>>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>>>>>>
>>>>>>>> Ready to be installed in next stage1?
>>>>>>>> Thanks,
>>>>>>>> Martin
>>>>>>>
>>>>>>
>>>>>
>>>>
>>
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Qing Zhao]

> On Sep 25, 2020, at 9:55 AM, Martin Liška <mliska@suse.cz> wrote:
> 
> PING^5
> 

Thanks a lot for ping this patch again.

Hopefully it can be committed into GCC 11 very soon.

Qing
> On 7/21/20 6:24 PM, Qing Zhao wrote:
>> PING^4.
>> Our company is waiting for this patch to be committed to upstream.
>> Thanks a lot.
>> Qing
>>> On Jun 16, 2020, at 7:49 AM, Martin Liška <mliska@suse.cz> wrote:
>>> 
>>> PING^3
>>> 
>>> On 6/2/20 11:16 AM, Martin Liška wrote:
>>>> PING^2
>>>> On 5/15/20 11:58 AM, Martin Liška wrote:
>>>>> We're in stage1: PING^1
>>>>> 
>>>>> On 4/3/20 8:15 PM, Egeyar Bagcioglu wrote:
>>>>>> 
>>>>>> 
>>>>>> On 3/18/20 10:05 AM, Martin Liška wrote:
>>>>>>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>>>>>>>> Hi Martin,
>>>>>>>> 
>>>>>>>> I like the patch. It definitely serves our purposes at Oracle and provides another way to do what my previous patches did as well.
>>>>>>>> 
>>>>>>>> 1) It keeps the backwards compatibility regarding -frecord-gcc-switches; therefore, removes my related doubts about your previous patch.
>>>>>>>> 
>>>>>>>> 2) It still makes use of -frecord-gcc-switches. The new option is only to control the format. This addresses some previous objections to having a new option doing something similar. Now the new option controls the behaviour of the existing one and that behaviour can be further extended.
>>>>>>>> 
>>>>>>>> 3) It uses an environment variable as Jakub suggested.
>>>>>>>> 
>>>>>>>> The patch looks good and I confirm that it works for our purposes.
>>>>>>> 
>>>>>>> Hello.
>>>>>>> 
>>>>>>> Thank you for the support.
>>>>>>> 
>>>>>>>> 
>>>>>>>> Having said that, I have to ask for recognition in this patch for my and my company's contributions. Can you please keep my name and my work email in the changelog and in the commit message?
>>>>>>> 
>>>>>>> Sure, sorry I forgot.
>>>>>> 
>>>>>> Hi Martin,
>>>>>> 
>>>>>> I noticed that some comments in the patch were still referring to --record-gcc-command-line, the option I suggested earlier. I updated those comments to mention -frecord-gcc-switches-format instead and also added my name to the patch as you agreed above. I attached the updated patch. We are starting to use this patch in the specific domain where we need its functionality.
>>>>>> 
>>>>>> Regards
>>>>>> Egeyar
>>>>>> 
>>>>>> 
>>>>>>> 
>>>>>>> Martin
>>>>>>> 
>>>>>>>> 
>>>>>>>> Thanks
>>>>>>>> Egeyar
>>>>>>>> 
>>>>>>>> 
>>>>>>>> 
>>>>>>>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>>>>>>>> Hi.
>>>>>>>>> 
>>>>>>>>> I'm sending enhanced patch that makes the following changes:
>>>>>>>>> - a new option -frecord-gcc-switches-format is added; the option
>>>>>>>>>   selects format (processed, driver) for all options that record
>>>>>>>>>   GCC command line
>>>>>>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>>>>>>>> - The .s file is affected in the following way:
>>>>>>>>> 
>>>>>>>>> BEFORE:
>>>>>>>>> 
>>>>>>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>>>>>>>> #    compiled by GNU C version 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>>>>>>> 
>>>>>>>>> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
>>>>>>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>>>>>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>>>>>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx
>>>>>>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1
>>>>>>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>>>>>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd
>>>>>>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>>>>>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>>>>>>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku
>>>>>>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>>>>>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b
>>>>>>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>>>>>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>>>>>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>>>>>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>>>>>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>>>>>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>>>>>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>>>>>>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>>>>>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>>>>>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>>>>>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging -fmath-errno
>>>>>>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>>>>>>>> # -frecord-gcc-switches -freg-struct-return -fsched-critical-path-heuristic
>>>>>>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>>>>>>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>>>>>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>>>>>>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>>>>>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>>>>>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>>>>>>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>>>>>>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>>>>>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>>>>>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64 -m80387
>>>>>>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>>>>>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero -mcx16
>>>>>>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr -mglibc
>>>>>>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>>>>>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf -msha
>>>>>>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>>>>>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt -mxsaves
>>>>>>>>> 
>>>>>>>>> AFTER:
>>>>>>>>> 
>>>>>>>>> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
>>>>>>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=512 -mtune=znver1 -g
>>>>>>>>> 
>>>>>>>>> That's the biggest change I made, but I hope it's acceptable.
>>>>>>>>> Apart from that the patch simplifies and unifies places where save_decoded_options
>>>>>>>>> options are transformed back to string representation.
>>>>>>>>> 
>>>>>>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>>>>>>> 
>>>>>>>>> Ready to be installed in next stage1?
>>>>>>>>> Thanks,
>>>>>>>>> Martin
>>>>>>>> 
>>>>>>> 
>>>>>> 
>>>>> 
>>> 
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^6

The patch is in review process for more than 6 months, can please any global
reviewer take a look at it?

Thanks,
Martin

On 9/25/20 4:55 PM, Martin Liška wrote:
> PING^5

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Qing Zhao]

Jakub and Jeff,

PING^7 on the following patch proposed 8 months ago for gcc11:

https://gcc.gnu.org/pipermail/gcc-patches/2020-March/542198.html <https://gcc.gnu.org/pipermail/gcc-patches/2020-March/542198.html>

The deadline for gcc11 stage 1 is approaching.  The pinged patch is one that has been sent for review 8 months ago in order to 
Make into gcc11. 

And this is an important feature that our company is waiting for a long time. 

Could you please take a look at this patch and let us know whether it’s ready for commit into gcc11? 

Thanks a lot.

Qing




> On Oct 27, 2020, at 5:56 AM, Martin Liška <mliska@suse.cz> wrote:
> 
> PING^6
> 
> The patch is in review process for more than 6 months, can please any global
> reviewer take a look at it?
> 
> Thanks,
> Martin
> 
> On 9/25/20 4:55 PM, Martin Liška wrote:
>> PING^5
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Jose E. Marchesi]

> PING^7 on the following patch proposed 8 months ago for gcc11:
>
> https://gcc.gnu.org/pipermail/gcc-patches/2020-March/542198.html
> <https://gcc.gnu.org/pipermail/gcc-patches/2020-March/542198.html>
>
> The deadline for gcc11 stage 1 is approaching.  The pinged patch is
> one that has been sent for review 8 months ago in order to
> Make into gcc11. 
>
> And this is an important feature that our company is waiting for a long time. 
>
> Could you please take a look at this patch and let us know whether
> it’s ready for commit into gcc11?

ping

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 11/10/20 9:53 PM, Qing Zhao wrote:
> The deadline for gcc11 stage 1 is approaching.  The pinged patch is one that has been sent for review 8 months ago in order to
> Make into gcc11.

Hello.

You didn't miss the deadline as all patches sent before stage1 can be reviewed even during stage3.
Note that many upstream developers (and maintainers) were busy with feature development and now
will be more time for a review.

Thanks for patience. You can bet on having that in GCC 11.1.0

Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Qing Zhao]

> On Nov 16, 2020, at 4:29 AM, Martin Liška <mliska@suse.cz> wrote:
> 
> On 11/10/20 9:53 PM, Qing Zhao wrote:
>> The deadline for gcc11 stage 1 is approaching.  The pinged patch is one that has been sent for review 8 months ago in order to
>> Make into gcc11.
> 
> Hello.
> 
> You didn't miss the deadline as all patches sent before stage1 can be reviewed even during stage3.
> Note that many upstream developers (and maintainers) were busy with feature development and now
> will be more time for a review.
> 
> Thanks for patience. You can bet on having that in GCC 11.1.0

Thank you for this information.

Qing
> 
> Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Richard Biener]

On Fri, Apr 3, 2020 at 8:15 PM Egeyar Bagcioglu
<egeyar.bagcioglu@oracle.com> wrote:
>
>
>
> On 3/18/20 10:05 AM, Martin Liška wrote:
> > On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
> >> Hi Martin,
> >>
> >> I like the patch. It definitely serves our purposes at Oracle and
> >> provides another way to do what my previous patches did as well.
> >>
> >> 1) It keeps the backwards compatibility regarding
> >> -frecord-gcc-switches; therefore, removes my related doubts about
> >> your previous patch.
> >>
> >> 2) It still makes use of -frecord-gcc-switches. The new option is
> >> only to control the format. This addresses some previous objections
> >> to having a new option doing something similar. Now the new option
> >> controls the behaviour of the existing one and that behaviour can be
> >> further extended.
> >>
> >> 3) It uses an environment variable as Jakub suggested.
> >>
> >> The patch looks good and I confirm that it works for our purposes.
> >
> > Hello.
> >
> > Thank you for the support.
> >
> >>
> >> Having said that, I have to ask for recognition in this patch for my
> >> and my company's contributions. Can you please keep my name and my
> >> work email in the changelog and in the commit message?
> >
> > Sure, sorry I forgot.
>
> Hi Martin,
>
> I noticed that some comments in the patch were still referring to
> --record-gcc-command-line, the option I suggested earlier. I updated
> those comments to mention -frecord-gcc-switches-format instead and also
> added my name to the patch as you agreed above. I attached the updated
> patch. We are starting to use this patch in the specific domain where we
> need its functionality.

So while I like the addition of -frecord-gcc-switches-format to preserve
backward compatibility there are IMHO several issues with the patch.

For one, the target hook change to a void(void) hook makes it need to
duplicate too much internals.  Please make it take a const char *
argument, the actual text to output.

For second, I see no good reason to have different handling of
-grecord-gcc-switches vs. -frecord-gcc-switches - they should
produce the same content and thus -frecord-gcc-switches-format
should apply to -grecord-gcc-switches as well.

Now - I think what we output into the assembly file with -fverbose-asm
should _always_ be the processed arguments since the assembly
is produced by cc1, not gcc.

+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  const char *cmdline = getenv ("GCC_DRIVER_COMMAND_LINE");
+  return cmdline != NULL ? cmdline : "";
+}

I think silently emitting nothing is not a good idea.  In particular using
the environment to carry the driver command-line makes it difficult
to reproduce output with pasting commands as dumped by -v [-save-temps].
Likewise the driver seems to always populate GCC_DRIVER_COMMAND_LINE
even if not needed - why not look for -frecord-gcc-switches-format before
doing so?  I'd make -frecord-gcc-switches-format a driver only option
(only the driver can do sth about it) and amend -frecord-gcc-switches
with a -frecord-gcc-switches=FILE variant specifying the content.  The
driver would then substitute -frecord-gcc-switches-format=driver
with -frecord-gcc-switches=tempfile and dump the command line into
tempfile.  cc1 can then pick contents from tempfile or use the processed
variant if no contents are specified.

Richard.


> Regards
> Egeyar
>
>
> >
> > Martin
> >
> >>
> >> Thanks
> >> Egeyar
> >>
> >>
> >>
> >> On 3/17/20 2:53 PM, Martin Liška wrote:
> >>> Hi.
> >>>
> >>> I'm sending enhanced patch that makes the following changes:
> >>> - a new option -frecord-gcc-switches-format is added; the option
> >>>   selects format (processed, driver) for all options that record
> >>>   GCC command line
> >>> - Dwarf gen_produce_string is now used in -fverbose-asm
> >>> - The .s file is affected in the following way:
> >>>
> >>> BEFORE:
> >>>
> >>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision
> >>> 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
> >>> #    compiled by GNU C version 9.2.1 20200128 [revision
> >>> 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR
> >>> version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
> >>>
> >>> # GGC heuristics: --param ggc-min-expand=100 --param
> >>> ggc-min-heapsize=131072
> >>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
> >>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
> >>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi
> >>> -mno-sgx
> >>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2
> >>> -msse4.1
> >>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
> >>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er
> >>> -mno-avx512cd
> >>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
> >>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma
> >>> -mno-avx512vbmi
> >>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero
> >>> -mno-pku
> >>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
> >>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri
> >>> -mno-movdir64b
> >>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
> >>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
> >>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
> >>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
> >>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
> >>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
> >>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact
> >>> -ffunction-cse
> >>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
> >>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
> >>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
> >>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging
> >>> -fmath-errno
> >>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
> >>> # -frecord-gcc-switches -freg-struct-return
> >>> -fsched-critical-path-heuristic
> >>> # -fsched-dep-count-heuristic -fsched-group-heuristic
> >>> -fsched-interblock
> >>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
> >>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep
> >>> -fschedule-fusion
> >>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
> >>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
> >>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math
> >>> -ftree-cselim
> >>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im
> >>> -ftree-loop-ivcanon
> >>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
> >>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
> >>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64
> >>> -m80387
> >>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
> >>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero
> >>> -mcx16
> >>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr
> >>> -mglibc
> >>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
> >>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf
> >>> -msha
> >>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
> >>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt
> >>> -mxsaves
> >>>
> >>> AFTER:
> >>>
> >>> # GGC heuristics: --param ggc-min-expand=30 --param
> >>> ggc-min-heapsize=4096
> >>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx
> >>> -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe
> >>> -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4
> >>> -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm
> >>> -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd
> >>> -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt
> >>> -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf
> >>> -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq
> >>> -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
> >>> -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero
> >>> -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2
> >>> -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg
> >>> -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite
> >>> -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect
> >>> --param=l1-cache-size=32 --param=l1-cache-line-size=64
> >>> --param=l2-cache-size=512 -mtune=znver1 -g
> >>>
> >>> That's the biggest change I made, but I hope it's acceptable.
> >>> Apart from that the patch simplifies and unifies places where
> >>> save_decoded_options
> >>> options are transformed back to string representation.
> >>>
> >>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
> >>>
> >>> Ready to be installed in next stage1?
> >>> Thanks,
> >>> Martin
> >>
> >
>

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 9781 bytes --]

On 11/20/20 10:49 AM, Richard Biener wrote:
> On Fri, Apr 3, 2020 at 8:15 PM Egeyar Bagcioglu
> <egeyar.bagcioglu@oracle.com> wrote:
>>
>>
>>
>> On 3/18/20 10:05 AM, Martin Liška wrote:
>>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
>>>> Hi Martin,
>>>>
>>>> I like the patch. It definitely serves our purposes at Oracle and
>>>> provides another way to do what my previous patches did as well.
>>>>
>>>> 1) It keeps the backwards compatibility regarding
>>>> -frecord-gcc-switches; therefore, removes my related doubts about
>>>> your previous patch.
>>>>
>>>> 2) It still makes use of -frecord-gcc-switches. The new option is
>>>> only to control the format. This addresses some previous objections
>>>> to having a new option doing something similar. Now the new option
>>>> controls the behaviour of the existing one and that behaviour can be
>>>> further extended.
>>>>
>>>> 3) It uses an environment variable as Jakub suggested.
>>>>
>>>> The patch looks good and I confirm that it works for our purposes.
>>>
>>> Hello.
>>>
>>> Thank you for the support.
>>>
>>>>
>>>> Having said that, I have to ask for recognition in this patch for my
>>>> and my company's contributions. Can you please keep my name and my
>>>> work email in the changelog and in the commit message?
>>>
>>> Sure, sorry I forgot.
>>
>> Hi Martin,
>>
>> I noticed that some comments in the patch were still referring to
>> --record-gcc-command-line, the option I suggested earlier. I updated
>> those comments to mention -frecord-gcc-switches-format instead and also
>> added my name to the patch as you agreed above. I attached the updated
>> patch. We are starting to use this patch in the specific domain where we
>> need its functionality.
> 
> So while I like the addition of -frecord-gcc-switches-format to preserve
> backward compatibility there are IMHO several issues with the patch.

Hey.

> 
> For one, the target hook change to a void(void) hook makes it need to
> duplicate too much internals.  Please make it take a const char *
> argument, the actual text to output.

Agree with that, nice improvement.

> 
> For second, I see no good reason to have different handling of
> -grecord-gcc-switches vs. -frecord-gcc-switches - they should
> produce the same content and thus -frecord-gcc-switches-format
> should apply to -grecord-gcc-switches as well.

They do. Both respect the newly added -frecord-gcc-switches-format argument.

> 
> Now - I think what we output into the assembly file with -fverbose-asm
> should _always_ be the processed arguments since the assembly
> is produced by cc1, not gcc.

All right, changed that.

> 
> +/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
> +   Otherwise return empty string.  */
> +
> +const char *
> +get_driver_command_line ()
> +{
> +  const char *cmdline = getenv ("GCC_DRIVER_COMMAND_LINE");
> +  return cmdline != NULL ? cmdline : "";
> +}
> 
> I think silently emitting nothing is not a good idea.  In particular using
> the environment to carry the driver command-line makes it difficult
> to reproduce output with pasting commands as dumped by -v [-save-temps].
> Likewise the driver seems to always populate GCC_DRIVER_COMMAND_LINE
> even if not needed - why not look for -frecord-gcc-switches-format before
> doing so?  I'd make -frecord-gcc-switches-format a driver only option
> (only the driver can do sth about it) and amend -frecord-gcc-switches
> with a -frecord-gcc-switches=FILE variant specifying the content.  The
> driver would then substitute -frecord-gcc-switches-format=driver
> with -frecord-gcc-switches=tempfile and dump the command line into
> tempfile.  cc1 can then pick contents from tempfile or use the processed
> variant if no contents are specified.

I've just rewritten that to -frecord-gcc-switches-file option. Note that
we can't transform that to -frecord-gcc-switches=FILE as one can use:

-g frecord-gcc-switches-format=driver and so -frecord-gcc-switches is off.

Thoughts on the new version of the patch?
Thanks,
Martin

> 
> Richard.
> 
> 
>> Regards
>> Egeyar
>>
>>
>>>
>>> Martin
>>>
>>>>
>>>> Thanks
>>>> Egeyar
>>>>
>>>>
>>>>
>>>> On 3/17/20 2:53 PM, Martin Liška wrote:
>>>>> Hi.
>>>>>
>>>>> I'm sending enhanced patch that makes the following changes:
>>>>> - a new option -frecord-gcc-switches-format is added; the option
>>>>>    selects format (processed, driver) for all options that record
>>>>>    GCC command line
>>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
>>>>> - The .s file is affected in the following way:
>>>>>
>>>>> BEFORE:
>>>>>
>>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision
>>>>> 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
>>>>> #    compiled by GNU C version 9.2.1 20200128 [revision
>>>>> 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR
>>>>> version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
>>>>>
>>>>> # GGC heuristics: --param ggc-min-expand=100 --param
>>>>> ggc-min-heapsize=131072
>>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
>>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
>>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi
>>>>> -mno-sgx
>>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2
>>>>> -msse4.1
>>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
>>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er
>>>>> -mno-avx512cd
>>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
>>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma
>>>>> -mno-avx512vbmi
>>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero
>>>>> -mno-pku
>>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
>>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri
>>>>> -mno-movdir64b
>>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
>>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
>>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
>>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
>>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
>>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
>>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact
>>>>> -ffunction-cse
>>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
>>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
>>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
>>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging
>>>>> -fmath-errno
>>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>>>>> # -frecord-gcc-switches -freg-struct-return
>>>>> -fsched-critical-path-heuristic
>>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic
>>>>> -fsched-interblock
>>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep
>>>>> -fschedule-fusion
>>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math
>>>>> -ftree-cselim
>>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im
>>>>> -ftree-loop-ivcanon
>>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64
>>>>> -m80387
>>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
>>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero
>>>>> -mcx16
>>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr
>>>>> -mglibc
>>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
>>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf
>>>>> -msha
>>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
>>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt
>>>>> -mxsaves
>>>>>
>>>>> AFTER:
>>>>>
>>>>> # GGC heuristics: --param ggc-min-expand=30 --param
>>>>> ggc-min-heapsize=4096
>>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx
>>>>> -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe
>>>>> -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4
>>>>> -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm
>>>>> -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd
>>>>> -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt
>>>>> -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf
>>>>> -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq
>>>>> -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
>>>>> -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero
>>>>> -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2
>>>>> -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg
>>>>> -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite
>>>>> -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect
>>>>> --param=l1-cache-size=32 --param=l1-cache-line-size=64
>>>>> --param=l2-cache-size=512 -mtune=znver1 -g
>>>>>
>>>>> That's the biggest change I made, but I hope it's acceptable.
>>>>> Apart from that the patch simplifies and unifies places where
>>>>> save_decoded_options
>>>>> options are transformed back to string representation.
>>>>>
>>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>>>>
>>>>> Ready to be installed in next stage1?
>>>>> Thanks,
>>>>> Martin
>>>>
>>>
>>


[-- Attachment #2: 0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch --]
[-- Type: text/x-patch, Size: 29638 bytes --]

From b0e9bd2a625d06417fb2b52d04a824f33aba633c Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 5 Mar 2020 09:39:17 +0100
Subject: [PATCH] Change semantics of -frecord-gcc-switches and add
 -frecord-gcc-switches-format.

gcc/ChangeLog:

2020-03-17  Martin Liska  <mliska@suse.cz>
	    Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* common.opt: Document new options -frecord-gcc-switches-format
	and -frecord-gcc-switches-file.
	* doc/invoke.texi: Document the new options.
	* doc/tm.texi: Remove documentation of the print_switch_type
	enum value.
	* dwarf2out.c (dwarf2out_early_finish): Respect
	flag_record_gcc_switches_format.
	* flag-types.h (enum record_gcc_switches_format): New.
	* gcc.c (save_driver_cmdline): Save command line to a temporary
	file.
	(driver::main): Call set_commandline.
	(driver::set_commandline): New.
	* gcc.h (set_commandline): New.
	* opts.c (get_producer_string): New function.
	(get_driver_command_line): Likewise.
	* opts.h (get_producer_string): New.
	(get_driver_command_line): New.
	* target.def: Change argument of record_gcc_switches to a string
	that is printed to a file.
	* target.h (enum print_switch_type): Remove.
	(elf_record_gcc_switches): Change argument of the function
	* toplev.c (MAX_LINE): Remove.
	(print_to_asm_out_file): Remove.
	(print_to_stderr): Likewise.
	(print_single_switch): Likewise.
	(print_switch_values): Likewise.
	(init_asm_output): Use new function get_producer_string.
	(process_options): Respect flag_record_gcc_switches_format
	option.
	* varasm.c (elf_record_gcc_switches): Simplify hook by just
	printing the argument passed.
---
 gcc/common.opt      |  19 ++++-
 gcc/doc/invoke.texi |  23 +++++-
 gcc/doc/tm.texi     |  38 +--------
 gcc/dwarf2out.c     |  15 +++-
 gcc/flag-types.h    |   7 ++
 gcc/gcc.c           |  37 ++++++++-
 gcc/gcc.h           |   1 +
 gcc/opts.c          | 139 ++++++++++++++++++++++++++++++++
 gcc/opts.h          |   6 ++
 gcc/target.def      |  38 +--------
 gcc/target.h        |  14 +---
 gcc/toplev.c        | 187 +++++++-------------------------------------
 gcc/varasm.c        |  48 +++---------
 13 files changed, 287 insertions(+), 285 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index ca8a2690799..a29735db669 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2322,9 +2322,26 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Driver Report Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
+Enum
+Name(record_gcc_switches_format) Type(enum record_gcc_switches_format)
+
+EnumValue
+Enum(record_gcc_switches_format) String(processed) Value(RECORD_GCC_SWITCHES_PROCESSED)
+
+EnumValue
+Enum(record_gcc_switches_format) String(driver) Value(RECORD_GCC_SWITCHES_DRIVER)
+
+frecord-gcc-switches-format=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_format) Enum(record_gcc_switches_format) Init(RECORD_GCC_SWITCHES_PROCESSED)
+-frecord-gcc-switches-format=[processed|driver]	Format of recorded gcc command line switches.
+
+frecord-gcc-switches-file=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_file) Undocumented
+Path to file test.
+
 freg-struct-return
 Common Report Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 26372a2435a..d7e43c84ffc 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -642,7 +642,7 @@ Objective-C and Objective-C++ Dialects}.
 -finhibit-size-directive  -fcommon  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC  -fpie  -fPIE  -fno-plt @gol
 -fno-jump-tables -fno-bit-tests @gol
--frecord-gcc-switches @gol
+-frecord-gcc-switches -frecord-gcc-switches-format @gol
 -freg-struct-return  -fshort-enums  -fshort-wchar @gol
 -fverbose-asm  -fpack-struct[=@var{n}]  @gol
 -fleading-underscore  -ftls-model=@var{model} @gol
@@ -16022,6 +16022,27 @@ comments, so it never reaches the object file.
 See also @option{-grecord-gcc-switches} for another
 way of storing compiler options into the object file.
 
+@item -frecord-gcc-switches-format=@var{format}
+@opindex frecord-gcc-switches-format
+This switch controls the output format of options that record
+the command line.  The affected options are @option{-frecord-gcc-switches},
+@option{-grecord-gcc-switches} and @option{-fverbose-asm}.
+
+The @var{format} argument should be one of the following:
+
+@table @samp
+
+@item processed
+
+Options are printed after processing by the compiler driver.
+It is the default option value.
+
+@item driver
+
+Options are printed as provided to the compiler driver.
+
+@end table
+
 @item -fpic
 @opindex fpic
 @cindex global offset table
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 2b88f78944f..baee63a3700 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8077,43 +8077,9 @@ need to override this if your target has special flags that might be
 set via @code{__attribute__}.
 @end deftypefn
 
-@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_SWITCHES (print_switch_type @var{type}, const char *@var{text})
+@deftypefn {Target Hook} void TARGET_ASM_RECORD_GCC_SWITCHES (const char *@var{})
 Provides the target with the ability to record the gcc command line
-switches that have been passed to the compiler, and options that are
-enabled.  The @var{type} argument specifies what is being recorded.
-It can take the following values:
-
-@table @gcctabopt
-@item SWITCH_TYPE_PASSED
-@var{text} is a command line switch that has been set by the user.
-
-@item SWITCH_TYPE_ENABLED
-@var{text} is an option which has been enabled.  This might be as a
-direct result of a command line switch, or because it is enabled by
-default or because it has been enabled as a side effect of a different
-command line switch.  For example, the @option{-O2} switch enables
-various different individual optimization passes.
-
-@item SWITCH_TYPE_DESCRIPTIVE
-@var{text} is either NULL or some descriptive text which should be
-ignored.  If @var{text} is NULL then it is being used to warn the
-target hook that either recording is starting or ending.  The first
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the
-warning is for start up and the second time the warning is for
-wind down.  This feature is to allow the target hook to make any
-necessary preparations before it starts to record switches and to
-perform any necessary tidying up after it has finished recording
-switches.
-
-@item SWITCH_TYPE_LINE_START
-This option can be ignored by this target hook.
-
-@item  SWITCH_TYPE_LINE_END
-This option can be ignored by this target hook.
-@end table
-
-The hook's return value must be zero.  Other return values may be
-supported in the future.
+switches provided as argument.
 
 By default this hook is set to NULL, but an example implementation is
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 01e7ae183d5..8e13ef00083 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -32145,7 +32145,20 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
-  producer_string = gen_producer_string ();
+  producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+
+  if (dwarf_record_gcc_switches)
+    {
+      char *producer_string_old = producer_string;
+      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	producer_string = concat (producer_string, " ",
+				  get_driver_command_line (), NULL);
+      else
+	producer_string = get_producer_string (lang_hooks.name,
+					       save_decoded_options,
+					       save_decoded_options_count);
+      free (producer_string_old);
+    }
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
 
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index 0dbab19943c..fa46de9e9bf 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -424,6 +424,13 @@ enum openacc_kernels
   OPENACC_KERNELS_PARLOOPS
 };
 
+/* Record GCC options type.  */
+enum record_gcc_switches_format
+{
+  RECORD_GCC_SWITCHES_PROCESSED = 0,
+  RECORD_GCC_SWITCHES_DRIVER
+};
+
 #endif
 
 #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index d78b5f582b5..a13e26c0c9f 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,12 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv provided to the driver.  Necessary to keep for when
+   -frecord-gcc-switches-format=driver is given.  */
+
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -433,6 +439,7 @@ static const char *greater_than_spec_func (int, const char **);
 static const char *debug_level_greater_than_spec_func (int, const char **);
 static const char *dwarf_version_greater_than_spec_func (int, const char **);
 static const char *find_fortran_preinclude_file (int, const char **);
+static const char *save_driver_cmdline (int, const char **);
 static char *convert_white_space (char *);
 static char *quote_spec (char *);
 static char *quote_spec_arg (char *);
@@ -1255,7 +1262,9 @@ static const char *cc1_options =
  %{coverage:-fprofile-arcs -ftest-coverage}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
-     %{pthread:-fprofile-update=prefer-atomic}}}";
+     %{pthread:-fprofile-update=prefer-atomic}}}\
+ %{frecord-gcc-switches-format=driver:-frecord-gcc-switches-file=%:save-driver-cmdline(%g.cmdline)\
+   %<-frecord-gcc-switches-format=driver}";
 
 static const char *asm_options =
 "%{-target-help:%:print-asm-header()} "
@@ -1747,6 +1756,7 @@ static const struct spec_function static_spec_functions[] =
   { "debug-level-gt",		debug_level_greater_than_spec_func },
   { "dwarf-version-gt",		dwarf_version_greater_than_spec_func },
   { "fortran-preinclude-file",	find_fortran_preinclude_file},
+  { "save-driver-cmdline",	save_driver_cmdline},
 #ifdef EXTRA_SPEC_FUNCTIONS
   EXTRA_SPEC_FUNCTIONS
 #endif
@@ -7991,6 +8001,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -8034,6 +8045,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep the command line for -frecord-gcc-switches-format=driver.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
@@ -10771,6 +10791,21 @@ find_fortran_preinclude_file (int argc, const char **argv)
   return result;
 }
 
+/* Save driver options to a temporary file.  */
+
+static const char *
+save_driver_cmdline (int argc ATTRIBUTE_UNUSED,
+		     const char **argv)
+{
+  FILE *f = fopen (argv[0], "w");
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    fprintf (f, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+  fclose (f);
+
+  return argv[0];
+}
+
+
 /* If any character in ORIG fits QUOTE_P (_, P), reallocate the string
    so as to precede every one of them with a backslash.  Return the
    original string or the reallocated one.  */
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08f059..cde77fbaad7 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/opts.c b/gcc/opts.c
index 57774916a09..5cb5aaac8f7 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "spellcheck.h"
 #include "opt-suggestions.h"
 #include "diagnostic-color.h"
+#include "version.h"
 #include "selftest.h"
 
 static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
@@ -3200,6 +3201,144 @@ get_option_url (diagnostic_context *, int option_index)
     return NULL;
 }
 
+/* Return a heap allocated producer string including command line options.  */
+
+char *
+get_producer_string (const char *language_string, cl_decoded_option *options,
+		     unsigned int options_count)
+{
+  size_t j;
+  auto_vec<const char *> switches;
+  char *producer, *tail;
+  const char *p;
+  size_t len = 0;
+  size_t plen = strlen (language_string) + 1 + strlen (version_string);
+
+  for (j = 0; j < options_count; j++)
+    switch (options[j].opt_index)
+      {
+      case OPT_o:
+      case OPT_d:
+      case OPT_dumpbase:
+      case OPT_dumpdir:
+      case OPT_quiet:
+      case OPT_version:
+      case OPT_v:
+      case OPT_w:
+      case OPT_L:
+      case OPT_D:
+      case OPT_I:
+      case OPT_U:
+      case OPT_SPECIAL_unknown:
+      case OPT_SPECIAL_ignore:
+      case OPT_SPECIAL_warn_removed:
+      case OPT_SPECIAL_program_name:
+      case OPT_SPECIAL_input_file:
+      case OPT_grecord_gcc_switches:
+      case OPT_frecord_gcc_switches:
+      case OPT_frecord_gcc_switches_format_:
+      case OPT__output_pch_:
+      case OPT_fdiagnostics_show_location_:
+      case OPT_fdiagnostics_show_option:
+      case OPT_fdiagnostics_show_caret:
+      case OPT_fdiagnostics_show_labels:
+      case OPT_fdiagnostics_show_line_numbers:
+      case OPT_fdiagnostics_color_:
+      case OPT_fdiagnostics_format_:
+      case OPT_fverbose_asm:
+      case OPT____:
+      case OPT__sysroot_:
+      case OPT_nostdinc:
+      case OPT_nostdinc__:
+      case OPT_fpreprocessed:
+      case OPT_fltrans_output_list_:
+      case OPT_fresolution_:
+      case OPT_fdebug_prefix_map_:
+      case OPT_fmacro_prefix_map_:
+      case OPT_ffile_prefix_map_:
+      case OPT_fcompare_debug:
+      case OPT_fchecking:
+      case OPT_fchecking_:
+	/* Ignore these.  */
+	continue;
+      case OPT_flto_:
+	{
+	  const char *lto_canonical = "-flto";
+	  switches.safe_push (lto_canonical);
+	  len += strlen (lto_canonical) + 1;
+	  break;
+	}
+      default:
+	if (cl_options[options[j].opt_index].flags
+	    & CL_NO_DWARF_RECORD)
+	  continue;
+	gcc_checking_assert (options[j].canonical_option[0][0] == '-');
+	switch (options[j].canonical_option[0][1])
+	  {
+	  case 'M':
+	  case 'i':
+	  case 'W':
+	    continue;
+	  case 'f':
+	    if (strncmp (options[j].canonical_option[0] + 2,
+			 "dump", 4) == 0)
+	      continue;
+	    break;
+	  default:
+	    break;
+	  }
+	switches.safe_push (options[j].orig_option_with_args_text);
+	len += strlen (options[j].orig_option_with_args_text) + 1;
+	break;
+      }
+
+  producer = XNEWVEC (char, plen + 1 + len + 1);
+  tail = producer;
+  sprintf (tail, "%s %s", language_string, version_string);
+  tail += plen;
+
+  FOR_EACH_VEC_ELT (switches, j, p)
+    {
+      len = strlen (p);
+      *tail = ' ';
+      memcpy (tail + 1, p, len);
+      tail += len + 1;
+    }
+
+  *tail = '\0';
+  return producer;
+}
+
+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  static char *cmdline = NULL;
+
+  if (cmdline != NULL)
+    return cmdline;
+
+  FILE *f = fopen (flag_record_gcc_switches_file, "r");
+  if (f == NULL)
+    fatal_error (UNKNOWN_LOCATION, "cannot open %s: %m", flag_record_gcc_switches_file);
+
+  fseek(f, 0, SEEK_END);
+  unsigned int size = ftell (f);
+  fseek(f, 0, SEEK_SET);
+
+  cmdline = XNEWVEC (char, size + 1);
+
+  unsigned int read;
+  char *ptr = cmdline;
+  while ((read = fread (ptr, 4096, 1, f)))
+    ptr += read;
+
+  cmdline[size] = '\0';
+  return cmdline;
+}
+
 #if CHECKING_P
 
 namespace selftest {
diff --git a/gcc/opts.h b/gcc/opts.h
index d62bfcfdf6a..4f4684ed8c2 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -482,6 +482,12 @@ extern void parse_options_from_collect_gcc_options (const char *, obstack *,
 
 extern void prepend_xassembler_to_collect_as_options (const char *, obstack *);
 
+extern char *get_producer_string (const char *language_string,
+				  cl_decoded_option *options,
+				  unsigned int options_count);
+
+extern const char *get_driver_command_line ();
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/target.def b/gcc/target.def
index 810d5542c28..62b409507c9 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -757,41 +757,7 @@ directive to annotate @var{symbol} as used.  The Darwin target uses the\n\
 DEFHOOK
 (record_gcc_switches,
  "Provides the target with the ability to record the gcc command line\n\
-switches that have been passed to the compiler, and options that are\n\
-enabled.  The @var{type} argument specifies what is being recorded.\n\
-It can take the following values:\n\
-\n\
-@table @gcctabopt\n\
-@item SWITCH_TYPE_PASSED\n\
-@var{text} is a command line switch that has been set by the user.\n\
-\n\
-@item SWITCH_TYPE_ENABLED\n\
-@var{text} is an option which has been enabled.  This might be as a\n\
-direct result of a command line switch, or because it is enabled by\n\
-default or because it has been enabled as a side effect of a different\n\
-command line switch.  For example, the @option{-O2} switch enables\n\
-various different individual optimization passes.\n\
-\n\
-@item SWITCH_TYPE_DESCRIPTIVE\n\
-@var{text} is either NULL or some descriptive text which should be\n\
-ignored.  If @var{text} is NULL then it is being used to warn the\n\
-target hook that either recording is starting or ending.  The first\n\
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the\n\
-warning is for start up and the second time the warning is for\n\
-wind down.  This feature is to allow the target hook to make any\n\
-necessary preparations before it starts to record switches and to\n\
-perform any necessary tidying up after it has finished recording\n\
-switches.\n\
-\n\
-@item SWITCH_TYPE_LINE_START\n\
-This option can be ignored by this target hook.\n\
-\n\
-@item  SWITCH_TYPE_LINE_END\n\
-This option can be ignored by this target hook.\n\
-@end table\n\
-\n\
-The hook's return value must be zero.  Other return values may be\n\
-supported in the future.\n\
+switches provided as argument.\n\
 \n\
 By default this hook is set to NULL, but an example implementation is\n\
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},\n\
@@ -799,7 +765,7 @@ it records the switches as ASCII text inside a new, string mergeable\n\
 section in the assembler output file.  The name of the new section is\n\
 provided by the @code{TARGET_ASM_RECORD_GCC_SWITCHES_SECTION} target\n\
 hook.",
- int, (print_switch_type type, const char *text),
+ void, (const char *),
  NULL)
 
 /* The name of the section that the example ELF implementation of
diff --git a/gcc/target.h b/gcc/target.h
index 440cd25f297..960188023f1 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -68,16 +68,6 @@ union cumulative_args_t { void *p; };
 
 #endif /* !CHECKING_P */
 
-/* Types used by the record_gcc_switches() target function.  */
-enum print_switch_type
-{
-  SWITCH_TYPE_PASSED,		/* A switch passed on the command line.  */
-  SWITCH_TYPE_ENABLED,		/* An option that is currently enabled.  */
-  SWITCH_TYPE_DESCRIPTIVE,	/* Descriptive text, not a switch or option.  */
-  SWITCH_TYPE_LINE_START,	/* Please emit any necessary text at the start of a line.  */
-  SWITCH_TYPE_LINE_END		/* Please emit a line terminator.  */
-};
-
 /* Types of memory operation understood by the "by_pieces" infrastructure.
    Used by the TARGET_USE_BY_PIECES_INFRASTRUCTURE_P target hook and
    internally by the functions in expr.c.  */
@@ -96,10 +86,8 @@ extern unsigned HOST_WIDE_INT by_pieces_ninsns (unsigned HOST_WIDE_INT,
 						unsigned int,
 						by_pieces_operation);
 
-typedef int (* print_switch_fn_type) (print_switch_type, const char *);
-
 /* An example implementation for ELF targets.  Defined in varasm.c  */
-extern int elf_record_gcc_switches (print_switch_type type, const char *);
+extern void elf_record_gcc_switches (const char *);
 
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
diff --git a/gcc/toplev.c b/gcc/toplev.c
index e0e0e04e95f..14e3169d0d0 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -116,9 +116,6 @@ static void compile_file (void);
 /* True if we don't need a backend (e.g. preprocessing only).  */
 static bool no_backend;
 
-/* Length of line when printing switch values.  */
-#define MAX_LINE 75
-
 /* Decoded options, and number of such options.  */
 struct cl_decoded_option *save_decoded_options;
 unsigned int save_decoded_options_count;
@@ -684,148 +681,7 @@ print_version (FILE *file, const char *indent, bool show_global_state)
     }
 }
 
-static int
-print_to_asm_out_file (print_switch_type type, const char * text)
-{
-  bool prepend_sep = true;
-
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', asm_out_file);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      fputs (ASM_COMMENT_START, asm_out_file);
-      return strlen (ASM_COMMENT_START);
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (ASM_COMMENT_START[0] == 0)
-	prepend_sep = false;
-      /* FALLTHRU */
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      if (prepend_sep)
-	fputc (' ', asm_out_file);
-      fputs (text, asm_out_file);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-static int
-print_to_stderr (print_switch_type type, const char * text)
-{
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', stderr);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      return 0;
-
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      fputc (' ', stderr);
-      /* FALLTHRU */
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      fputs (text, stderr);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-/* Print an option value and return the adjusted position in the line.
-   ??? print_fn doesn't handle errors, eg disk full; presumably other
-   code will catch a disk full though.  */
-
-static int
-print_single_switch (print_switch_fn_type print_fn,
-		     int pos,
-		     print_switch_type type,
-		     const char * text)
-{
-  /* The ultrix fprintf returns 0 on success, so compute the result
-     we want here since we need it for the following test.  The +1
-     is for the separator character that will probably be emitted.  */
-  int len = strlen (text) + 1;
-
-  if (pos != 0
-      && pos + len > MAX_LINE)
-    {
-      print_fn (SWITCH_TYPE_LINE_END, NULL);
-      pos = 0;
-    }
-
-  if (pos == 0)
-    pos += print_fn (SWITCH_TYPE_LINE_START, NULL);
 
-  print_fn (type, text);
-  return pos + len;
-}
-
-/* Print active target switches using PRINT_FN.
-   POS is the current cursor position and MAX is the size of a "line".
-   Each line begins with INDENT and ends with TERM.
-   Each switch is separated from the next by SEP.  */
-
-static void
-print_switch_values (print_switch_fn_type print_fn)
-{
-  int pos = 0;
-  size_t j;
-
-  /* Print the options as passed.  */
-  pos = print_single_switch (print_fn, pos,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options passed: "));
-
-  for (j = 1; j < save_decoded_options_count; j++)
-    {
-      switch (save_decoded_options[j].opt_index)
-	{
-	case OPT_o:
-	case OPT_d:
-	case OPT_dumpbase:
-	case OPT_dumpbase_ext:
-	case OPT_dumpdir:
-	case OPT_quiet:
-	case OPT_version:
-	  /* Ignore these.  */
-	  continue;
-	}
-
-      pos = print_single_switch (print_fn, pos, SWITCH_TYPE_PASSED,
-				 save_decoded_options[j].orig_option_with_args_text);
-    }
-
-  if (pos > 0)
-    print_fn (SWITCH_TYPE_LINE_END, NULL);
-
-  /* Print the -f and -m options that have been enabled.
-     We don't handle language specific options but printing argv
-     should suffice.  */
-  pos = print_single_switch (print_fn, 0,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options enabled: "));
-
-  unsigned lang_mask = lang_hooks.option_lang_mask ();
-  for (j = 0; j < cl_options_count; j++)
-    if (cl_options[j].cl_report
-	&& option_enabled (j, lang_mask, &global_options) > 0)
-      pos = print_single_switch (print_fn, pos,
-				 SWITCH_TYPE_ENABLED, cl_options[j].opt_text);
-
-  print_fn (SWITCH_TYPE_LINE_END, NULL);
-}
 
 /* Open assembly code output file.  Do this even if -fsyntax-only is
    on, because then the driver will have provided the name of a
@@ -872,14 +728,21 @@ init_asm_output (const char *name)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
 	    {
-	      /* Let the target know that we are about to start recording.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	      /* Now record the switches.  */
-	      print_switch_values (targetm.asm_out.record_gcc_switches);
-	      /* Let the target know that the recording is over.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
+	      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+		{
+		  const char *str = concat (version_string, " ",
+					    get_driver_command_line (), NULL);
+		  targetm.asm_out.record_gcc_switches (str);
+		  free (CONST_CAST (char *, str));
+		}
+	      else
+		{
+		  const char *str
+		    = get_producer_string (lang_hooks.name,
+					   save_decoded_options,
+					   save_decoded_options_count);
+		  targetm.asm_out.record_gcc_switches (str);
+		}
 	    }
 	  else
 	    inform (UNKNOWN_LOCATION,
@@ -889,11 +752,13 @@ init_asm_output (const char *name)
 
       if (flag_verbose_asm)
 	{
-	  /* Print the list of switches in effect
-	     into the assembler file as comments.  */
 	  print_version (asm_out_file, ASM_COMMENT_START, true);
-	  print_switch_values (print_to_asm_out_file);
-	  putc ('\n', asm_out_file);
+	  fputs (ASM_COMMENT_START, asm_out_file);
+	  fputc (' ', asm_out_file);
+	  fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+				      save_decoded_options_count),
+		 asm_out_file);
+	  fputc ('\n', asm_out_file);
 	}
     }
 }
@@ -1523,8 +1388,14 @@ process_options (void)
   if (version_flag)
     {
       print_version (stderr, "", true);
-      if (! quiet_flag)
-	print_switch_values (print_to_stderr);
+      if (!quiet_flag)
+	{
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), stderr);
+	  else
+	    fputs (get_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count), stderr);
+	}
     }
 
   if (flag_syntax_only)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index ada99940f65..f599d79bdb3 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -58,6 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl-iter.h"
 #include "file-prefix-map.h" /* remap_debug_filename()  */
 #include "alloc-pool.h"
+#include "toplev.h"
+#include "opts.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data declarations.  */
@@ -8013,45 +8016,14 @@ output_object_blocks (void)
    we want to emit NUL strings terminators into the object file we have to use
    ASM_OUTPUT_SKIP.  */
 
-int
-elf_record_gcc_switches (print_switch_type type, const char * name)
+void
+elf_record_gcc_switches (const char *options)
 {
-  switch (type)
-    {
-    case SWITCH_TYPE_PASSED:
-      ASM_OUTPUT_ASCII (asm_out_file, name, strlen (name));
-      ASM_OUTPUT_SKIP (asm_out_file, HOST_WIDE_INT_1U);
-      break;
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (name == NULL)
-	{
-	  /* Distinguish between invocations where name is NULL.  */
-	  static bool started = false;
-
-	  if (!started)
-	    {
-	      section * sec;
-
-	      sec = get_section (targetm.asm_out.record_gcc_switches_section,
-				 SECTION_DEBUG
-				 | SECTION_MERGE
-				 | SECTION_STRINGS
-				 | (SECTION_ENTSIZE & 1),
-				 NULL);
-	      switch_to_section (sec);
-	      started = true;
-	    }
-	}
-
-    default:
-      break;
-    }
-
-  /* The return value is currently ignored by the caller, but must be 0.
-     For -fverbose-asm the return value would be the number of characters
-     emitted into the assembler file.  */
-  return 0;
+  section *sec = get_section (targetm.asm_out.record_gcc_switches_section,
+			      SECTION_DEBUG | SECTION_MERGE
+			      | SECTION_STRINGS | (SECTION_ENTSIZE & 1), NULL);
+  switch_to_section (sec);
+  ASM_OUTPUT_ASCII (asm_out_file, options, strlen (options) + 1);
 }
 
 /* Emit text to declare externally defined symbols. It is needed to
-- 
2.29.2

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Richard Biener]

On Mon, Nov 23, 2020 at 10:00 AM Martin Liška <mliska@suse.cz> wrote:
>
> On 11/20/20 10:49 AM, Richard Biener wrote:
> > On Fri, Apr 3, 2020 at 8:15 PM Egeyar Bagcioglu
> > <egeyar.bagcioglu@oracle.com> wrote:
> >>
> >>
> >>
> >> On 3/18/20 10:05 AM, Martin Liška wrote:
> >>> On 3/17/20 7:43 PM, Egeyar Bagcioglu wrote:
> >>>> Hi Martin,
> >>>>
> >>>> I like the patch. It definitely serves our purposes at Oracle and
> >>>> provides another way to do what my previous patches did as well.
> >>>>
> >>>> 1) It keeps the backwards compatibility regarding
> >>>> -frecord-gcc-switches; therefore, removes my related doubts about
> >>>> your previous patch.
> >>>>
> >>>> 2) It still makes use of -frecord-gcc-switches. The new option is
> >>>> only to control the format. This addresses some previous objections
> >>>> to having a new option doing something similar. Now the new option
> >>>> controls the behaviour of the existing one and that behaviour can be
> >>>> further extended.
> >>>>
> >>>> 3) It uses an environment variable as Jakub suggested.
> >>>>
> >>>> The patch looks good and I confirm that it works for our purposes.
> >>>
> >>> Hello.
> >>>
> >>> Thank you for the support.
> >>>
> >>>>
> >>>> Having said that, I have to ask for recognition in this patch for my
> >>>> and my company's contributions. Can you please keep my name and my
> >>>> work email in the changelog and in the commit message?
> >>>
> >>> Sure, sorry I forgot.
> >>
> >> Hi Martin,
> >>
> >> I noticed that some comments in the patch were still referring to
> >> --record-gcc-command-line, the option I suggested earlier. I updated
> >> those comments to mention -frecord-gcc-switches-format instead and also
> >> added my name to the patch as you agreed above. I attached the updated
> >> patch. We are starting to use this patch in the specific domain where we
> >> need its functionality.
> >
> > So while I like the addition of -frecord-gcc-switches-format to preserve
> > backward compatibility there are IMHO several issues with the patch.
>
> Hey.
>
> >
> > For one, the target hook change to a void(void) hook makes it need to
> > duplicate too much internals.  Please make it take a const char *
> > argument, the actual text to output.
>
> Agree with that, nice improvement.
>
> >
> > For second, I see no good reason to have different handling of
> > -grecord-gcc-switches vs. -frecord-gcc-switches - they should
> > produce the same content and thus -frecord-gcc-switches-format
> > should apply to -grecord-gcc-switches as well.
>
> They do. Both respect the newly added -frecord-gcc-switches-format argument.
>
> >
> > Now - I think what we output into the assembly file with -fverbose-asm
> > should _always_ be the processed arguments since the assembly
> > is produced by cc1, not gcc.
>
> All right, changed that.
>
> >
> > +/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
> > +   Otherwise return empty string.  */
> > +
> > +const char *
> > +get_driver_command_line ()
> > +{
> > +  const char *cmdline = getenv ("GCC_DRIVER_COMMAND_LINE");
> > +  return cmdline != NULL ? cmdline : "";
> > +}
> >
> > I think silently emitting nothing is not a good idea.  In particular using
> > the environment to carry the driver command-line makes it difficult
> > to reproduce output with pasting commands as dumped by -v [-save-temps].
> > Likewise the driver seems to always populate GCC_DRIVER_COMMAND_LINE
> > even if not needed - why not look for -frecord-gcc-switches-format before
> > doing so?  I'd make -frecord-gcc-switches-format a driver only option
> > (only the driver can do sth about it) and amend -frecord-gcc-switches
> > with a -frecord-gcc-switches=FILE variant specifying the content.  The
> > driver would then substitute -frecord-gcc-switches-format=driver
> > with -frecord-gcc-switches=tempfile and dump the command line into
> > tempfile.  cc1 can then pick contents from tempfile or use the processed
> > variant if no contents are specified.
>
> I've just rewritten that to -frecord-gcc-switches-file option. Note that
> we can't transform that to -frecord-gcc-switches=FILE as one can use:
>
> -g frecord-gcc-switches-format=driver and so -frecord-gcc-switches is off.

But the driver can check whether -frecord-gcc-switches is on with
sth like %{frecord-gcc-switches:%{frecord-gcc-switches-format=driver:-frecord-gcc-switches=%b}}
or so.  But I don't mind a separate -frecord-gcc-switches-file option.
Guess we need it anyway since -g implies -grecord-gcc-switchs and that
needs the info as well.

> Thoughts on the new version of the patch?

Can you split out the unifying of -[gf]record-gcc-switches processing
and the target hook adjustment from the change introducing
-frecord-gcc-switches-format?

dwarf2out.c seems to retain its gen_producer_string () even though
you duplicate it elsewhere and it is now unused?  Please retain
the gen_producer_string name since the function does actual
processing and not just fetch a precomputed string from somewhere.

I'd like somebody else chime in on the -frecord-gcc-switches-format
driver handling but will happily work with getting the unification part merged.

Richard.

> Thanks,
> Martin
>
> >
> > Richard.
> >
> >
> >> Regards
> >> Egeyar
> >>
> >>
> >>>
> >>> Martin
> >>>
> >>>>
> >>>> Thanks
> >>>> Egeyar
> >>>>
> >>>>
> >>>>
> >>>> On 3/17/20 2:53 PM, Martin Liška wrote:
> >>>>> Hi.
> >>>>>
> >>>>> I'm sending enhanced patch that makes the following changes:
> >>>>> - a new option -frecord-gcc-switches-format is added; the option
> >>>>>    selects format (processed, driver) for all options that record
> >>>>>    GCC command line
> >>>>> - Dwarf gen_produce_string is now used in -fverbose-asm
> >>>>> - The .s file is affected in the following way:
> >>>>>
> >>>>> BEFORE:
> >>>>>
> >>>>> # GNU C17 (SUSE Linux) version 9.2.1 20200128 [revision
> >>>>> 83f65674e78d97d27537361de1a9d74067ff228d] (x86_64-suse-linux)
> >>>>> #    compiled by GNU C version 9.2.1 20200128 [revision
> >>>>> 83f65674e78d97d27537361de1a9d74067ff228d], GMP version 6.2.0, MPFR
> >>>>> version 4.0.2, MPC version 1.1.0, isl version isl-0.22.1-GMP
> >>>>>
> >>>>> # GGC heuristics: --param ggc-min-expand=100 --param
> >>>>> ggc-min-heapsize=131072
> >>>>> # options passed:  -fpreprocessed test.i -march=znver1 -mmmx -mno-3dnow
> >>>>> # -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -msha
> >>>>> # -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi
> >>>>> -mno-sgx
> >>>>> # -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm -mavx -mavx2 -msse4.2
> >>>>> -msse4.1
> >>>>> # -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mrdseed -mprfchw
> >>>>> # -madx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er
> >>>>> -mno-avx512cd
> >>>>> # -mno-avx512pf -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves
> >>>>> # -mno-avx512dq -mno-avx512bw -mno-avx512vl -mno-avx512ifma
> >>>>> -mno-avx512vbmi
> >>>>> # -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero
> >>>>> -mno-pku
> >>>>> # -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2 -mno-avx512vnni
> >>>>> # -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg -mno-movdiri
> >>>>> -mno-movdir64b
> >>>>> # -mno-waitpkg -mno-cldemote -mno-ptwrite --param l1-cache-size=32
> >>>>> # --param l1-cache-line-size=64 --param l2-cache-size=512 -mtune=znver1
> >>>>> # -grecord-gcc-switches -g -fverbose-asm -frecord-gcc-switches
> >>>>> # options enabled:  -faggressive-loop-optimizations -fassume-phsa
> >>>>> # -fasynchronous-unwind-tables -fauto-inc-dec -fcommon
> >>>>> # -fdelete-null-pointer-checks -fdwarf2-cfi-asm -fearly-inlining
> >>>>> # -feliminate-unused-debug-types -ffp-int-builtin-inexact
> >>>>> -ffunction-cse
> >>>>> # -fgcse-lm -fgnu-runtime -fgnu-unique -fident -finline-atomics
> >>>>> # -fipa-stack-alignment -fira-hoist-pressure -fira-share-save-slots
> >>>>> # -fira-share-spill-slots -fivopts -fkeep-static-consts
> >>>>> # -fleading-underscore -flifetime-dse -flto-odr-type-merging
> >>>>> -fmath-errno
> >>>>> # -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
> >>>>> # -frecord-gcc-switches -freg-struct-return
> >>>>> -fsched-critical-path-heuristic
> >>>>> # -fsched-dep-count-heuristic -fsched-group-heuristic
> >>>>> -fsched-interblock
> >>>>> # -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
> >>>>> # -fsched-spec-insn-heuristic -fsched-stalled-insns-dep
> >>>>> -fschedule-fusion
> >>>>> # -fsemantic-interposition -fshow-column -fshrink-wrap-separate
> >>>>> # -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
> >>>>> # -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math
> >>>>> -ftree-cselim
> >>>>> # -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im
> >>>>> -ftree-loop-ivcanon
> >>>>> # -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
> >>>>> # -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
> >>>>> # -fverbose-asm -fzero-initialized-in-bss -m128bit-long-double -m64
> >>>>> -m80387
> >>>>> # -mabm -madx -maes -malign-stringops -mavx -mavx2
> >>>>> # -mavx256-split-unaligned-store -mbmi -mbmi2 -mclflushopt -mclzero
> >>>>> -mcx16
> >>>>> # -mf16c -mfancy-math-387 -mfma -mfp-ret-in-387 -mfsgsbase -mfxsr
> >>>>> -mglibc
> >>>>> # -mieee-fp -mlong-double-80 -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul
> >>>>> # -mpopcnt -mprfchw -mpush-args -mrdrnd -mrdseed -mred-zone -msahf
> >>>>> -msha
> >>>>> # -msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2 -msse4a -mssse3 -mstv
> >>>>> # -mtls-direct-seg-refs -mvzeroupper -mxsave -mxsavec -mxsaveopt
> >>>>> -mxsaves
> >>>>>
> >>>>> AFTER:
> >>>>>
> >>>>> # GGC heuristics: --param ggc-min-expand=30 --param
> >>>>> ggc-min-heapsize=4096
> >>>>> # GNU C17 10.0.1 20200317 (experimental) -march=znver1 -mmmx
> >>>>> -mno-3dnow -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe
> >>>>> -maes -msha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4
> >>>>> -mno-xop -mbmi -mno-sgx -mbmi2 -mno-pconfig -mno-wbnoinvd -mno-tbm
> >>>>> -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd
> >>>>> -mf16c -mfsgsbase -mrdseed -mprfchw -madx -mfxsr -mxsave -mxsaveopt
> >>>>> -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf
> >>>>> -mno-prefetchwt1 -mclflushopt -mxsavec -mxsaves -mno-avx512dq
> >>>>> -mno-avx512bw -mno-avx512vl -mno-avx512ifma -mno-avx512vbmi
> >>>>> -mno-avx5124fmaps -mno-avx5124vnniw -mno-clwb -mmwaitx -mclzero
> >>>>> -mno-pku -mno-rdpid -mno-gfni -mno-shstk -mno-avx512vbmi2
> >>>>> -mno-avx512vnni -mno-vaes -mno-vpclmulqdq -mno-avx512bitalg
> >>>>> -mno-movdiri -mno-movdir64b -mno-waitpkg -mno-cldemote -mno-ptwrite
> >>>>> -mno-avx512bf16 -mno-enqcmd -mno-avx512vp2intersect
> >>>>> --param=l1-cache-size=32 --param=l1-cache-line-size=64
> >>>>> --param=l2-cache-size=512 -mtune=znver1 -g
> >>>>>
> >>>>> That's the biggest change I made, but I hope it's acceptable.
> >>>>> Apart from that the patch simplifies and unifies places where
> >>>>> save_decoded_options
> >>>>> options are transformed back to string representation.
> >>>>>
> >>>>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
> >>>>>
> >>>>> Ready to be installed in next stage1?
> >>>>> Thanks,
> >>>>> Martin
> >>>>
> >>>
> >>
>

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 795 bytes --]

On 11/23/20 12:00 PM, Richard Biener wrote:
> Can you split out the unifying of -[gf]record-gcc-switches processing
> and the target hook adjustment from the change introducing
> -frecord-gcc-switches-format?

Sure.

> 
> dwarf2out.c seems to retain its gen_producer_string () even though
> you duplicate it elsewhere and it is now unused?  Please retain
> the gen_producer_string name since the function does actual
> processing and not just fetch a precomputed string from somewhere.

Yep, please take a look at the attached patch.

> 
> I'd like somebody else chime in on the -frecord-gcc-switches-format
> driver handling but will happily work with getting the unification part merged.

May I apply the patch after it finishes regression tests and bootstrap?

Thanks,
Martin

> 
> Richard.


[-- Attachment #2: 0001-Refactor-frecord-gcc-switches.patch --]
[-- Type: text/x-patch, Size: 24054 bytes --]

From fcfe3c2dc69dc83fd85bb0887e13af57e5002157 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Mon, 23 Nov 2020 13:40:04 +0100
Subject: [PATCH] Refactor -frecord-gcc-switches.

gcc/ChangeLog:

	* doc/tm.texi: Change argument of the record_gcc_switches
	hook and remove SWITCH_TYPE_* enum values.
	* dwarf2out.c (gen_producer_string): Move to opts.c and remove
	handling of the dwarf_record_gcc_switches option.
	(dwarf2out_early_finish): Use moved gen_producer_string
	function.
	* opts.c (gen_producer_string): New.
	* opts.h (gen_producer_string): New.
	* target.def: Change type of record_gcc_switches.
	* target.h (enum print_switch_type): Remove.
	(elf_record_gcc_switches): Change first argument.
	* toplev.c (MAX_LINE): Remove.
	(print_to_asm_out_file):  Likewise.
	(print_to_stderr): Likewise.
	(print_single_switch): Likewise.
	(print_switch_values): Likewise.
	(init_asm_output): Use new gen_producer_string function.
	(process_options): Likewise.
	* varasm.c (elf_record_gcc_switches): Just save the string argument
	to the ELF container.
---
 gcc/doc/tm.texi |  38 +----------
 gcc/dwarf2out.c | 118 +++------------------------------
 gcc/opts.c      | 108 ++++++++++++++++++++++++++++++
 gcc/opts.h      |   4 ++
 gcc/target.def  |  38 +----------
 gcc/target.h    |  14 +---
 gcc/toplev.c    | 172 ++++--------------------------------------------
 gcc/varasm.c    |  48 +++-----------
 8 files changed, 149 insertions(+), 391 deletions(-)

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 2b88f78944f..baee63a3700 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8077,43 +8077,9 @@ need to override this if your target has special flags that might be
 set via @code{__attribute__}.
 @end deftypefn
 
-@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_SWITCHES (print_switch_type @var{type}, const char *@var{text})
+@deftypefn {Target Hook} void TARGET_ASM_RECORD_GCC_SWITCHES (const char *@var{})
 Provides the target with the ability to record the gcc command line
-switches that have been passed to the compiler, and options that are
-enabled.  The @var{type} argument specifies what is being recorded.
-It can take the following values:
-
-@table @gcctabopt
-@item SWITCH_TYPE_PASSED
-@var{text} is a command line switch that has been set by the user.
-
-@item SWITCH_TYPE_ENABLED
-@var{text} is an option which has been enabled.  This might be as a
-direct result of a command line switch, or because it is enabled by
-default or because it has been enabled as a side effect of a different
-command line switch.  For example, the @option{-O2} switch enables
-various different individual optimization passes.
-
-@item SWITCH_TYPE_DESCRIPTIVE
-@var{text} is either NULL or some descriptive text which should be
-ignored.  If @var{text} is NULL then it is being used to warn the
-target hook that either recording is starting or ending.  The first
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the
-warning is for start up and the second time the warning is for
-wind down.  This feature is to allow the target hook to make any
-necessary preparations before it starts to record switches and to
-perform any necessary tidying up after it has finished recording
-switches.
-
-@item SWITCH_TYPE_LINE_START
-This option can be ignored by this target hook.
-
-@item  SWITCH_TYPE_LINE_END
-This option can be ignored by this target hook.
-@end table
-
-The hook's return value must be zero.  Other return values may be
-supported in the future.
+switches provided as argument.
 
 By default this hook is set to NULL, but an example implementation is
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 01e7ae183d5..82303751fce 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24427,115 +24427,6 @@ gen_ptr_to_mbr_type_die (tree type, dw_die_ref context_die)
 
 static char *producer_string;
 
-/* Return a heap allocated producer string including command line options
-   if -grecord-gcc-switches.  */
-
-static char *
-gen_producer_string (void)
-{
-  size_t j;
-  auto_vec<const char *> switches;
-  const char *language_string = lang_hooks.name;
-  char *producer, *tail;
-  const char *p;
-  size_t len = dwarf_record_gcc_switches ? 0 : 3;
-  size_t plen = strlen (language_string) + 1 + strlen (version_string);
-
-  for (j = 1; dwarf_record_gcc_switches && j < save_decoded_options_count; j++)
-    switch (save_decoded_options[j].opt_index)
-      {
-      case OPT_o:
-      case OPT_d:
-      case OPT_dumpbase:
-      case OPT_dumpbase_ext:
-      case OPT_dumpdir:
-      case OPT_quiet:
-      case OPT_version:
-      case OPT_v:
-      case OPT_w:
-      case OPT_L:
-      case OPT_D:
-      case OPT_I:
-      case OPT_U:
-      case OPT_SPECIAL_unknown:
-      case OPT_SPECIAL_ignore:
-      case OPT_SPECIAL_warn_removed:
-      case OPT_SPECIAL_program_name:
-      case OPT_SPECIAL_input_file:
-      case OPT_grecord_gcc_switches:
-      case OPT__output_pch_:
-      case OPT_fdiagnostics_show_location_:
-      case OPT_fdiagnostics_show_option:
-      case OPT_fdiagnostics_show_caret:
-      case OPT_fdiagnostics_show_labels:
-      case OPT_fdiagnostics_show_line_numbers:
-      case OPT_fdiagnostics_color_:
-      case OPT_fdiagnostics_format_:
-      case OPT_fverbose_asm:
-      case OPT____:
-      case OPT__sysroot_:
-      case OPT_nostdinc:
-      case OPT_nostdinc__:
-      case OPT_fpreprocessed:
-      case OPT_fltrans_output_list_:
-      case OPT_fresolution_:
-      case OPT_fdebug_prefix_map_:
-      case OPT_fmacro_prefix_map_:
-      case OPT_ffile_prefix_map_:
-      case OPT_fcompare_debug:
-      case OPT_fchecking:
-      case OPT_fchecking_:
-	/* Ignore these.  */
-	continue;
-      case OPT_flto_:
-	{
-	  const char *lto_canonical = "-flto";
-	  switches.safe_push (lto_canonical);
-	  len += strlen (lto_canonical) + 1;
-	  break;
-	}
-      default:
-        if (cl_options[save_decoded_options[j].opt_index].flags
-	    & CL_NO_DWARF_RECORD)
-	  continue;
-        gcc_checking_assert (save_decoded_options[j].canonical_option[0][0]
-			     == '-');
-        switch (save_decoded_options[j].canonical_option[0][1])
-	  {
-	  case 'M':
-	  case 'i':
-	  case 'W':
-	    continue;
-	  case 'f':
-	    if (strncmp (save_decoded_options[j].canonical_option[0] + 2,
-			 "dump", 4) == 0)
-	      continue;
-	    break;
-	  default:
-	    break;
-	  }
-	switches.safe_push (save_decoded_options[j].orig_option_with_args_text);
-	len += strlen (save_decoded_options[j].orig_option_with_args_text) + 1;
-	break;
-      }
-
-  producer = XNEWVEC (char, plen + 1 + len + 1);
-  tail = producer;
-  sprintf (tail, "%s %s", language_string, version_string);
-  tail += plen;
-
-  FOR_EACH_VEC_ELT (switches, j, p)
-    {
-      len = strlen (p);
-      *tail = ' ';
-      memcpy (tail + 1, p, len);
-      tail += len + 1;
-    }
-
-  *tail = '\0';
-  return producer;
-}
-
 /* Given a C and/or C++ language/version string return the "highest".
    C++ is assumed to be "higher" than C in this case.  Used for merging
    LTO translation unit languages.  */
@@ -32145,7 +32036,14 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
-  producer_string = gen_producer_string ();
+
+  if (dwarf_record_gcc_switches)
+    producer_string = gen_producer_string (lang_hooks.name,
+					   save_decoded_options,
+					   save_decoded_options_count);
+  else
+    producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
 
diff --git a/gcc/opts.c b/gcc/opts.c
index 57774916a09..1be7c43aa09 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "spellcheck.h"
 #include "opt-suggestions.h"
 #include "diagnostic-color.h"
+#include "version.h"
 #include "selftest.h"
 
 static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
@@ -3200,6 +3201,113 @@ get_option_url (diagnostic_context *, int option_index)
     return NULL;
 }
 
+/* Return a heap allocated producer string including command line options.  */
+
+char *
+gen_producer_string (const char *language_string, cl_decoded_option *options,
+		     unsigned int options_count)
+{
+  size_t j;
+  auto_vec<const char *> switches;
+  char *producer, *tail;
+  const char *p;
+  size_t len = 0;
+  size_t plen = strlen (language_string) + 1 + strlen (version_string);
+
+  for (j = 0; j < options_count; j++)
+    switch (options[j].opt_index)
+      {
+      case OPT_o:
+      case OPT_d:
+      case OPT_dumpbase:
+      case OPT_dumpdir:
+      case OPT_quiet:
+      case OPT_version:
+      case OPT_v:
+      case OPT_w:
+      case OPT_L:
+      case OPT_D:
+      case OPT_I:
+      case OPT_U:
+      case OPT_SPECIAL_unknown:
+      case OPT_SPECIAL_ignore:
+      case OPT_SPECIAL_warn_removed:
+      case OPT_SPECIAL_program_name:
+      case OPT_SPECIAL_input_file:
+      case OPT_grecord_gcc_switches:
+      case OPT_frecord_gcc_switches:
+      case OPT__output_pch_:
+      case OPT_fdiagnostics_show_location_:
+      case OPT_fdiagnostics_show_option:
+      case OPT_fdiagnostics_show_caret:
+      case OPT_fdiagnostics_show_labels:
+      case OPT_fdiagnostics_show_line_numbers:
+      case OPT_fdiagnostics_color_:
+      case OPT_fdiagnostics_format_:
+      case OPT_fverbose_asm:
+      case OPT____:
+      case OPT__sysroot_:
+      case OPT_nostdinc:
+      case OPT_nostdinc__:
+      case OPT_fpreprocessed:
+      case OPT_fltrans_output_list_:
+      case OPT_fresolution_:
+      case OPT_fdebug_prefix_map_:
+      case OPT_fmacro_prefix_map_:
+      case OPT_ffile_prefix_map_:
+      case OPT_fcompare_debug:
+      case OPT_fchecking:
+      case OPT_fchecking_:
+	/* Ignore these.  */
+	continue;
+      case OPT_flto_:
+	{
+	  const char *lto_canonical = "-flto";
+	  switches.safe_push (lto_canonical);
+	  len += strlen (lto_canonical) + 1;
+	  break;
+	}
+      default:
+	if (cl_options[options[j].opt_index].flags
+	    & CL_NO_DWARF_RECORD)
+	  continue;
+	gcc_checking_assert (options[j].canonical_option[0][0] == '-');
+	switch (options[j].canonical_option[0][1])
+	  {
+	  case 'M':
+	  case 'i':
+	  case 'W':
+	    continue;
+	  case 'f':
+	    if (strncmp (options[j].canonical_option[0] + 2,
+			 "dump", 4) == 0)
+	      continue;
+	    break;
+	  default:
+	    break;
+	  }
+	switches.safe_push (options[j].orig_option_with_args_text);
+	len += strlen (options[j].orig_option_with_args_text) + 1;
+	break;
+      }
+
+  producer = XNEWVEC (char, plen + 1 + len + 1);
+  tail = producer;
+  sprintf (tail, "%s %s", language_string, version_string);
+  tail += plen;
+
+  FOR_EACH_VEC_ELT (switches, j, p)
+    {
+      len = strlen (p);
+      *tail = ' ';
+      memcpy (tail + 1, p, len);
+      tail += len + 1;
+    }
+
+  *tail = '\0';
+  return producer;
+}
+
 #if CHECKING_P
 
 namespace selftest {
diff --git a/gcc/opts.h b/gcc/opts.h
index d62bfcfdf6a..4ad6b2571f9 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -482,6 +482,10 @@ extern void parse_options_from_collect_gcc_options (const char *, obstack *,
 
 extern void prepend_xassembler_to_collect_as_options (const char *, obstack *);
 
+extern char *gen_producer_string (const char *language_string,
+				  cl_decoded_option *options,
+				  unsigned int options_count);
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/target.def b/gcc/target.def
index 810d5542c28..62b409507c9 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -757,41 +757,7 @@ directive to annotate @var{symbol} as used.  The Darwin target uses the\n\
 DEFHOOK
 (record_gcc_switches,
  "Provides the target with the ability to record the gcc command line\n\
-switches that have been passed to the compiler, and options that are\n\
-enabled.  The @var{type} argument specifies what is being recorded.\n\
-It can take the following values:\n\
-\n\
-@table @gcctabopt\n\
-@item SWITCH_TYPE_PASSED\n\
-@var{text} is a command line switch that has been set by the user.\n\
-\n\
-@item SWITCH_TYPE_ENABLED\n\
-@var{text} is an option which has been enabled.  This might be as a\n\
-direct result of a command line switch, or because it is enabled by\n\
-default or because it has been enabled as a side effect of a different\n\
-command line switch.  For example, the @option{-O2} switch enables\n\
-various different individual optimization passes.\n\
-\n\
-@item SWITCH_TYPE_DESCRIPTIVE\n\
-@var{text} is either NULL or some descriptive text which should be\n\
-ignored.  If @var{text} is NULL then it is being used to warn the\n\
-target hook that either recording is starting or ending.  The first\n\
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the\n\
-warning is for start up and the second time the warning is for\n\
-wind down.  This feature is to allow the target hook to make any\n\
-necessary preparations before it starts to record switches and to\n\
-perform any necessary tidying up after it has finished recording\n\
-switches.\n\
-\n\
-@item SWITCH_TYPE_LINE_START\n\
-This option can be ignored by this target hook.\n\
-\n\
-@item  SWITCH_TYPE_LINE_END\n\
-This option can be ignored by this target hook.\n\
-@end table\n\
-\n\
-The hook's return value must be zero.  Other return values may be\n\
-supported in the future.\n\
+switches provided as argument.\n\
 \n\
 By default this hook is set to NULL, but an example implementation is\n\
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},\n\
@@ -799,7 +765,7 @@ it records the switches as ASCII text inside a new, string mergeable\n\
 section in the assembler output file.  The name of the new section is\n\
 provided by the @code{TARGET_ASM_RECORD_GCC_SWITCHES_SECTION} target\n\
 hook.",
- int, (print_switch_type type, const char *text),
+ void, (const char *),
  NULL)
 
 /* The name of the section that the example ELF implementation of
diff --git a/gcc/target.h b/gcc/target.h
index 440cd25f297..960188023f1 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -68,16 +68,6 @@ union cumulative_args_t { void *p; };
 
 #endif /* !CHECKING_P */
 
-/* Types used by the record_gcc_switches() target function.  */
-enum print_switch_type
-{
-  SWITCH_TYPE_PASSED,		/* A switch passed on the command line.  */
-  SWITCH_TYPE_ENABLED,		/* An option that is currently enabled.  */
-  SWITCH_TYPE_DESCRIPTIVE,	/* Descriptive text, not a switch or option.  */
-  SWITCH_TYPE_LINE_START,	/* Please emit any necessary text at the start of a line.  */
-  SWITCH_TYPE_LINE_END		/* Please emit a line terminator.  */
-};
-
 /* Types of memory operation understood by the "by_pieces" infrastructure.
    Used by the TARGET_USE_BY_PIECES_INFRASTRUCTURE_P target hook and
    internally by the functions in expr.c.  */
@@ -96,10 +86,8 @@ extern unsigned HOST_WIDE_INT by_pieces_ninsns (unsigned HOST_WIDE_INT,
 						unsigned int,
 						by_pieces_operation);
 
-typedef int (* print_switch_fn_type) (print_switch_type, const char *);
-
 /* An example implementation for ELF targets.  Defined in varasm.c  */
-extern int elf_record_gcc_switches (print_switch_type type, const char *);
+extern void elf_record_gcc_switches (const char *);
 
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
diff --git a/gcc/toplev.c b/gcc/toplev.c
index e0e0e04e95f..d7583b496d2 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -116,9 +116,6 @@ static void compile_file (void);
 /* True if we don't need a backend (e.g. preprocessing only).  */
 static bool no_backend;
 
-/* Length of line when printing switch values.  */
-#define MAX_LINE 75
-
 /* Decoded options, and number of such options.  */
 struct cl_decoded_option *save_decoded_options;
 unsigned int save_decoded_options_count;
@@ -684,148 +681,7 @@ print_version (FILE *file, const char *indent, bool show_global_state)
     }
 }
 
-static int
-print_to_asm_out_file (print_switch_type type, const char * text)
-{
-  bool prepend_sep = true;
-
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', asm_out_file);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      fputs (ASM_COMMENT_START, asm_out_file);
-      return strlen (ASM_COMMENT_START);
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (ASM_COMMENT_START[0] == 0)
-	prepend_sep = false;
-      /* FALLTHRU */
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      if (prepend_sep)
-	fputc (' ', asm_out_file);
-      fputs (text, asm_out_file);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-static int
-print_to_stderr (print_switch_type type, const char * text)
-{
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', stderr);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      return 0;
-
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      fputc (' ', stderr);
-      /* FALLTHRU */
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      fputs (text, stderr);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-/* Print an option value and return the adjusted position in the line.
-   ??? print_fn doesn't handle errors, eg disk full; presumably other
-   code will catch a disk full though.  */
-
-static int
-print_single_switch (print_switch_fn_type print_fn,
-		     int pos,
-		     print_switch_type type,
-		     const char * text)
-{
-  /* The ultrix fprintf returns 0 on success, so compute the result
-     we want here since we need it for the following test.  The +1
-     is for the separator character that will probably be emitted.  */
-  int len = strlen (text) + 1;
-
-  if (pos != 0
-      && pos + len > MAX_LINE)
-    {
-      print_fn (SWITCH_TYPE_LINE_END, NULL);
-      pos = 0;
-    }
-
-  if (pos == 0)
-    pos += print_fn (SWITCH_TYPE_LINE_START, NULL);
-
-  print_fn (type, text);
-  return pos + len;
-}
-
-/* Print active target switches using PRINT_FN.
-   POS is the current cursor position and MAX is the size of a "line".
-   Each line begins with INDENT and ends with TERM.
-   Each switch is separated from the next by SEP.  */
-
-static void
-print_switch_values (print_switch_fn_type print_fn)
-{
-  int pos = 0;
-  size_t j;
-
-  /* Print the options as passed.  */
-  pos = print_single_switch (print_fn, pos,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options passed: "));
 
-  for (j = 1; j < save_decoded_options_count; j++)
-    {
-      switch (save_decoded_options[j].opt_index)
-	{
-	case OPT_o:
-	case OPT_d:
-	case OPT_dumpbase:
-	case OPT_dumpbase_ext:
-	case OPT_dumpdir:
-	case OPT_quiet:
-	case OPT_version:
-	  /* Ignore these.  */
-	  continue;
-	}
-
-      pos = print_single_switch (print_fn, pos, SWITCH_TYPE_PASSED,
-				 save_decoded_options[j].orig_option_with_args_text);
-    }
-
-  if (pos > 0)
-    print_fn (SWITCH_TYPE_LINE_END, NULL);
-
-  /* Print the -f and -m options that have been enabled.
-     We don't handle language specific options but printing argv
-     should suffice.  */
-  pos = print_single_switch (print_fn, 0,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options enabled: "));
-
-  unsigned lang_mask = lang_hooks.option_lang_mask ();
-  for (j = 0; j < cl_options_count; j++)
-    if (cl_options[j].cl_report
-	&& option_enabled (j, lang_mask, &global_options) > 0)
-      pos = print_single_switch (print_fn, pos,
-				 SWITCH_TYPE_ENABLED, cl_options[j].opt_text);
-
-  print_fn (SWITCH_TYPE_LINE_END, NULL);
-}
 
 /* Open assembly code output file.  Do this even if -fsyntax-only is
    on, because then the driver will have provided the name of a
@@ -872,14 +728,11 @@ init_asm_output (const char *name)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
 	    {
-	      /* Let the target know that we are about to start recording.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	      /* Now record the switches.  */
-	      print_switch_values (targetm.asm_out.record_gcc_switches);
-	      /* Let the target know that the recording is over.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
+	      const char *str
+		= gen_producer_string (lang_hooks.name,
+				       save_decoded_options,
+				       save_decoded_options_count);
+	      targetm.asm_out.record_gcc_switches (str);
 	    }
 	  else
 	    inform (UNKNOWN_LOCATION,
@@ -889,11 +742,13 @@ init_asm_output (const char *name)
 
       if (flag_verbose_asm)
 	{
-	  /* Print the list of switches in effect
-	     into the assembler file as comments.  */
 	  print_version (asm_out_file, ASM_COMMENT_START, true);
-	  print_switch_values (print_to_asm_out_file);
-	  putc ('\n', asm_out_file);
+	  fputs (ASM_COMMENT_START, asm_out_file);
+	  fputc (' ', asm_out_file);
+	  fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
+				      save_decoded_options_count),
+		 asm_out_file);
+	  fputc ('\n', asm_out_file);
 	}
     }
 }
@@ -1523,8 +1378,9 @@ process_options (void)
   if (version_flag)
     {
       print_version (stderr, "", true);
-      if (! quiet_flag)
-	print_switch_values (print_to_stderr);
+      if (!quiet_flag)
+	fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
+				    save_decoded_options_count), stderr);
     }
 
   if (flag_syntax_only)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index b92da26fb82..64f82b90fb6 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -58,6 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl-iter.h"
 #include "file-prefix-map.h" /* remap_debug_filename()  */
 #include "alloc-pool.h"
+#include "toplev.h"
+#include "opts.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data declarations.  */
@@ -8034,45 +8037,14 @@ output_object_blocks (void)
    we want to emit NUL strings terminators into the object file we have to use
    ASM_OUTPUT_SKIP.  */
 
-int
-elf_record_gcc_switches (print_switch_type type, const char * name)
+void
+elf_record_gcc_switches (const char *options)
 {
-  switch (type)
-    {
-    case SWITCH_TYPE_PASSED:
-      ASM_OUTPUT_ASCII (asm_out_file, name, strlen (name));
-      ASM_OUTPUT_SKIP (asm_out_file, HOST_WIDE_INT_1U);
-      break;
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (name == NULL)
-	{
-	  /* Distinguish between invocations where name is NULL.  */
-	  static bool started = false;
-
-	  if (!started)
-	    {
-	      section * sec;
-
-	      sec = get_section (targetm.asm_out.record_gcc_switches_section,
-				 SECTION_DEBUG
-				 | SECTION_MERGE
-				 | SECTION_STRINGS
-				 | (SECTION_ENTSIZE & 1),
-				 NULL);
-	      switch_to_section (sec);
-	      started = true;
-	    }
-	}
-
-    default:
-      break;
-    }
-
-  /* The return value is currently ignored by the caller, but must be 0.
-     For -fverbose-asm the return value would be the number of characters
-     emitted into the assembler file.  */
-  return 0;
+  section *sec = get_section (targetm.asm_out.record_gcc_switches_section,
+			      SECTION_DEBUG | SECTION_MERGE
+			      | SECTION_STRINGS | (SECTION_ENTSIZE & 1), NULL);
+  switch_to_section (sec);
+  ASM_OUTPUT_ASCII (asm_out_file, options, strlen (options) + 1);
 }
 
 /* Emit text to declare externally defined symbols. It is needed to
-- 
2.29.2

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

On 11/23/20 2:02 PM, Martin Liška wrote:
> May I apply the patch after it finishes regression tests and bootstrap?

It survives testing.

There's the second part which adds -frecord-gcc-switches-format.

Patch can bootstrap on x86_64-linux-gnu and survives regression tests.

Thanks,
Martin

[-- Attachment #2: 0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch --]
[-- Type: text/x-patch, Size: 12749 bytes --]

From b6c135ff7709df10e8bc3d6fab9d7987ed263fa2 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Mon, 23 Nov 2020 14:10:38 +0100
Subject: [PATCH] Change semantics of -frecord-gcc-switches and add
 -frecord-gcc-switches-format.

gcc/ChangeLog:

	* common.opt: Document new options -frecord-gcc-switches-format
	and -frecord-gcc-switches-file.
	* doc/invoke.texi: Document the new options.
	* dwarf2out.c (dwarf2out_early_finish): Respect
	flag_record_gcc_switches_format.
	* flag-types.h (enum record_gcc_switches_format): New.
	* gcc.c (save_driver_cmdline): Save command line to a temporary
	file.
	(driver::main): Call set_commandline.
	(driver::set_commandline): New.
	* gcc.h (set_commandline): New.
	* opts.c (get_driver_command_line): New.
	* opts.h (get_driver_command_line): New.
	* toplev.c (init_asm_output): Use new function get_producer_string.
	(process_options): Respect flag_record_gcc_switches_format
	option.

Co-Authored-By: Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>
---
 gcc/common.opt      | 19 ++++++++++++++++++-
 gcc/doc/invoke.texi | 23 ++++++++++++++++++++++-
 gcc/dwarf2out.c     | 17 ++++++++++++-----
 gcc/flag-types.h    |  7 +++++++
 gcc/gcc.c           | 37 ++++++++++++++++++++++++++++++++++++-
 gcc/gcc.h           |  1 +
 gcc/opts.c          | 31 +++++++++++++++++++++++++++++++
 gcc/opts.h          |  2 ++
 gcc/toplev.c        | 29 ++++++++++++++++++++++-------
 9 files changed, 151 insertions(+), 15 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index ca8a2690799..3492e14cb1e 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2322,9 +2322,26 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Driver Report Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
+Enum
+Name(record_gcc_switches_format) Type(enum record_gcc_switches_format)
+
+EnumValue
+Enum(record_gcc_switches_format) String(processed) Value(RECORD_GCC_SWITCHES_PROCESSED)
+
+EnumValue
+Enum(record_gcc_switches_format) String(driver) Value(RECORD_GCC_SWITCHES_DRIVER)
+
+frecord-gcc-switches-format=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_format) Enum(record_gcc_switches_format) Init(RECORD_GCC_SWITCHES_PROCESSED)
+-frecord-gcc-switches-format=[processed|driver]	Format of recorded gcc command line switches.
+
+frecord-gcc-switches-file=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_file) Undocumented
+Path to file that contains driver command line options.
+
 freg-struct-return
 Common Report Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 26372a2435a..d7e43c84ffc 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -642,7 +642,7 @@ Objective-C and Objective-C++ Dialects}.
 -finhibit-size-directive  -fcommon  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC  -fpie  -fPIE  -fno-plt @gol
 -fno-jump-tables -fno-bit-tests @gol
--frecord-gcc-switches @gol
+-frecord-gcc-switches -frecord-gcc-switches-format @gol
 -freg-struct-return  -fshort-enums  -fshort-wchar @gol
 -fverbose-asm  -fpack-struct[=@var{n}]  @gol
 -fleading-underscore  -ftls-model=@var{model} @gol
@@ -16022,6 +16022,27 @@ comments, so it never reaches the object file.
 See also @option{-grecord-gcc-switches} for another
 way of storing compiler options into the object file.
 
+@item -frecord-gcc-switches-format=@var{format}
+@opindex frecord-gcc-switches-format
+This switch controls the output format of options that record
+the command line.  The affected options are @option{-frecord-gcc-switches},
+@option{-grecord-gcc-switches} and @option{-fverbose-asm}.
+
+The @var{format} argument should be one of the following:
+
+@table @samp
+
+@item processed
+
+Options are printed after processing by the compiler driver.
+It is the default option value.
+
+@item driver
+
+Options are printed as provided to the compiler driver.
+
+@end table
+
 @item -fpic
 @opindex fpic
 @cindex global offset table
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 82303751fce..c584bb1a7c5 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -32036,13 +32036,20 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
+  producer_string = concat (lang_hooks.name, " ", version_string, NULL);
 
   if (dwarf_record_gcc_switches)
-    producer_string = gen_producer_string (lang_hooks.name,
-					   save_decoded_options,
-					   save_decoded_options_count);
-  else
-    producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+    {
+      char *producer_string_old = producer_string;
+      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	producer_string = concat (producer_string, " ",
+				  get_driver_command_line (), NULL);
+      else
+	producer_string = gen_producer_string (lang_hooks.name,
+					       save_decoded_options,
+					       save_decoded_options_count);
+      free (producer_string_old);
+    }
 
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index 0dbab19943c..fa46de9e9bf 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -424,6 +424,13 @@ enum openacc_kernels
   OPENACC_KERNELS_PARLOOPS
 };
 
+/* Record GCC options type.  */
+enum record_gcc_switches_format
+{
+  RECORD_GCC_SWITCHES_PROCESSED = 0,
+  RECORD_GCC_SWITCHES_DRIVER
+};
+
 #endif
 
 #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index d78b5f582b5..a13e26c0c9f 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,12 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv provided to the driver.  Necessary to keep for when
+   -frecord-gcc-switches-format=driver is given.  */
+
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -433,6 +439,7 @@ static const char *greater_than_spec_func (int, const char **);
 static const char *debug_level_greater_than_spec_func (int, const char **);
 static const char *dwarf_version_greater_than_spec_func (int, const char **);
 static const char *find_fortran_preinclude_file (int, const char **);
+static const char *save_driver_cmdline (int, const char **);
 static char *convert_white_space (char *);
 static char *quote_spec (char *);
 static char *quote_spec_arg (char *);
@@ -1255,7 +1262,9 @@ static const char *cc1_options =
  %{coverage:-fprofile-arcs -ftest-coverage}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
-     %{pthread:-fprofile-update=prefer-atomic}}}";
+     %{pthread:-fprofile-update=prefer-atomic}}}\
+ %{frecord-gcc-switches-format=driver:-frecord-gcc-switches-file=%:save-driver-cmdline(%g.cmdline)\
+   %<-frecord-gcc-switches-format=driver}";
 
 static const char *asm_options =
 "%{-target-help:%:print-asm-header()} "
@@ -1747,6 +1756,7 @@ static const struct spec_function static_spec_functions[] =
   { "debug-level-gt",		debug_level_greater_than_spec_func },
   { "dwarf-version-gt",		dwarf_version_greater_than_spec_func },
   { "fortran-preinclude-file",	find_fortran_preinclude_file},
+  { "save-driver-cmdline",	save_driver_cmdline},
 #ifdef EXTRA_SPEC_FUNCTIONS
   EXTRA_SPEC_FUNCTIONS
 #endif
@@ -7991,6 +8001,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -8034,6 +8045,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep the command line for -frecord-gcc-switches-format=driver.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
@@ -10771,6 +10791,21 @@ find_fortran_preinclude_file (int argc, const char **argv)
   return result;
 }
 
+/* Save driver options to a temporary file.  */
+
+static const char *
+save_driver_cmdline (int argc ATTRIBUTE_UNUSED,
+		     const char **argv)
+{
+  FILE *f = fopen (argv[0], "w");
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    fprintf (f, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+  fclose (f);
+
+  return argv[0];
+}
+
+
 /* If any character in ORIG fits QUOTE_P (_, P), reallocate the string
    so as to precede every one of them with a backslash.  Return the
    original string or the reallocated one.  */
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08f059..cde77fbaad7 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/opts.c b/gcc/opts.c
index 1be7c43aa09..d850da8f531 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -3236,6 +3236,7 @@ gen_producer_string (const char *language_string, cl_decoded_option *options,
       case OPT_SPECIAL_input_file:
       case OPT_grecord_gcc_switches:
       case OPT_frecord_gcc_switches:
+      case OPT_frecord_gcc_switches_format_:
       case OPT__output_pch_:
       case OPT_fdiagnostics_show_location_:
       case OPT_fdiagnostics_show_option:
@@ -3308,6 +3309,36 @@ gen_producer_string (const char *language_string, cl_decoded_option *options,
   return producer;
 }
 
+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  static char *cmdline = NULL;
+
+  if (cmdline != NULL)
+    return cmdline;
+
+  FILE *f = fopen (flag_record_gcc_switches_file, "r");
+  if (f == NULL)
+    fatal_error (UNKNOWN_LOCATION, "cannot open %s: %m", flag_record_gcc_switches_file);
+
+  fseek(f, 0, SEEK_END);
+  unsigned int size = ftell (f);
+  fseek(f, 0, SEEK_SET);
+
+  cmdline = XNEWVEC (char, size + 1);
+
+  unsigned int read;
+  char *ptr = cmdline;
+  while ((read = fread (ptr, 4096, 1, f)))
+    ptr += read;
+
+  cmdline[size] = '\0';
+  return cmdline;
+}
+
 #if CHECKING_P
 
 namespace selftest {
diff --git a/gcc/opts.h b/gcc/opts.h
index 4ad6b2571f9..0e442e7f6e7 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -486,6 +486,8 @@ extern char *gen_producer_string (const char *language_string,
 				  cl_decoded_option *options,
 				  unsigned int options_count);
 
+extern const char *get_driver_command_line ();
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/toplev.c b/gcc/toplev.c
index d7583b496d2..0be5959615a 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -728,11 +728,21 @@ init_asm_output (const char *name)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
 	    {
-	      const char *str
-		= gen_producer_string (lang_hooks.name,
-				       save_decoded_options,
-				       save_decoded_options_count);
-	      targetm.asm_out.record_gcc_switches (str);
+	      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+		{
+		  const char *str = concat (version_string, " ",
+					    get_driver_command_line (), NULL);
+		  targetm.asm_out.record_gcc_switches (str);
+		  free (CONST_CAST (char *, str));
+		}
+	      else
+		{
+		  const char *str
+		    = gen_producer_string (lang_hooks.name,
+					   save_decoded_options,
+					   save_decoded_options_count);
+		  targetm.asm_out.record_gcc_switches (str);
+		}
 	    }
 	  else
 	    inform (UNKNOWN_LOCATION,
@@ -1379,8 +1389,13 @@ process_options (void)
     {
       print_version (stderr, "", true);
       if (!quiet_flag)
-	fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
-				    save_decoded_options_count), stderr);
+	{
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), stderr);
+	  else
+	    fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
+					save_decoded_options_count), stderr);
+	}
     }
 
   if (flag_syntax_only)
-- 
2.29.2

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Richard Biener]

On Mon, Nov 23, 2020 at 2:02 PM Martin Liška <mliska@suse.cz> wrote:
>
> On 11/23/20 12:00 PM, Richard Biener wrote:
> > Can you split out the unifying of -[gf]record-gcc-switches processing
> > and the target hook adjustment from the change introducing
> > -frecord-gcc-switches-format?
>
> Sure.
>
> >
> > dwarf2out.c seems to retain its gen_producer_string () even though
> > you duplicate it elsewhere and it is now unused?  Please retain
> > the gen_producer_string name since the function does actual
> > processing and not just fetch a precomputed string from somewhere.
>
> Yep, please take a look at the attached patch.
>
> >
> > I'd like somebody else chime in on the -frecord-gcc-switches-format
> > driver handling but will happily work with getting the unification part merged.
>
> May I apply the patch after it finishes regression tests and bootstrap?

@@ -1523,8 +1378,9 @@ process_options (void)
   if (version_flag)
     {
       print_version (stderr, "", true);
-      if (! quiet_flag)
-       print_switch_values (print_to_stderr);
+      if (!quiet_flag)
+       fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
+                                   save_decoded_options_count), stderr);
     }


so I wonder whether this regresses (no newlines anymore, no separate
printing of options passed/enabled).  Previously with -Q -v you'll get sth
like

options passed:  -v
 -iprefix /home/rguenther/obj-gcc2-g/gcc/../lib64/gcc/x86_64-pc-linux-gnu/11.0.0/
 -isystem ./include -isystem ./include-fixed t.c -mtune=generic
 -march=x86-64 -O2
options enabled:  -faggressive-loop-optimizations -falign-functions
 -falign-jumps -falign-labels -falign-loops -fallocation-dce
 -fasynchronous-unwind-tables -fauto-inc-dec -fbranch-count-reg
 -fcaller-saves -fcode-hoisting -fcombine-stack-adjustments -fcompare-elim
 -fcprop-registers -fcrossjumping -fcse-follow-jumps -fdefer-pop
 -fdelete-null-pointer-checks -fdevirtualize -fdevirtualize-speculatively
 -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
...

but after the change it will most definitely _not_ include all the -f options
implied by -O2?  So how does a standard -O2 -fverbose-asm compare?
How does -Q -v compare?  How does the producer string in dwarf
compare (I guess that's actually equal since we now use that reporting style).

Thanks,
Richard.

> Thanks,
> Martin
>
> >
> > Richard.
>

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 11/25/20 2:48 PM, Richard Biener wrote:
> On Mon, Nov 23, 2020 at 2:02 PM Martin Liška <mliska@suse.cz> wrote:
>>
>> On 11/23/20 12:00 PM, Richard Biener wrote:
>>> Can you split out the unifying of -[gf]record-gcc-switches processing
>>> and the target hook adjustment from the change introducing
>>> -frecord-gcc-switches-format?
>>
>> Sure.
>>
>>>
>>> dwarf2out.c seems to retain its gen_producer_string () even though
>>> you duplicate it elsewhere and it is now unused?  Please retain
>>> the gen_producer_string name since the function does actual
>>> processing and not just fetch a precomputed string from somewhere.
>>
>> Yep, please take a look at the attached patch.
>>
>>>
>>> I'd like somebody else chime in on the -frecord-gcc-switches-format
>>> driver handling but will happily work with getting the unification part merged.
>>
>> May I apply the patch after it finishes regression tests and bootstrap?
> 
> @@ -1523,8 +1378,9 @@ process_options (void)
>     if (version_flag)
>       {
>         print_version (stderr, "", true);
> -      if (! quiet_flag)
> -       print_switch_values (print_to_stderr);
> +      if (!quiet_flag)
> +       fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
> +                                   save_decoded_options_count), stderr);
>       }
> 
> 
> so I wonder whether this regresses (no newlines anymore, no separate
> printing of options passed/enabled).  Previously with -Q -v you'll get sth
> like
> 
> options passed:  -v
>   -iprefix /home/rguenther/obj-gcc2-g/gcc/../lib64/gcc/x86_64-pc-linux-gnu/11.0.0/
>   -isystem ./include -isystem ./include-fixed t.c -mtune=generic
>   -march=x86-64 -O2
> options enabled:  -faggressive-loop-optimizations -falign-functions
>   -falign-jumps -falign-labels -falign-loops -fallocation-dce
>   -fasynchronous-unwind-tables -fauto-inc-dec -fbranch-count-reg
>   -fcaller-saves -fcode-hoisting -fcombine-stack-adjustments -fcompare-elim
>   -fcprop-registers -fcrossjumping -fcse-follow-jumps -fdefer-pop
>   -fdelete-null-pointer-checks -fdevirtualize -fdevirtualize-speculatively
>   -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
> ...

Oh, you are right that there's a significant change (I fixed the newline):

BEFORE:
GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
options passed:  -v a.c -mtune=generic -march=x86-64
options enabled:  -faggressive-loop-optimizations -fallocation-dce
  -fasynchronous-unwind-tables -fauto-inc-dec -fdelete-null-pointer-checks
  -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
  -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
  -fgcse-lm -fgnu-unique -fident -finline-atomics -fipa-stack-alignment
  -fira-hoist-pressure -fira-share-save-slots -fira-share-spill-slots
  -fivopts -fkeep-static-consts -fleading-underscore -flifetime-dse
  -fmath-errno -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
  -freg-struct-return -fsched-critical-path-heuristic
  -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
  -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
  -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
  -fsemantic-interposition -fshow-column -fshrink-wrap-separate
  -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
  -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
  -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
  -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
  -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
  -fvar-tracking -fvar-tracking-assignments -fzero-initialized-in-bss
  -m128bit-long-double -m64 -m80387 -malign-stringops
  -mavx256-split-unaligned-load -mavx256-split-unaligned-store
  -mfancy-math-387 -mfp-ret-in-387 -mfxsr -mglibc -mieee-fp -mlong-double-80
  -mmmx -mno-sse4 -mpush-args -mred-zone -msse -msse2 -mstv
  -mtls-direct-seg-refs -mvzeroupper
Compiler executable checksum: 00000000000000000000000000000000

AFTER:
GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64
Compiler executable checksum: 36558a9ca3607b6821d78562377c56da

For -fverbose-asm we get something similar:

BEFORE:
# GNU C17 (SUSE Linux) version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b] (x86_64-suse-linux)
#	compiled by GNU C version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b], GMP version 6.2.0, MPFR version 4.1.0, MPC version 1.2.1, isl version isl-0.22.1-GMP

# GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
# options passed:  a.c -mtune=generic -march=x86-64 -auxbase-strip before.s
# -fverbose-asm
# options enabled:  -faggressive-loop-optimizations -fallocation-dce
# -fasynchronous-unwind-tables -fauto-inc-dec -fdelete-null-pointer-checks
# -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
# -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse

AFTER:
# GNU C17 (GCC) version 11.0.0 20201123 (experimental) (x86_64-pc-linux-gnu)
#	compiled by GNU C version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b], GMP version 6.2.0, MPFR version 4.1.0, MPC version 1.2.1, isl version none
# GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
# GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64

> 
> but after the change it will most definitely _not_ include all the -f options
> implied by -O2?  So how does a standard -O2 -fverbose-asm compare?
> How does -Q -v compare?  How does the producer string in dwarf
> compare (I guess that's actually equal since we now use that reporting style).

Yes, dwarf output is the same:

BEFORE:
     <c>   DW_AT_producer    : (indirect string, offset: 0x0): GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64 -g

AFTER:
     <c>   DW_AT_producer    : (indirect string, offset: 0x0): GNU C17 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b] -mtune=generic -march=x86-64 -g

So the question is: do we really need to preserve the "options enabled" report? It's far from being complete
as it e.g. ignores enum options like:

   -fsched-stalled-insns-dep=<number> 	
   -fsched-stalled-insns=<number> 	
   -fsimd-cost-model=[unlimited|dynamic|cheap|very-cheap] 	unlimited
   -fstack-check=[no|generic|specific] 	
   -fstack-reuse=[all|named_vars|none] 	all
...

Well, gcc -Q -help=optimize <options_used> seems a better hint for me.

Thoughts?
Thanks,
Martin

> 
> Thanks,
> Richard.
> 
>> Thanks,
>> Martin
>>
>>>
>>> Richard.
>>

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

^PING

On 11/26/20 2:55 PM, Martin Liška wrote:
> On 11/25/20 2:48 PM, Richard Biener wrote:
>> On Mon, Nov 23, 2020 at 2:02 PM Martin Liška <mliska@suse.cz> wrote:
>>>
>>> On 11/23/20 12:00 PM, Richard Biener wrote:
>>>> Can you split out the unifying of -[gf]record-gcc-switches processing
>>>> and the target hook adjustment from the change introducing
>>>> -frecord-gcc-switches-format?
>>>
>>> Sure.
>>>
>>>>
>>>> dwarf2out.c seems to retain its gen_producer_string () even though
>>>> you duplicate it elsewhere and it is now unused?  Please retain
>>>> the gen_producer_string name since the function does actual
>>>> processing and not just fetch a precomputed string from somewhere.
>>>
>>> Yep, please take a look at the attached patch.
>>>
>>>>
>>>> I'd like somebody else chime in on the -frecord-gcc-switches-format
>>>> driver handling but will happily work with getting the unification part merged.
>>>
>>> May I apply the patch after it finishes regression tests and bootstrap?
>>
>> @@ -1523,8 +1378,9 @@ process_options (void)
>>     if (version_flag)
>>       {
>>         print_version (stderr, "", true);
>> -      if (! quiet_flag)
>> -       print_switch_values (print_to_stderr);
>> +      if (!quiet_flag)
>> +       fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
>> +                                   save_decoded_options_count), stderr);
>>       }
>>
>>
>> so I wonder whether this regresses (no newlines anymore, no separate
>> printing of options passed/enabled).  Previously with -Q -v you'll get sth
>> like
>>
>> options passed:  -v
>>   -iprefix /home/rguenther/obj-gcc2-g/gcc/../lib64/gcc/x86_64-pc-linux-gnu/11.0.0/
>>   -isystem ./include -isystem ./include-fixed t.c -mtune=generic
>>   -march=x86-64 -O2
>> options enabled:  -faggressive-loop-optimizations -falign-functions
>>   -falign-jumps -falign-labels -falign-loops -fallocation-dce
>>   -fasynchronous-unwind-tables -fauto-inc-dec -fbranch-count-reg
>>   -fcaller-saves -fcode-hoisting -fcombine-stack-adjustments -fcompare-elim
>>   -fcprop-registers -fcrossjumping -fcse-follow-jumps -fdefer-pop
>>   -fdelete-null-pointer-checks -fdevirtualize -fdevirtualize-speculatively
>>   -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
>> ...
> 
> Oh, you are right that there's a significant change (I fixed the newline):
> 
> BEFORE:
> GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
> options passed:  -v a.c -mtune=generic -march=x86-64
> options enabled:  -faggressive-loop-optimizations -fallocation-dce
>   -fasynchronous-unwind-tables -fauto-inc-dec -fdelete-null-pointer-checks
>   -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
>   -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>   -fgcse-lm -fgnu-unique -fident -finline-atomics -fipa-stack-alignment
>   -fira-hoist-pressure -fira-share-save-slots -fira-share-spill-slots
>   -fivopts -fkeep-static-consts -fleading-underscore -flifetime-dse
>   -fmath-errno -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>   -freg-struct-return -fsched-critical-path-heuristic
>   -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>   -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>   -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>   -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>   -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>   -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>   -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>   -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>   -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>   -fvar-tracking -fvar-tracking-assignments -fzero-initialized-in-bss
>   -m128bit-long-double -m64 -m80387 -malign-stringops
>   -mavx256-split-unaligned-load -mavx256-split-unaligned-store
>   -mfancy-math-387 -mfp-ret-in-387 -mfxsr -mglibc -mieee-fp -mlong-double-80
>   -mmmx -mno-sse4 -mpush-args -mred-zone -msse -msse2 -mstv
>   -mtls-direct-seg-refs -mvzeroupper
> Compiler executable checksum: 00000000000000000000000000000000
> 
> AFTER:
> GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64
> Compiler executable checksum: 36558a9ca3607b6821d78562377c56da
> 
> For -fverbose-asm we get something similar:
> 
> BEFORE:
> # GNU C17 (SUSE Linux) version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b] (x86_64-suse-linux)
> #    compiled by GNU C version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b], GMP version 6.2.0, MPFR version 4.1.0, MPC version 1.2.1, isl version isl-0.22.1-GMP
> 
> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
> # options passed:  a.c -mtune=generic -march=x86-64 -auxbase-strip before.s
> # -fverbose-asm
> # options enabled:  -faggressive-loop-optimizations -fallocation-dce
> # -fasynchronous-unwind-tables -fauto-inc-dec -fdelete-null-pointer-checks
> # -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
> 
> AFTER:
> # GNU C17 (GCC) version 11.0.0 20201123 (experimental) (x86_64-pc-linux-gnu)
> #    compiled by GNU C version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b], GMP version 6.2.0, MPFR version 4.1.0, MPC version 1.2.1, isl version none
> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> # GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64
> 
>>
>> but after the change it will most definitely _not_ include all the -f options
>> implied by -O2?  So how does a standard -O2 -fverbose-asm compare?
>> How does -Q -v compare?  How does the producer string in dwarf
>> compare (I guess that's actually equal since we now use that reporting style).
> 
> Yes, dwarf output is the same:
> 
> BEFORE:
>      <c>   DW_AT_producer    : (indirect string, offset: 0x0): GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64 -g
> 
> AFTER:
>      <c>   DW_AT_producer    : (indirect string, offset: 0x0): GNU C17 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b] -mtune=generic -march=x86-64 -g
> 
> So the question is: do we really need to preserve the "options enabled" report? It's far from being complete
> as it e.g. ignores enum options like:
> 
>    -fsched-stalled-insns-dep=<number>
>    -fsched-stalled-insns=<number>
>    -fsimd-cost-model=[unlimited|dynamic|cheap|very-cheap]     unlimited
>    -fstack-check=[no|generic|specific]
>    -fstack-reuse=[all|named_vars|none]     all
> ...
> 
> Well, gcc -Q -help=optimize <options_used> seems a better hint for me.
> 
> Thoughts?
> Thanks,
> Martin
> 
>>
>> Thanks,
>> Richard.
>>
>>> Thanks,
>>> Martin
>>>
>>>>
>>>> Richard.
>>>
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Richard Biener]

On Thu, Nov 26, 2020 at 2:55 PM Martin Liška <mliska@suse.cz> wrote:
>
> On 11/25/20 2:48 PM, Richard Biener wrote:
> > On Mon, Nov 23, 2020 at 2:02 PM Martin Liška <mliska@suse.cz> wrote:
> >>
> >> On 11/23/20 12:00 PM, Richard Biener wrote:
> >>> Can you split out the unifying of -[gf]record-gcc-switches processing
> >>> and the target hook adjustment from the change introducing
> >>> -frecord-gcc-switches-format?
> >>
> >> Sure.
> >>
> >>>
> >>> dwarf2out.c seems to retain its gen_producer_string () even though
> >>> you duplicate it elsewhere and it is now unused?  Please retain
> >>> the gen_producer_string name since the function does actual
> >>> processing and not just fetch a precomputed string from somewhere.
> >>
> >> Yep, please take a look at the attached patch.
> >>
> >>>
> >>> I'd like somebody else chime in on the -frecord-gcc-switches-format
> >>> driver handling but will happily work with getting the unification part merged.
> >>
> >> May I apply the patch after it finishes regression tests and bootstrap?
> >
> > @@ -1523,8 +1378,9 @@ process_options (void)
> >     if (version_flag)
> >       {
> >         print_version (stderr, "", true);
> > -      if (! quiet_flag)
> > -       print_switch_values (print_to_stderr);
> > +      if (!quiet_flag)
> > +       fputs (gen_producer_string (lang_hooks.name, save_decoded_options,
> > +                                   save_decoded_options_count), stderr);
> >       }
> >
> >
> > so I wonder whether this regresses (no newlines anymore, no separate
> > printing of options passed/enabled).  Previously with -Q -v you'll get sth
> > like
> >
> > options passed:  -v
> >   -iprefix /home/rguenther/obj-gcc2-g/gcc/../lib64/gcc/x86_64-pc-linux-gnu/11.0.0/
> >   -isystem ./include -isystem ./include-fixed t.c -mtune=generic
> >   -march=x86-64 -O2
> > options enabled:  -faggressive-loop-optimizations -falign-functions
> >   -falign-jumps -falign-labels -falign-loops -fallocation-dce
> >   -fasynchronous-unwind-tables -fauto-inc-dec -fbranch-count-reg
> >   -fcaller-saves -fcode-hoisting -fcombine-stack-adjustments -fcompare-elim
> >   -fcprop-registers -fcrossjumping -fcse-follow-jumps -fdefer-pop
> >   -fdelete-null-pointer-checks -fdevirtualize -fdevirtualize-speculatively
> >   -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
> > ...
>
> Oh, you are right that there's a significant change (I fixed the newline):
>
> BEFORE:
> GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
> options passed:  -v a.c -mtune=generic -march=x86-64
> options enabled:  -faggressive-loop-optimizations -fallocation-dce
>   -fasynchronous-unwind-tables -fauto-inc-dec -fdelete-null-pointer-checks
>   -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
>   -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>   -fgcse-lm -fgnu-unique -fident -finline-atomics -fipa-stack-alignment
>   -fira-hoist-pressure -fira-share-save-slots -fira-share-spill-slots
>   -fivopts -fkeep-static-consts -fleading-underscore -flifetime-dse
>   -fmath-errno -fmerge-debug-strings -fpeephole -fplt -fprefetch-loop-arrays
>   -freg-struct-return -fsched-critical-path-heuristic
>   -fsched-dep-count-heuristic -fsched-group-heuristic -fsched-interblock
>   -fsched-last-insn-heuristic -fsched-rank-heuristic -fsched-spec
>   -fsched-spec-insn-heuristic -fsched-stalled-insns-dep -fschedule-fusion
>   -fsemantic-interposition -fshow-column -fshrink-wrap-separate
>   -fsigned-zeros -fsplit-ivs-in-unroller -fssa-backprop -fstdarg-opt
>   -fstrict-volatile-bitfields -fsync-libcalls -ftrapping-math -ftree-cselim
>   -ftree-forwprop -ftree-loop-if-convert -ftree-loop-im -ftree-loop-ivcanon
>   -ftree-loop-optimize -ftree-parallelize-loops= -ftree-phiprop
>   -ftree-reassoc -ftree-scev-cprop -funit-at-a-time -funwind-tables
>   -fvar-tracking -fvar-tracking-assignments -fzero-initialized-in-bss
>   -m128bit-long-double -m64 -m80387 -malign-stringops
>   -mavx256-split-unaligned-load -mavx256-split-unaligned-store
>   -mfancy-math-387 -mfp-ret-in-387 -mfxsr -mglibc -mieee-fp -mlong-double-80
>   -mmmx -mno-sse4 -mpush-args -mred-zone -msse -msse2 -mstv
>   -mtls-direct-seg-refs -mvzeroupper
> Compiler executable checksum: 00000000000000000000000000000000
>
> AFTER:
> GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64
> Compiler executable checksum: 36558a9ca3607b6821d78562377c56da
>
> For -fverbose-asm we get something similar:
>
> BEFORE:
> # GNU C17 (SUSE Linux) version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b] (x86_64-suse-linux)
> #       compiled by GNU C version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b], GMP version 6.2.0, MPFR version 4.1.0, MPC version 1.2.1, isl version isl-0.22.1-GMP
>
> # GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
> # options passed:  a.c -mtune=generic -march=x86-64 -auxbase-strip before.s
> # -fverbose-asm
> # options enabled:  -faggressive-loop-optimizations -fallocation-dce
> # -fasynchronous-unwind-tables -fauto-inc-dec -fdelete-null-pointer-checks
> # -fdwarf2-cfi-asm -fearly-inlining -feliminate-unused-debug-symbols
> # -feliminate-unused-debug-types -ffp-int-builtin-inexact -ffunction-cse
>
> AFTER:
> # GNU C17 (GCC) version 11.0.0 20201123 (experimental) (x86_64-pc-linux-gnu)
> #       compiled by GNU C version 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b], GMP version 6.2.0, MPFR version 4.1.0, MPC version 1.2.1, isl version none
> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> # GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64

I don't think it's important to preserve the 'options enabled' part
since the actual
options printed should allow to reproduce it.  But what's clearly
inferior is that
the options are no longer separated from the version string and the
'options passed:' is missing.

Can we somehow preserve this by making the helper produce separate
strings for the 'GNU C17 11.0 ...' part and the options passed part?  So the
-fverbose-asm and -Q consumer can continue to nicely print the option part?

> >
> > but after the change it will most definitely _not_ include all the -f options
> > implied by -O2?  So how does a standard -O2 -fverbose-asm compare?
> > How does -Q -v compare?  How does the producer string in dwarf
> > compare (I guess that's actually equal since we now use that reporting style).
>
> Yes, dwarf output is the same:
>
> BEFORE:
>      <c>   DW_AT_producer    : (indirect string, offset: 0x0): GNU C17 11.0.0 20201123 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64 -g
>
> AFTER:
>      <c>   DW_AT_producer    : (indirect string, offset: 0x0): GNU C17 10.2.1 20201117 [revision 98ba03ffe0b9f37b4916ce6238fad754e00d720b] -mtune=generic -march=x86-64 -g
>
> So the question is: do we really need to preserve the "options enabled" report? It's far from being complete
> as it e.g. ignores enum options like:
>
>    -fsched-stalled-insns-dep=<number>
>    -fsched-stalled-insns=<number>
>    -fsimd-cost-model=[unlimited|dynamic|cheap|very-cheap]       unlimited
>    -fstack-check=[no|generic|specific]
>    -fstack-reuse=[all|named_vars|none]  all
> ...
>
> Well, gcc -Q -help=optimize <options_used> seems a better hint for me.
>
> Thoughts?
> Thanks,
> Martin
>
> >
> > Thanks,
> > Richard.
> >
> >> Thanks,
> >> Martin
> >>
> >>>
> >>> Richard.
> >>
>

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]

On 12/3/20 2:12 PM, Richard Biener wrote:
> Can we somehow preserve this by making the helper produce separate
> strings for the 'GNU C17 11.0 ...' part and the options passed part?  So the
> -fverbose-asm and -Q consumer can continue to nicely print the option part?

Yep, good idea. I've just done that and I have:

1) -Q output now:

GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
options passed: -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2

and

GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
options passed: ./xgcc -B. -Q -v /home/marxin/Programming/testcases/a.c -c -O2 -fverbose-asm -frecord-gcc-switches-format=driver -g -S

2) For -fverbose-asm:

# GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
# options passed: -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2

and

# GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
# options passed: -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2 -frecord-gcc-switches-file=/tmp/ccm3kL7d.cmdline

3) DWARF producer:

     <c>   DW_AT_producer    : (indirect string, offset: 0x97): GNU C17 11.0.0 20201204 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2

and

     <c>   DW_AT_producer    : (indirect string, offset: 0x27): GNU C17 11.0.0 20201204 (experimental) ./xgcc -B. -Q -v /home/marxin/Programming/testcases/a.c -c -O2 -fverbose-asm -frecord-gcc-switches-format=driver -g

Thoughts?
Thanks,
Martin

[-- Attachment #2: 0001-Refactor-frecord-gcc-switches.patch --]
[-- Type: text/x-patch, Size: 24449 bytes --]

From 23de1dbbd81f662e9eb4a67385b0a2d0773569be Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Mon, 23 Nov 2020 13:40:04 +0100
Subject: [PATCH 1/2] Refactor -frecord-gcc-switches.

gcc/ChangeLog:

	* doc/tm.texi: Change argument of the record_gcc_switches
	hook and remove SWITCH_TYPE_* enum values.
	* dwarf2out.c (gen_producer_string): Move to opts.c and remove
	handling of the dwarf_record_gcc_switches option.
	(dwarf2out_early_finish): Use moved gen_producer_string
	function.
	* opts.c (gen_producer_string): New.
	* opts.h (gen_producer_string): New.
	* target.def: Change type of record_gcc_switches.
	* target.h (enum print_switch_type): Remove.
	(elf_record_gcc_switches): Change first argument.
	* toplev.c (MAX_LINE): Remove.
	(print_to_asm_out_file):  Likewise.
	(print_to_stderr): Likewise.
	(print_single_switch): Likewise.
	(print_switch_values): Likewise.
	(init_asm_output): Use new gen_producer_string function.
	(process_options): Likewise.
	* varasm.c (elf_record_gcc_switches): Just save the string argument
	to the ELF container.
---
 gcc/doc/tm.texi |  38 +----------
 gcc/dwarf2out.c | 118 +++-----------------------------
 gcc/opts.c      | 118 ++++++++++++++++++++++++++++++++
 gcc/opts.h      |   6 ++
 gcc/target.def  |  38 +----------
 gcc/target.h    |  14 +---
 gcc/toplev.c    | 176 +++++-------------------------------------------
 gcc/varasm.c    |  48 +++----------
 8 files changed, 165 insertions(+), 391 deletions(-)

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index f5077655716..d9b855c13ac 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8090,43 +8090,9 @@ need to override this if your target has special flags that might be
 set via @code{__attribute__}.
 @end deftypefn
 
-@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_SWITCHES (print_switch_type @var{type}, const char *@var{text})
+@deftypefn {Target Hook} void TARGET_ASM_RECORD_GCC_SWITCHES (const char *@var{})
 Provides the target with the ability to record the gcc command line
-switches that have been passed to the compiler, and options that are
-enabled.  The @var{type} argument specifies what is being recorded.
-It can take the following values:
-
-@table @gcctabopt
-@item SWITCH_TYPE_PASSED
-@var{text} is a command line switch that has been set by the user.
-
-@item SWITCH_TYPE_ENABLED
-@var{text} is an option which has been enabled.  This might be as a
-direct result of a command line switch, or because it is enabled by
-default or because it has been enabled as a side effect of a different
-command line switch.  For example, the @option{-O2} switch enables
-various different individual optimization passes.
-
-@item SWITCH_TYPE_DESCRIPTIVE
-@var{text} is either NULL or some descriptive text which should be
-ignored.  If @var{text} is NULL then it is being used to warn the
-target hook that either recording is starting or ending.  The first
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the
-warning is for start up and the second time the warning is for
-wind down.  This feature is to allow the target hook to make any
-necessary preparations before it starts to record switches and to
-perform any necessary tidying up after it has finished recording
-switches.
-
-@item SWITCH_TYPE_LINE_START
-This option can be ignored by this target hook.
-
-@item  SWITCH_TYPE_LINE_END
-This option can be ignored by this target hook.
-@end table
-
-The hook's return value must be zero.  Other return values may be
-supported in the future.
+switches provided as argument.
 
 By default this hook is set to NULL, but an example implementation is
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index c23a3ca3f6d..30e7ca68dbc 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24438,115 +24438,6 @@ gen_ptr_to_mbr_type_die (tree type, dw_die_ref context_die)
 
 static char *producer_string;
 
-/* Return a heap allocated producer string including command line options
-   if -grecord-gcc-switches.  */
-
-static char *
-gen_producer_string (void)
-{
-  size_t j;
-  auto_vec<const char *> switches;
-  const char *language_string = lang_hooks.name;
-  char *producer, *tail;
-  const char *p;
-  size_t len = dwarf_record_gcc_switches ? 0 : 3;
-  size_t plen = strlen (language_string) + 1 + strlen (version_string);
-
-  for (j = 1; dwarf_record_gcc_switches && j < save_decoded_options_count; j++)
-    switch (save_decoded_options[j].opt_index)
-      {
-      case OPT_o:
-      case OPT_d:
-      case OPT_dumpbase:
-      case OPT_dumpbase_ext:
-      case OPT_dumpdir:
-      case OPT_quiet:
-      case OPT_version:
-      case OPT_v:
-      case OPT_w:
-      case OPT_L:
-      case OPT_D:
-      case OPT_I:
-      case OPT_U:
-      case OPT_SPECIAL_unknown:
-      case OPT_SPECIAL_ignore:
-      case OPT_SPECIAL_warn_removed:
-      case OPT_SPECIAL_program_name:
-      case OPT_SPECIAL_input_file:
-      case OPT_grecord_gcc_switches:
-      case OPT__output_pch_:
-      case OPT_fdiagnostics_show_location_:
-      case OPT_fdiagnostics_show_option:
-      case OPT_fdiagnostics_show_caret:
-      case OPT_fdiagnostics_show_labels:
-      case OPT_fdiagnostics_show_line_numbers:
-      case OPT_fdiagnostics_color_:
-      case OPT_fdiagnostics_format_:
-      case OPT_fverbose_asm:
-      case OPT____:
-      case OPT__sysroot_:
-      case OPT_nostdinc:
-      case OPT_nostdinc__:
-      case OPT_fpreprocessed:
-      case OPT_fltrans_output_list_:
-      case OPT_fresolution_:
-      case OPT_fdebug_prefix_map_:
-      case OPT_fmacro_prefix_map_:
-      case OPT_ffile_prefix_map_:
-      case OPT_fcompare_debug:
-      case OPT_fchecking:
-      case OPT_fchecking_:
-	/* Ignore these.  */
-	continue;
-      case OPT_flto_:
-	{
-	  const char *lto_canonical = "-flto";
-	  switches.safe_push (lto_canonical);
-	  len += strlen (lto_canonical) + 1;
-	  break;
-	}
-      default:
-        if (cl_options[save_decoded_options[j].opt_index].flags
-	    & CL_NO_DWARF_RECORD)
-	  continue;
-        gcc_checking_assert (save_decoded_options[j].canonical_option[0][0]
-			     == '-');
-        switch (save_decoded_options[j].canonical_option[0][1])
-	  {
-	  case 'M':
-	  case 'i':
-	  case 'W':
-	    continue;
-	  case 'f':
-	    if (strncmp (save_decoded_options[j].canonical_option[0] + 2,
-			 "dump", 4) == 0)
-	      continue;
-	    break;
-	  default:
-	    break;
-	  }
-	switches.safe_push (save_decoded_options[j].orig_option_with_args_text);
-	len += strlen (save_decoded_options[j].orig_option_with_args_text) + 1;
-	break;
-      }
-
-  producer = XNEWVEC (char, plen + 1 + len + 1);
-  tail = producer;
-  sprintf (tail, "%s %s", language_string, version_string);
-  tail += plen;
-
-  FOR_EACH_VEC_ELT (switches, j, p)
-    {
-      len = strlen (p);
-      *tail = ' ';
-      memcpy (tail + 1, p, len);
-      tail += len + 1;
-    }
-
-  *tail = '\0';
-  return producer;
-}
-
 /* Given a C and/or C++ language/version string return the "highest".
    C++ is assumed to be "higher" than C in this case.  Used for merging
    LTO translation unit languages.  */
@@ -32157,7 +32048,14 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
-  producer_string = gen_producer_string ();
+
+  if (dwarf_record_gcc_switches)
+    producer_string = gen_producer_string (lang_hooks.name,
+					   save_decoded_options,
+					   save_decoded_options_count);
+  else
+    producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
 
diff --git a/gcc/opts.c b/gcc/opts.c
index cc1d0cc04f6..efaa4348dde 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "spellcheck.h"
 #include "opt-suggestions.h"
 #include "diagnostic-color.h"
+#include "version.h"
 #include "selftest.h"
 
 static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
@@ -3266,6 +3267,123 @@ get_option_url (diagnostic_context *, int option_index)
     return NULL;
 }
 
+/* Return a heap allocated producer with command line options.  */
+
+char *gen_command_line_string (cl_decoded_option *options,
+			       unsigned int options_count)
+{
+  auto_vec<const char *> switches;
+  char *options_string, *tail;
+  const char *p;
+  size_t len = 0;
+
+  for (unsigned i = 0; i < options_count; i++)
+    switch (options[i].opt_index)
+      {
+      case OPT_o:
+      case OPT_d:
+      case OPT_dumpbase:
+      case OPT_dumpdir:
+      case OPT_quiet:
+      case OPT_version:
+      case OPT_v:
+      case OPT_w:
+      case OPT_L:
+      case OPT_D:
+      case OPT_I:
+      case OPT_U:
+      case OPT_SPECIAL_unknown:
+      case OPT_SPECIAL_ignore:
+      case OPT_SPECIAL_warn_removed:
+      case OPT_SPECIAL_program_name:
+      case OPT_SPECIAL_input_file:
+      case OPT_grecord_gcc_switches:
+      case OPT_frecord_gcc_switches:
+      case OPT__output_pch_:
+      case OPT_fdiagnostics_show_location_:
+      case OPT_fdiagnostics_show_option:
+      case OPT_fdiagnostics_show_caret:
+      case OPT_fdiagnostics_show_labels:
+      case OPT_fdiagnostics_show_line_numbers:
+      case OPT_fdiagnostics_color_:
+      case OPT_fdiagnostics_format_:
+      case OPT_fverbose_asm:
+      case OPT____:
+      case OPT__sysroot_:
+      case OPT_nostdinc:
+      case OPT_nostdinc__:
+      case OPT_fpreprocessed:
+      case OPT_fltrans_output_list_:
+      case OPT_fresolution_:
+      case OPT_fdebug_prefix_map_:
+      case OPT_fmacro_prefix_map_:
+      case OPT_ffile_prefix_map_:
+      case OPT_fcompare_debug:
+      case OPT_fchecking:
+      case OPT_fchecking_:
+	/* Ignore these.  */
+	continue;
+      case OPT_flto_:
+	{
+	  const char *lto_canonical = "-flto";
+	  switches.safe_push (lto_canonical);
+	  len += strlen (lto_canonical) + 1;
+	  break;
+	}
+      default:
+	if (cl_options[options[i].opt_index].flags
+	    & CL_NO_DWARF_RECORD)
+	  continue;
+	gcc_checking_assert (options[i].canonical_option[0][0] == '-');
+	switch (options[i].canonical_option[0][1])
+	  {
+	  case 'M':
+	  case 'i':
+	  case 'W':
+	    continue;
+	  case 'f':
+	    if (strncmp (options[i].canonical_option[0] + 2,
+			 "dump", 4) == 0)
+	      continue;
+	    break;
+	  default:
+	    break;
+	  }
+	switches.safe_push (options[i].orig_option_with_args_text);
+	len += strlen (options[i].orig_option_with_args_text) + 1;
+	break;
+      }
+
+  options_string = XNEWVEC (char, len + 1);
+  tail = options_string;
+
+  unsigned i;
+  FOR_EACH_VEC_ELT (switches, i, p)
+    {
+      len = strlen (p);
+      memcpy (tail, p, len);
+      tail += len;
+      if (i != switches.length () - 1)
+	{
+	  *tail = ' ';
+	  ++tail;
+	}
+    }
+
+  *tail = '\0';
+  return options_string;
+}
+
+/* Return a heap allocated producer string including command line options.  */
+
+char *
+gen_producer_string (const char *language_string, cl_decoded_option *options,
+		     unsigned int options_count)
+{
+  return concat (language_string, " ", version_string, " ",
+		 gen_command_line_string (options, options_count), NULL);
+}
+
 #if CHECKING_P
 
 namespace selftest {
diff --git a/gcc/opts.h b/gcc/opts.h
index d62bfcfdf6a..b36c0d18759 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -482,6 +482,12 @@ extern void parse_options_from_collect_gcc_options (const char *, obstack *,
 
 extern void prepend_xassembler_to_collect_as_options (const char *, obstack *);
 
+extern char *gen_command_line_string (cl_decoded_option *options,
+				      unsigned int options_count);
+extern char *gen_producer_string (const char *language_string,
+				  cl_decoded_option *options,
+				  unsigned int options_count);
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/target.def b/gcc/target.def
index a0ea853b75f..acdc694d44c 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -757,41 +757,7 @@ directive to annotate @var{symbol} as used.  The Darwin target uses the\n\
 DEFHOOK
 (record_gcc_switches,
  "Provides the target with the ability to record the gcc command line\n\
-switches that have been passed to the compiler, and options that are\n\
-enabled.  The @var{type} argument specifies what is being recorded.\n\
-It can take the following values:\n\
-\n\
-@table @gcctabopt\n\
-@item SWITCH_TYPE_PASSED\n\
-@var{text} is a command line switch that has been set by the user.\n\
-\n\
-@item SWITCH_TYPE_ENABLED\n\
-@var{text} is an option which has been enabled.  This might be as a\n\
-direct result of a command line switch, or because it is enabled by\n\
-default or because it has been enabled as a side effect of a different\n\
-command line switch.  For example, the @option{-O2} switch enables\n\
-various different individual optimization passes.\n\
-\n\
-@item SWITCH_TYPE_DESCRIPTIVE\n\
-@var{text} is either NULL or some descriptive text which should be\n\
-ignored.  If @var{text} is NULL then it is being used to warn the\n\
-target hook that either recording is starting or ending.  The first\n\
-time @var{type} is SWITCH_TYPE_DESCRIPTIVE and @var{text} is NULL, the\n\
-warning is for start up and the second time the warning is for\n\
-wind down.  This feature is to allow the target hook to make any\n\
-necessary preparations before it starts to record switches and to\n\
-perform any necessary tidying up after it has finished recording\n\
-switches.\n\
-\n\
-@item SWITCH_TYPE_LINE_START\n\
-This option can be ignored by this target hook.\n\
-\n\
-@item  SWITCH_TYPE_LINE_END\n\
-This option can be ignored by this target hook.\n\
-@end table\n\
-\n\
-The hook's return value must be zero.  Other return values may be\n\
-supported in the future.\n\
+switches provided as argument.\n\
 \n\
 By default this hook is set to NULL, but an example implementation is\n\
 provided for ELF based targets.  Called @var{elf_record_gcc_switches},\n\
@@ -799,7 +765,7 @@ it records the switches as ASCII text inside a new, string mergeable\n\
 section in the assembler output file.  The name of the new section is\n\
 provided by the @code{TARGET_ASM_RECORD_GCC_SWITCHES_SECTION} target\n\
 hook.",
- int, (print_switch_type type, const char *text),
+ void, (const char *),
  NULL)
 
 /* The name of the section that the example ELF implementation of
diff --git a/gcc/target.h b/gcc/target.h
index 440cd25f297..960188023f1 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -68,16 +68,6 @@ union cumulative_args_t { void *p; };
 
 #endif /* !CHECKING_P */
 
-/* Types used by the record_gcc_switches() target function.  */
-enum print_switch_type
-{
-  SWITCH_TYPE_PASSED,		/* A switch passed on the command line.  */
-  SWITCH_TYPE_ENABLED,		/* An option that is currently enabled.  */
-  SWITCH_TYPE_DESCRIPTIVE,	/* Descriptive text, not a switch or option.  */
-  SWITCH_TYPE_LINE_START,	/* Please emit any necessary text at the start of a line.  */
-  SWITCH_TYPE_LINE_END		/* Please emit a line terminator.  */
-};
-
 /* Types of memory operation understood by the "by_pieces" infrastructure.
    Used by the TARGET_USE_BY_PIECES_INFRASTRUCTURE_P target hook and
    internally by the functions in expr.c.  */
@@ -96,10 +86,8 @@ extern unsigned HOST_WIDE_INT by_pieces_ninsns (unsigned HOST_WIDE_INT,
 						unsigned int,
 						by_pieces_operation);
 
-typedef int (* print_switch_fn_type) (print_switch_type, const char *);
-
 /* An example implementation for ELF targets.  Defined in varasm.c  */
-extern int elf_record_gcc_switches (print_switch_type type, const char *);
+extern void elf_record_gcc_switches (const char *);
 
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
diff --git a/gcc/toplev.c b/gcc/toplev.c
index cb4ae77fccb..93a41943b8c 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -116,9 +116,6 @@ static void compile_file (void);
 /* True if we don't need a backend (e.g. preprocessing only).  */
 static bool no_backend;
 
-/* Length of line when printing switch values.  */
-#define MAX_LINE 75
-
 /* Decoded options, and number of such options.  */
 struct cl_decoded_option *save_decoded_options;
 unsigned int save_decoded_options_count;
@@ -687,148 +684,7 @@ print_version (FILE *file, const char *indent, bool show_global_state)
     }
 }
 
-static int
-print_to_asm_out_file (print_switch_type type, const char * text)
-{
-  bool prepend_sep = true;
-
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', asm_out_file);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      fputs (ASM_COMMENT_START, asm_out_file);
-      return strlen (ASM_COMMENT_START);
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (ASM_COMMENT_START[0] == 0)
-	prepend_sep = false;
-      /* FALLTHRU */
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      if (prepend_sep)
-	fputc (' ', asm_out_file);
-      fputs (text, asm_out_file);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-static int
-print_to_stderr (print_switch_type type, const char * text)
-{
-  switch (type)
-    {
-    case SWITCH_TYPE_LINE_END:
-      putc ('\n', stderr);
-      return 1;
-
-    case SWITCH_TYPE_LINE_START:
-      return 0;
-
-    case SWITCH_TYPE_PASSED:
-    case SWITCH_TYPE_ENABLED:
-      fputc (' ', stderr);
-      /* FALLTHRU */
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      fputs (text, stderr);
-      /* No need to return the length here as
-	 print_single_switch has already done it.  */
-      return 0;
-
-    default:
-      return -1;
-    }
-}
-
-/* Print an option value and return the adjusted position in the line.
-   ??? print_fn doesn't handle errors, eg disk full; presumably other
-   code will catch a disk full though.  */
-
-static int
-print_single_switch (print_switch_fn_type print_fn,
-		     int pos,
-		     print_switch_type type,
-		     const char * text)
-{
-  /* The ultrix fprintf returns 0 on success, so compute the result
-     we want here since we need it for the following test.  The +1
-     is for the separator character that will probably be emitted.  */
-  int len = strlen (text) + 1;
-
-  if (pos != 0
-      && pos + len > MAX_LINE)
-    {
-      print_fn (SWITCH_TYPE_LINE_END, NULL);
-      pos = 0;
-    }
-
-  if (pos == 0)
-    pos += print_fn (SWITCH_TYPE_LINE_START, NULL);
-
-  print_fn (type, text);
-  return pos + len;
-}
-
-/* Print active target switches using PRINT_FN.
-   POS is the current cursor position and MAX is the size of a "line".
-   Each line begins with INDENT and ends with TERM.
-   Each switch is separated from the next by SEP.  */
 
-static void
-print_switch_values (print_switch_fn_type print_fn)
-{
-  int pos = 0;
-  size_t j;
-
-  /* Print the options as passed.  */
-  pos = print_single_switch (print_fn, pos,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options passed: "));
-
-  for (j = 1; j < save_decoded_options_count; j++)
-    {
-      switch (save_decoded_options[j].opt_index)
-	{
-	case OPT_o:
-	case OPT_d:
-	case OPT_dumpbase:
-	case OPT_dumpbase_ext:
-	case OPT_dumpdir:
-	case OPT_quiet:
-	case OPT_version:
-	  /* Ignore these.  */
-	  continue;
-	}
-
-      pos = print_single_switch (print_fn, pos, SWITCH_TYPE_PASSED,
-				 save_decoded_options[j].orig_option_with_args_text);
-    }
-
-  if (pos > 0)
-    print_fn (SWITCH_TYPE_LINE_END, NULL);
-
-  /* Print the -f and -m options that have been enabled.
-     We don't handle language specific options but printing argv
-     should suffice.  */
-  pos = print_single_switch (print_fn, 0,
-			     SWITCH_TYPE_DESCRIPTIVE, _("options enabled: "));
-
-  unsigned lang_mask = lang_hooks.option_lang_mask ();
-  for (j = 0; j < cl_options_count; j++)
-    if (cl_options[j].cl_report
-	&& option_enabled (j, lang_mask, &global_options) > 0)
-      pos = print_single_switch (print_fn, pos,
-				 SWITCH_TYPE_ENABLED, cl_options[j].opt_text);
-
-  print_fn (SWITCH_TYPE_LINE_END, NULL);
-}
 
 /* Open assembly code output file.  Do this even if -fsyntax-only is
    on, because then the driver will have provided the name of a
@@ -875,14 +731,11 @@ init_asm_output (const char *name)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
 	    {
-	      /* Let the target know that we are about to start recording.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
-	      /* Now record the switches.  */
-	      print_switch_values (targetm.asm_out.record_gcc_switches);
-	      /* Let the target know that the recording is over.  */
-	      targetm.asm_out.record_gcc_switches (SWITCH_TYPE_DESCRIPTIVE,
-						   NULL);
+	      const char *str
+		= gen_producer_string (lang_hooks.name,
+				       save_decoded_options,
+				       save_decoded_options_count);
+	      targetm.asm_out.record_gcc_switches (str);
 	    }
 	  else
 	    inform (UNKNOWN_LOCATION,
@@ -892,11 +745,13 @@ init_asm_output (const char *name)
 
       if (flag_verbose_asm)
 	{
-	  /* Print the list of switches in effect
-	     into the assembler file as comments.  */
 	  print_version (asm_out_file, ASM_COMMENT_START, true);
-	  print_switch_values (print_to_asm_out_file);
-	  putc ('\n', asm_out_file);
+	  fputs (ASM_COMMENT_START, asm_out_file);
+	  fputs (" options passed: ", asm_out_file);
+	  fputs (gen_command_line_string (save_decoded_options,
+					  save_decoded_options_count),
+		 asm_out_file);
+	  fputc ('\n', asm_out_file);
 	}
     }
 }
@@ -1526,8 +1381,13 @@ process_options (void)
   if (version_flag)
     {
       print_version (stderr, "", true);
-      if (! quiet_flag)
-	print_switch_values (print_to_stderr);
+      if (!quiet_flag)
+	{
+	  fputs ("options passed: ", stderr);
+	  fputs (gen_command_line_string (save_decoded_options,
+					  save_decoded_options_count), stderr);
+	  fputc ('\n', stderr);
+	}
     }
 
   if (flag_syntax_only)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 961d2d6fe3b..0fac3688828 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -58,6 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl-iter.h"
 #include "file-prefix-map.h" /* remap_debug_filename()  */
 #include "alloc-pool.h"
+#include "toplev.h"
+#include "opts.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data declarations.  */
@@ -8053,45 +8056,14 @@ output_object_blocks (void)
    we want to emit NUL strings terminators into the object file we have to use
    ASM_OUTPUT_SKIP.  */
 
-int
-elf_record_gcc_switches (print_switch_type type, const char * name)
+void
+elf_record_gcc_switches (const char *options)
 {
-  switch (type)
-    {
-    case SWITCH_TYPE_PASSED:
-      ASM_OUTPUT_ASCII (asm_out_file, name, strlen (name));
-      ASM_OUTPUT_SKIP (asm_out_file, HOST_WIDE_INT_1U);
-      break;
-
-    case SWITCH_TYPE_DESCRIPTIVE:
-      if (name == NULL)
-	{
-	  /* Distinguish between invocations where name is NULL.  */
-	  static bool started = false;
-
-	  if (!started)
-	    {
-	      section * sec;
-
-	      sec = get_section (targetm.asm_out.record_gcc_switches_section,
-				 SECTION_DEBUG
-				 | SECTION_MERGE
-				 | SECTION_STRINGS
-				 | (SECTION_ENTSIZE & 1),
-				 NULL);
-	      switch_to_section (sec);
-	      started = true;
-	    }
-	}
-
-    default:
-      break;
-    }
-
-  /* The return value is currently ignored by the caller, but must be 0.
-     For -fverbose-asm the return value would be the number of characters
-     emitted into the assembler file.  */
-  return 0;
+  section *sec = get_section (targetm.asm_out.record_gcc_switches_section,
+			      SECTION_DEBUG | SECTION_MERGE
+			      | SECTION_STRINGS | (SECTION_ENTSIZE & 1), NULL);
+  switch_to_section (sec);
+  ASM_OUTPUT_ASCII (asm_out_file, options, strlen (options) + 1);
 }
 
 /* Emit text to declare externally defined symbols. It is needed to
-- 
2.29.2


[-- Attachment #3: 0002-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch --]
[-- Type: text/x-patch, Size: 12742 bytes --]

From 397e1a28c3e5c0aa9f44a8e19115cc7c50d8b388 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 4 Dec 2020 08:52:33 +0100
Subject: [PATCH 2/2] Change semantics of -frecord-gcc-switches and add
 -frecord-gcc-switches-format.

gcc/ChangeLog:

	* common.opt: Document new options -frecord-gcc-switches-format
	and -frecord-gcc-switches-file.
	* doc/invoke.texi: Document the new options.
	* dwarf2out.c (dwarf2out_early_finish): Respect
	flag_record_gcc_switches_format.
	* flag-types.h (enum record_gcc_switches_format): New.
	* gcc.c (save_driver_cmdline): Save command line to a temporary
	file.
	(driver::main): Call set_commandline.
	(driver::set_commandline): New.
	* gcc.h (set_commandline): New.
	* opts.c (get_driver_command_line): New.
	* opts.h (get_driver_command_line): New.
	* toplev.c (init_asm_output): Use new function get_producer_string.
	(process_options): Respect flag_record_gcc_switches_format
	option.

Co-Authored-By: Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>
---
 gcc/common.opt      | 19 ++++++++++++++++++-
 gcc/doc/invoke.texi | 23 ++++++++++++++++++++++-
 gcc/dwarf2out.c     | 17 ++++++++++++-----
 gcc/flag-types.h    |  7 +++++++
 gcc/gcc.c           | 37 ++++++++++++++++++++++++++++++++++++-
 gcc/gcc.h           |  1 +
 gcc/opts.c          | 31 +++++++++++++++++++++++++++++++
 gcc/opts.h          |  2 ++
 gcc/toplev.c        | 27 ++++++++++++++++++++-------
 9 files changed, 149 insertions(+), 15 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index 582e2aa8774..eb112fcdf90 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2322,9 +2322,26 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Driver Report Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
+Enum
+Name(record_gcc_switches_format) Type(enum record_gcc_switches_format)
+
+EnumValue
+Enum(record_gcc_switches_format) String(processed) Value(RECORD_GCC_SWITCHES_PROCESSED)
+
+EnumValue
+Enum(record_gcc_switches_format) String(driver) Value(RECORD_GCC_SWITCHES_DRIVER)
+
+frecord-gcc-switches-format=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_format) Enum(record_gcc_switches_format) Init(RECORD_GCC_SWITCHES_PROCESSED)
+-frecord-gcc-switches-format=[processed|driver]	Format of recorded gcc command line switches.
+
+frecord-gcc-switches-file=
+Common Report Joined RejectNegative Var(flag_record_gcc_switches_file) Undocumented
+Path to file that contains driver command line options.
+
 freg-struct-return
 Common Report Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 615eae9a1c5..76f938da5da 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -643,7 +643,7 @@ Objective-C and Objective-C++ Dialects}.
 -finhibit-size-directive  -fcommon  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC  -fpie  -fPIE  -fno-plt @gol
 -fno-jump-tables -fno-bit-tests @gol
--frecord-gcc-switches @gol
+-frecord-gcc-switches -frecord-gcc-switches-format @gol
 -freg-struct-return  -fshort-enums  -fshort-wchar @gol
 -fverbose-asm  -fpack-struct[=@var{n}]  @gol
 -fleading-underscore  -ftls-model=@var{model} @gol
@@ -16206,6 +16206,27 @@ comments, so it never reaches the object file.
 See also @option{-grecord-gcc-switches} for another
 way of storing compiler options into the object file.
 
+@item -frecord-gcc-switches-format=@var{format}
+@opindex frecord-gcc-switches-format
+This switch controls the output format of options that record
+the command line.  The affected options are @option{-frecord-gcc-switches},
+@option{-grecord-gcc-switches} and @option{-fverbose-asm}.
+
+The @var{format} argument should be one of the following:
+
+@table @samp
+
+@item processed
+
+Options are printed after processing by the compiler driver.
+It is the default option value.
+
+@item driver
+
+Options are printed as provided to the compiler driver.
+
+@end table
+
 @item -fpic
 @opindex fpic
 @cindex global offset table
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 30e7ca68dbc..184f3363008 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -32048,13 +32048,20 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
+  producer_string = concat (lang_hooks.name, " ", version_string, NULL);
 
   if (dwarf_record_gcc_switches)
-    producer_string = gen_producer_string (lang_hooks.name,
-					   save_decoded_options,
-					   save_decoded_options_count);
-  else
-    producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+    {
+      char *producer_string_old = producer_string;
+      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	producer_string = concat (producer_string, " ",
+				  get_driver_command_line (), NULL);
+      else
+	producer_string = gen_producer_string (lang_hooks.name,
+					       save_decoded_options,
+					       save_decoded_options_count);
+      free (producer_string_old);
+    }
 
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index 9342bd87be3..4ded267f197 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -427,6 +427,13 @@ enum openacc_kernels
   OPENACC_KERNELS_PARLOOPS
 };
 
+/* Record GCC options type.  */
+enum record_gcc_switches_format
+{
+  RECORD_GCC_SWITCHES_PROCESSED = 0,
+  RECORD_GCC_SWITCHES_DRIVER
+};
+
 #endif
 
 #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 1d32375f648..7ef888c8b18 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,12 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv provided to the driver.  Necessary to keep for when
+   -frecord-gcc-switches-format=driver is given.  */
+
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -433,6 +439,7 @@ static const char *greater_than_spec_func (int, const char **);
 static const char *debug_level_greater_than_spec_func (int, const char **);
 static const char *dwarf_version_greater_than_spec_func (int, const char **);
 static const char *find_fortran_preinclude_file (int, const char **);
+static const char *save_driver_cmdline (int, const char **);
 static char *convert_white_space (char *);
 static char *quote_spec (char *);
 static char *quote_spec_arg (char *);
@@ -1276,7 +1283,9 @@ static const char *cc1_options =
  %{coverage:-fprofile-arcs -ftest-coverage}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
-     %{pthread:-fprofile-update=prefer-atomic}}}";
+     %{pthread:-fprofile-update=prefer-atomic}}}\
+ %{frecord-gcc-switches-format=driver:-frecord-gcc-switches-file=%:save-driver-cmdline(%g.cmdline)\
+   %<-frecord-gcc-switches-format=driver}";
 
 static const char *asm_options =
 "%{-target-help:%:print-asm-header()} "
@@ -1768,6 +1777,7 @@ static const struct spec_function static_spec_functions[] =
   { "debug-level-gt",		debug_level_greater_than_spec_func },
   { "dwarf-version-gt",		dwarf_version_greater_than_spec_func },
   { "fortran-preinclude-file",	find_fortran_preinclude_file},
+  { "save-driver-cmdline",	save_driver_cmdline},
 #ifdef EXTRA_SPEC_FUNCTIONS
   EXTRA_SPEC_FUNCTIONS
 #endif
@@ -8012,6 +8022,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -8055,6 +8066,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep the command line for -frecord-gcc-switches-format=driver.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
@@ -10807,6 +10827,21 @@ find_fortran_preinclude_file (int argc, const char **argv)
   return result;
 }
 
+/* Save driver options to a temporary file.  */
+
+static const char *
+save_driver_cmdline (int argc ATTRIBUTE_UNUSED,
+		     const char **argv)
+{
+  FILE *f = fopen (argv[0], "w");
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    fprintf (f, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+  fclose (f);
+
+  return argv[0];
+}
+
+
 /* If any character in ORIG fits QUOTE_P (_, P), reallocate the string
    so as to precede every one of them with a backslash.  Return the
    original string or the reallocated one.  */
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08f059..cde77fbaad7 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/opts.c b/gcc/opts.c
index efaa4348dde..a760f8d6d21 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -3299,6 +3299,7 @@ char *gen_command_line_string (cl_decoded_option *options,
       case OPT_SPECIAL_input_file:
       case OPT_grecord_gcc_switches:
       case OPT_frecord_gcc_switches:
+      case OPT_frecord_gcc_switches_format_:
       case OPT__output_pch_:
       case OPT_fdiagnostics_show_location_:
       case OPT_fdiagnostics_show_option:
@@ -3384,6 +3385,36 @@ gen_producer_string (const char *language_string, cl_decoded_option *options,
 		 gen_command_line_string (options, options_count), NULL);
 }
 
+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  static char *cmdline = NULL;
+
+  if (cmdline != NULL)
+    return cmdline;
+
+  FILE *f = fopen (flag_record_gcc_switches_file, "r");
+  if (f == NULL)
+    fatal_error (UNKNOWN_LOCATION, "cannot open %s: %m", flag_record_gcc_switches_file);
+
+  fseek(f, 0, SEEK_END);
+  unsigned int size = ftell (f);
+  fseek(f, 0, SEEK_SET);
+
+  cmdline = XNEWVEC (char, size + 1);
+
+  unsigned int read;
+  char *ptr = cmdline;
+  while ((read = fread (ptr, 4096, 1, f)))
+    ptr += read;
+
+  cmdline[size] = '\0';
+  return cmdline;
+}
+
 #if CHECKING_P
 
 namespace selftest {
diff --git a/gcc/opts.h b/gcc/opts.h
index b36c0d18759..a3f1823071b 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -488,6 +488,8 @@ extern char *gen_producer_string (const char *language_string,
 				  cl_decoded_option *options,
 				  unsigned int options_count);
 
+extern const char *get_driver_command_line ();
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 93a41943b8c..6891addba75 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -731,11 +731,21 @@ init_asm_output (const char *name)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
 	    {
-	      const char *str
-		= gen_producer_string (lang_hooks.name,
-				       save_decoded_options,
-				       save_decoded_options_count);
-	      targetm.asm_out.record_gcc_switches (str);
+	      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+		{
+		  const char *str = concat (version_string, " ",
+					    get_driver_command_line (), NULL);
+		  targetm.asm_out.record_gcc_switches (str);
+		  free (CONST_CAST (char *, str));
+		}
+	      else
+		{
+		  const char *str
+		    = gen_producer_string (lang_hooks.name,
+					   save_decoded_options,
+					   save_decoded_options_count);
+		  targetm.asm_out.record_gcc_switches (str);
+		}
 	    }
 	  else
 	    inform (UNKNOWN_LOCATION,
@@ -1384,8 +1394,11 @@ process_options (void)
       if (!quiet_flag)
 	{
 	  fputs ("options passed: ", stderr);
-	  fputs (gen_command_line_string (save_decoded_options,
-					  save_decoded_options_count), stderr);
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), stderr);
+	  else
+	    fputs (gen_command_line_string (save_decoded_options,
+					    save_decoded_options_count), stderr);
 	  fputc ('\n', stderr);
 	}
     }
-- 
2.29.2

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Richard Biener]

On Fri, Dec 4, 2020 at 9:08 AM Martin Liška <mliska@suse.cz> wrote:
>
> On 12/3/20 2:12 PM, Richard Biener wrote:
> > Can we somehow preserve this by making the helper produce separate
> > strings for the 'GNU C17 11.0 ...' part and the options passed part?  So the
> > -fverbose-asm and -Q consumer can continue to nicely print the option part?
>
> Yep, good idea. I've just done that and I have:
>
> 1) -Q output now:
>
> GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> options passed: -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2
>
> and
>
> GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> options passed: ./xgcc -B. -Q -v /home/marxin/Programming/testcases/a.c -c -O2 -fverbose-asm -frecord-gcc-switches-format=driver -g -S
>
> 2) For -fverbose-asm:
>
> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> # options passed: -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2
>
> and
>
> # GGC heuristics: --param ggc-min-expand=30 --param ggc-min-heapsize=4096
> # options passed: -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2 -frecord-gcc-switches-file=/tmp/ccm3kL7d.cmdline
>
> 3) DWARF producer:
>
>      <c>   DW_AT_producer    : (indirect string, offset: 0x97): GNU C17 11.0.0 20201204 (experimental) -dumpbase-ext .c -mtune=generic -march=x86-64 -g -O2
>
> and
>
>      <c>   DW_AT_producer    : (indirect string, offset: 0x27): GNU C17 11.0.0 20201204 (experimental) ./xgcc -B. -Q -v /home/marxin/Programming/testcases/a.c -c -O2 -fverbose-asm -frecord-gcc-switches-format=driver -g
>
> Thoughts?

+/* Return a heap allocated producer with command line options.  */
+
+char *gen_command_line_string (cl_decoded_option *options,

char * goes to a separate line

+                              unsigned int options_count)
+{

Otherwise 0001- looks good to me.  As said I'd like to see opinions
from others on the
driver / backend communication for 0002.

Thanks,
Richard.

> Thanks,
> Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 12/4/20 10:03 AM, Richard Biener wrote:
> Otherwise 0001- looks good to me.

Pushed that to master.

> As said I'd like to see opinions
> from others on the
> driver / backend communication for 0002.

To be honest, we moved back to the original implementation which used
a temporary file. There hasn't been any opinion for last 8 months :(

Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Jakub Jelinek]

On Fri, Dec 04, 2020 at 02:30:45PM +0100, Martin Liška wrote:
> On 12/4/20 10:03 AM, Richard Biener wrote:
> > Otherwise 0001- looks good to me.
> 
> Pushed that to master.
> 
> > As said I'd like to see opinions
> > from others on the
> > driver / backend communication for 0002.
> 
> To be honest, we moved back to the original implementation which used
> a temporary file. There hasn't been any opinion for last 8 months :(

Using environment variable rather than a temporary file must be faster.

	Jakub

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Richard Biener]

On Fri, Dec 4, 2020 at 2:35 PM Jakub Jelinek <jakub@redhat.com> wrote:
>
> On Fri, Dec 04, 2020 at 02:30:45PM +0100, Martin Liška wrote:
> > On 12/4/20 10:03 AM, Richard Biener wrote:
> > > Otherwise 0001- looks good to me.
> >
> > Pushed that to master.
> >
> > > As said I'd like to see opinions
> > > from others on the
> > > driver / backend communication for 0002.
> >
> > To be honest, we moved back to the original implementation which used
> > a temporary file. There hasn't been any opinion for last 8 months :(
>
> Using environment variable rather than a temporary file must be faster.

But it's difficult to preserve behavior with -save-temps and execing cc1
as printed which is why I don't like it too much, even if it is "faster".
The environment might also be of limited size and with including
everything (-I... -L...) and always (a defect of the patch) I fear we might
run over its size limits on some host OSs at least.

Richard.

>         Jakub
>

[PATCH 1/2] Remove Report keyword for options

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

There's a small clean up that removes Report as it's not used
any longer by -fverbose-asm.

Patch can bootstrap on x86_64-linux-gnu and survives regression tests.

Ready to be installed?
Thanks,
Martin

[-- Attachment #2: 0001-Remove-Report-keyword-for-options.patch --]
[-- Type: text/x-patch, Size: 3182 bytes --]

From 13c7f39e59862a639823d0f47bbe1f4d9aacd736 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 11 Dec 2020 17:06:49 +0100
Subject: [PATCH 1/2] Remove Report keyword for options

Since g:7caa49706316e650fb67719e1a1bf3a35054b685 the option is ignored
as we print used command line for -fverbose-asm output.

gcc/ChangeLog:

	* doc/options.texi: Remove Report keyword.
	* opt-functions.awk: Print error when Report keyword
	is used.
	* optc-gen.awk: Do not handle Report keyword.
	* opts.h (struct cl_option): Remove cl_report bitfield flag.
---
 gcc/doc/options.texi  | 3 ---
 gcc/opt-functions.awk | 4 +++-
 gcc/optc-gen.awk      | 4 ----
 gcc/opts.h            | 2 --
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/gcc/doc/options.texi b/gcc/doc/options.texi
index a8e83fcb696..aabfb82c7cb 100644
--- a/gcc/doc/options.texi
+++ b/gcc/doc/options.texi
@@ -454,9 +454,6 @@ operands, which is passed to the @samp{warning} function.  If an alias
 is marked @code{Warn}, the target of the alias must not also be marked
 @code{Warn}.
 
-@item Report
-The state of the option should be printed by @option{-fverbose-asm}.
-
 @item Warning
 This is a warning option and should be shown as such in
 @option{--help} output.  This flag does not currently affect anything
diff --git a/gcc/opt-functions.awk b/gcc/opt-functions.awk
index b4952b89315..0c489e0e3be 100644
--- a/gcc/opt-functions.awk
+++ b/gcc/opt-functions.awk
@@ -166,9 +166,11 @@ function switch_bit_fields (flags)
 	  uinteger_flag \
 	  hwi_flag \
 	  flag_init("ToLower", flags) \
-	  flag_init("Report", flags) \
 	  byte_size_flag
 
+	if (flag_set_p("Report", flags))
+	    print "#error Report option property is dropped"
+
 	sub(", $", "", result)
 	return result
 }
diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index be5566b960a..0c9fa16cb00 100644
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -332,8 +332,6 @@ for (i = 0; i < n_opts; i++) {
 				  print "#error Ignored option with Warn"
         if (var_name(flags[i]) != "")
 				  print "#error Ignored option with Var"
-        if (flag_set_p("Report", flags[i]))
-				  print "#error Ignored option with Report"
       }
     else if (flag_set_p("Deprecated", flags[i]))
         print "#error Deprecated was replaced with WarnRemoved"
@@ -341,8 +339,6 @@ for (i = 0; i < n_opts; i++) {
 			  alias_data = "NULL, NULL, OPT_SPECIAL_warn_removed"
         if (warn_message != "NULL")
 				  print "#error WarnRemoved option with Warn"
-        if (flag_set_p("Report", flags[i]))
-				  print "#error WarnRemoved option with Report"
       }
 		else
 			alias_data = "NULL, NULL, N_OPTS"
diff --git a/gcc/opts.h b/gcc/opts.h
index b36c0d18759..2cf24d1430d 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -104,8 +104,6 @@ struct cl_option
   BOOL_BITFIELD cl_host_wide_int : 1;
   /* Argument should be converted to lowercase.  */
   BOOL_BITFIELD cl_tolower : 1;
-  /* Report argument with -fverbose-asm  */
-  BOOL_BITFIELD cl_report : 1;
   /* Argument is an unsigned integer with an optional byte suffix.  */
   BOOL_BITFIELD cl_byte_size: 1;
   /* Offset of field for this option in struct gcc_options, or
-- 
2.29.2

[PATCH 2/2] opts: Remove all usages of Report keyword.

[Martin Liška]

I've tested this mechanical change for all cross compilers.

Ready to be installed?
Thanks,
Martin

Re: [PATCH 2/2] opts: Remove all usages of Report keyword.

[Jeff Law]

On 12/15/20 1:02 AM, Martin Liška wrote:
> I've tested this mechanical change for all cross compilers.
>
> Ready to be installed?
ENOPATCH, but same as 1/1 of this series. OK by me given I can guess
what it looks like, but give Jakub and Richi time to chime in.

jeff

Re: [PATCH 2/2] opts: Remove all usages of Report keyword.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

On 12/15/20 8:43 PM, Jeff Law wrote:
> 
> 
> On 12/15/20 1:02 AM, Martin Liška wrote:
>> I've tested this mechanical change for all cross compilers.
>>
>> Ready to be installed?
> ENOPATCH, but same as 1/1 of this series. OK by me given I can guess
> what it looks like, but give Jakub and Richi time to chime in.

Whoops. Anyway, thanks for the review.

Martin

> 
> jeff
> 


[-- Attachment #2: 0002-opts-Remove-all-usages-of-Report-keyword.patch --]
[-- Type: text/x-patch, Size: 289753 bytes --]

From a05e4ca68a1e1adcb82be0946b76cdede4f2869e Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 11 Dec 2020 17:25:43 +0100
Subject: [PATCH 2/2] opts: Remove all usages of Report keyword.

gcc/brig/ChangeLog:

	* lang.opt: Remove usage of Report.

gcc/c-family/ChangeLog:

	* c.opt: Remove usage of Report.

gcc/ChangeLog:

	* common.opt: Remove usage of Report.
	* config/aarch64/aarch64.opt: Ditto.
	* config/alpha/alpha.opt: Ditto.
	* config/arc/arc.opt: Ditto.
	* config/arm/arm.opt: Ditto.
	* config/avr/avr.opt: Ditto.
	* config/bfin/bfin.opt: Ditto.
	* config/bpf/bpf.opt: Ditto.
	* config/c6x/c6x.opt: Ditto.
	* config/cr16/cr16.opt: Ditto.
	* config/cris/cris.opt: Ditto.
	* config/cris/elf.opt: Ditto.
	* config/csky/csky.opt: Ditto.
	* config/darwin.opt: Ditto.
	* config/fr30/fr30.opt: Ditto.
	* config/frv/frv.opt: Ditto.
	* config/ft32/ft32.opt: Ditto.
	* config/gcn/gcn.opt: Ditto.
	* config/i386/cygming.opt: Ditto.
	* config/i386/i386.opt: Ditto.
	* config/ia64/ia64.opt: Ditto.
	* config/ia64/ilp32.opt: Ditto.
	* config/linux-android.opt: Ditto.
	* config/linux.opt: Ditto.
	* config/lm32/lm32.opt: Ditto.
	* config/m32r/m32r.opt: Ditto.
	* config/m68k/m68k.opt: Ditto.
	* config/mcore/mcore.opt: Ditto.
	* config/microblaze/microblaze.opt: Ditto.
	* config/mips/mips.opt: Ditto.
	* config/mmix/mmix.opt: Ditto.
	* config/mn10300/mn10300.opt: Ditto.
	* config/moxie/moxie.opt: Ditto.
	* config/msp430/msp430.opt: Ditto.
	* config/nds32/nds32.opt: Ditto.
	* config/nios2/elf.opt: Ditto.
	* config/nios2/nios2.opt: Ditto.
	* config/nvptx/nvptx.opt: Ditto.
	* config/pa/pa.opt: Ditto.
	* config/pdp11/pdp11.opt: Ditto.
	* config/pru/pru.opt: Ditto.
	* config/riscv/riscv.opt: Ditto.
	* config/rl78/rl78.opt: Ditto.
	* config/rs6000/aix64.opt: Ditto.
	* config/rs6000/linux64.opt: Ditto.
	* config/rs6000/rs6000.opt: Ditto.
	* config/rs6000/sysv4.opt: Ditto.
	* config/rx/elf.opt: Ditto.
	* config/rx/rx.opt: Ditto.
	* config/s390/s390.opt: Ditto.
	* config/s390/tpf.opt: Ditto.
	* config/sh/sh.opt: Ditto.
	* config/sol2.opt: Ditto.
	* config/sparc/long-double-switch.opt: Ditto.
	* config/sparc/sparc.opt: Ditto.
	* config/tilegx/tilegx.opt: Ditto.
	* config/tilepro/tilepro.opt: Ditto.
	* config/v850/v850.opt: Ditto.
	* config/visium/visium.opt: Ditto.
	* config/vms/vms.opt: Ditto.
	* config/vxworks.opt: Ditto.
	* config/xtensa/xtensa.opt: Ditto.

gcc/lto/ChangeLog:

	* lang.opt: Remove usage of Report.
---
 gcc/brig/lang.opt                       |   2 +-
 gcc/c-family/c.opt                      |   8 +-
 gcc/common.opt                          | 584 ++++++++++++------------
 gcc/config/aarch64/aarch64.opt          |  18 +-
 gcc/config/alpha/alpha.opt              |  38 +-
 gcc/config/arc/arc.opt                  | 110 ++---
 gcc/config/arm/arm.opt                  |  66 +--
 gcc/config/avr/avr.opt                  |  52 +--
 gcc/config/bfin/bfin.opt                |  34 +-
 gcc/config/bpf/bpf.opt                  |   6 +-
 gcc/config/c6x/c6x.opt                  |   6 +-
 gcc/config/cr16/cr16.opt                |   4 +-
 gcc/config/cris/cris.opt                |  64 +--
 gcc/config/cris/elf.opt                 |   2 +-
 gcc/config/csky/csky.opt                |  60 +--
 gcc/config/darwin.opt                   |  24 +-
 gcc/config/fr30/fr30.opt                |   2 +-
 gcc/config/frv/frv.opt                  |  62 +--
 gcc/config/ft32/ft32.opt                |  12 +-
 gcc/config/gcn/gcn.opt                  |  12 +-
 gcc/config/i386/cygming.opt             |   6 +-
 gcc/config/i386/i386.opt                | 304 ++++++------
 gcc/config/ia64/ia64.opt                |  68 +--
 gcc/config/ia64/ilp32.opt               |   4 +-
 gcc/config/linux-android.opt            |   2 +-
 gcc/config/linux.opt                    |   8 +-
 gcc/config/lm32/lm32.opt                |  10 +-
 gcc/config/m32r/m32r.opt                |  14 +-
 gcc/config/m68k/m68k.opt                |  24 +-
 gcc/config/mcore/mcore.opt              |  22 +-
 gcc/config/microblaze/microblaze.opt    |   8 +-
 gcc/config/mips/mips.opt                | 164 +++----
 gcc/config/mmix/mmix.opt                |  34 +-
 gcc/config/mn10300/mn10300.opt          |  10 +-
 gcc/config/moxie/moxie.opt              |   6 +-
 gcc/config/msp430/msp430.opt            |  34 +-
 gcc/config/nds32/nds32.opt              |  40 +-
 gcc/config/nios2/elf.opt                |   4 +-
 gcc/config/nios2/nios2.opt              | 258 +++++------
 gcc/config/nvptx/nvptx.opt              |  16 +-
 gcc/config/pa/pa.opt                    |  26 +-
 gcc/config/pdp11/pdp11.opt              |  24 +-
 gcc/config/pru/pru.opt                  |   6 +-
 gcc/config/riscv/riscv.opt              |  22 +-
 gcc/config/rl78/rl78.opt                |  18 +-
 gcc/config/rs6000/aix64.opt             |   6 +-
 gcc/config/rs6000/linux64.opt           |   2 +-
 gcc/config/rs6000/rs6000.opt            | 126 ++---
 gcc/config/rs6000/sysv4.opt             |  32 +-
 gcc/config/rx/elf.opt                   |   2 +-
 gcc/config/rx/rx.opt                    |  26 +-
 gcc/config/s390/s390.opt                |  64 +--
 gcc/config/s390/tpf.opt                 |  14 +-
 gcc/config/sh/sh.opt                    |  38 +-
 gcc/config/sol2.opt                     |   4 +-
 gcc/config/sparc/long-double-switch.opt |   4 +-
 gcc/config/sparc/sparc.opt              |  60 +--
 gcc/config/tilegx/tilegx.opt            |   8 +-
 gcc/config/tilepro/tilepro.opt          |   2 +-
 gcc/config/v850/v850.opt                |  48 +-
 gcc/config/visium/visium.opt            |   6 +-
 gcc/config/vms/vms.opt                  |   6 +-
 gcc/config/vxworks.opt                  |   2 +-
 gcc/config/xtensa/xtensa.opt            |  12 +-
 gcc/lto/lang.opt                        |   6 +-
 65 files changed, 1383 insertions(+), 1383 deletions(-)

diff --git a/gcc/brig/lang.opt b/gcc/brig/lang.opt
index b2bcc3b28f1..39a4ddff2ad 100644
--- a/gcc/brig/lang.opt
+++ b/gcc/brig/lang.opt
@@ -32,7 +32,7 @@ BRIG Separate Alias(d)
 BRIG Joined Alias(d)
 
 fassume-phsa
-BRIG Report Var(flag_assume_phsa) Init(1) Optimization
+BRIG Var(flag_assume_phsa) Init(1) Optimization
 Assume we are finalizing for phsa and its libhsail-rt.  Enables additional
 phsa-specific optimizations (default).
 
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 79478285070..21d8cd03709 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1647,7 +1647,7 @@ C++ ObjC++ Var(flag_no_gnu_keywords, 0)
 Recognize GNU-defined keywords.
 
 fgnu-runtime
-ObjC ObjC++ LTO Report RejectNegative Var(flag_next_runtime,0) Init(NEXT_OBJC_RUNTIME)
+ObjC ObjC++ LTO RejectNegative Var(flag_next_runtime,0) Init(NEXT_OBJC_RUNTIME)
 Generate code for GNU runtime environment.
 
 fgnu89-inline
@@ -1691,7 +1691,7 @@ ffriend-injection
 C++ ObjC++ WarnRemoved
 
 fkeep-inline-dllexport
-C C++ ObjC ObjC++ Var(flag_keep_inline_dllexport) Init(1) Report Condition(TARGET_DLLIMPORT_DECL_ATTRIBUTES)
+C C++ ObjC ObjC++ Var(flag_keep_inline_dllexport) Init(1) Condition(TARGET_DLLIMPORT_DECL_ATTRIBUTES)
 Don't emit dllexported inline functions unless needed.
 
 flabels-ok
@@ -1780,7 +1780,7 @@ C++ ObjC++ Var(flag_new_ttp)
 Implement resolution of DR 150 for matching of template template arguments.
 
 fnext-runtime
-ObjC ObjC++ LTO Report RejectNegative Var(flag_next_runtime)
+ObjC ObjC++ LTO RejectNegative Var(flag_next_runtime)
 Generate code for NeXT (Apple Mac OS X) runtime environment.
 
 fnil-receivers
@@ -1821,7 +1821,7 @@ C++ ObjC++ Optimization Var(flag_nothrow_opt)
 Treat a throw() exception specification as noexcept to improve code size.
 
 fobjc-abi-version=
-ObjC ObjC++ LTO Joined Report RejectNegative UInteger Var(flag_objc_abi)
+ObjC ObjC++ LTO Joined RejectNegative UInteger Var(flag_objc_abi)
 Specify which ABI to use for Objective-C family code and meta-data generation.
 
 ; Generate special '- .cxx_construct' and '- .cxx_destruct' methods
diff --git a/gcc/common.opt b/gcc/common.opt
index 6645539f5e5..412d941dae6 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -298,7 +298,7 @@ Common Driver Var(help_flag)
 Display this information.
 
 -help=
-Common Driver Report Joined
+Common Driver Joined
 --help=<class>	Display descriptions of a specific class of options.  <class> is one or more of optimizers, target, warnings, undocumented, params.
 
 -language
@@ -974,42 +974,42 @@ Common Joined RejectNegative UInteger Var(flag_abi_version) Init(0)
 The version of the C++ ABI in use.
 
 faggressive-loop-optimizations
-Common Report Var(flag_aggressive_loop_optimizations) Optimization Init(1)
+Common Var(flag_aggressive_loop_optimizations) Optimization Init(1)
 Aggressively optimize loops using language constraints.
 
 falign-functions
-Common Report Var(flag_align_functions) Optimization
+Common Var(flag_align_functions) Optimization
 Align the start of functions.
 
 falign-functions=
 Common RejectNegative Joined Var(str_align_functions) Optimization
 
 flimit-function-alignment
-Common Report Var(flag_limit_function_alignment) Optimization Init(0)
+Common Var(flag_limit_function_alignment) Optimization Init(0)
 
 falign-jumps
-Common Report Var(flag_align_jumps) Optimization
+Common Var(flag_align_jumps) Optimization
 Align labels which are only reached by jumping.
 
 falign-jumps=
 Common RejectNegative Joined Var(str_align_jumps) Optimization
 
 falign-labels
-Common Report Var(flag_align_labels) Optimization
+Common Var(flag_align_labels) Optimization
 Align all labels.
 
 falign-labels=
 Common RejectNegative Joined Var(str_align_labels) Optimization
 
 falign-loops
-Common Report Var(flag_align_loops) Optimization
+Common Var(flag_align_loops) Optimization
 Align the start of loops.
 
 falign-loops=
 Common RejectNegative Joined Var(str_align_loops) Optimization
 
 fallow-store-data-races
-Common Report Var(flag_store_data_races) Optimization
+Common Var(flag_store_data_races) Optimization
 Allow the compiler to introduce new data races on stores.
 
 fanalyzer
@@ -1033,11 +1033,11 @@ Common Ignore
 Does nothing. Preserved for backward compatibility.
 
 fsanitize=
-Common Driver Report Joined
+Common Driver Joined
 Select what to sanitize.
 
 fsanitize-coverage=
-Common Report Joined
+Common Joined
 Select type of coverage sanitization.
 
 fasan-shadow-offset=
@@ -1050,30 +1050,30 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 in user-defined sections.
 
 fsanitize-recover=
-Common Report Joined
+Common Joined
 After diagnosing undefined behavior attempt to continue execution.
 
 fsanitize-recover
-Common Report
+Common
 This switch is deprecated; use -fsanitize-recover= instead.
 
 fsanitize-address-use-after-scope
-Common Driver Report Var(flag_sanitize_address_use_after_scope) Init(0)
+Common Driver Var(flag_sanitize_address_use_after_scope) Init(0)
 
 fsanitize-undefined-trap-on-error
-Common Driver Report Var(flag_sanitize_undefined_trap_on_error) Init(0)
+Common Driver Var(flag_sanitize_undefined_trap_on_error) Init(0)
 Use trap instead of a library function for undefined behavior sanitization.
 
 fasynchronous-unwind-tables
-Common Report Var(flag_asynchronous_unwind_tables) Optimization
+Common Var(flag_asynchronous_unwind_tables) Optimization
 Generate unwind tables that are exact at each instruction boundary.
 
 fauto-inc-dec
-Common Report Var(flag_auto_inc_dec) Init(1) Optimization
+Common Var(flag_auto_inc_dec) Init(1) Optimization
 Generate auto-inc/dec instructions.
 
 fauto-profile
-Common Report Var(flag_auto_profile)
+Common Var(flag_auto_profile)
 Use sample profile information for call graph node weights. The default
 profile file is fbdata.afdo in 'pwd'.
 
@@ -1087,15 +1087,15 @@ file is specified in the argument.
 ; For Java: defaults to on.
 ; For Fortran: defaults to off.
 fbounds-check
-Common Report Var(flag_bounds_check)
+Common Var(flag_bounds_check)
 Generate code to check bounds before indexing arrays.
 
 fbranch-count-reg
-Common Report Var(flag_branch_on_count_reg) Optimization
+Common Var(flag_branch_on_count_reg) Optimization
 Replace add, compare, branch with branch on count register.
 
 fbranch-probabilities
-Common Report Var(flag_branch_probabilities) Optimization
+Common Var(flag_branch_probabilities) Optimization
 Use profiling information for branch probabilities.
 
 fbranch-target-load-optimize
@@ -1111,11 +1111,11 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 fcallgraph-info
-Common Report RejectNegative Var(flag_callgraph_info) Init(NO_CALLGRAPH_INFO);
+Common RejectNegative Var(flag_callgraph_info) Init(NO_CALLGRAPH_INFO);
 Output callgraph information on a per-file basis.
 
 fcallgraph-info=
-Common Report RejectNegative Joined
+Common RejectNegative Joined
 Output callgraph information on a per-file basis with decorations.
 
 fcall-saved-
@@ -1130,7 +1130,7 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; be saved across function calls, if that produces overall better code.
 ; Optional now, so people can test it.
 fcaller-saves
-Common Report Var(flag_caller_saves) Optimization
+Common Var(flag_caller_saves) Optimization
 Save registers around function calls.
 
 fcheck-data-deps
@@ -1150,15 +1150,15 @@ Common Joined RejectNegative UInteger Var(flag_checking)
 Perform internal consistency checkings.
 
 fcode-hoisting
-Common Report Var(flag_code_hoisting) Optimization
+Common Var(flag_code_hoisting) Optimization
 Enable code hoisting.
 
 fcombine-stack-adjustments
-Common Report Var(flag_combine_stack_adjustments) Optimization
+Common Var(flag_combine_stack_adjustments) Optimization
 Looks for opportunities to reduce stack adjustments and stack references.
 
 fcommon
-Common Report Var(flag_no_common,0) Init(1)
+Common Var(flag_no_common,0) Init(1)
 Put uninitialized globals in the common section.
 
 fcompare-debug
@@ -1174,7 +1174,7 @@ Common Driver RejectNegative Var(flag_compare_debug)
 Run only the second compilation of -fcompare-debug.
 
 fcompare-elim
-Common Report Var(flag_compare_elim_after_reload) Optimization
+Common Var(flag_compare_elim_after_reload) Optimization
 Perform comparison elimination after register allocation has finished.
 
 fconserve-stack
@@ -1182,15 +1182,15 @@ Common Var(flag_conserve_stack) Optimization
 Do not perform optimizations increasing noticeably stack usage.
 
 fcprop-registers
-Common Report Var(flag_cprop_registers) Optimization
+Common Var(flag_cprop_registers) Optimization
 Perform a register copy-propagation optimization pass.
 
 fcrossjumping
-Common Report Var(flag_crossjumping) Optimization
+Common Var(flag_crossjumping) Optimization
 Perform cross-jumping optimization.
 
 fcse-follow-jumps
-Common Report Var(flag_cse_follow_jumps) Optimization
+Common Var(flag_cse_follow_jumps) Optimization
 When running CSE, follow jumps to their targets.
 
 fcse-skip-blocks
@@ -1198,19 +1198,19 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 fcx-limited-range
-Common Report Var(flag_cx_limited_range) Optimization SetByCombined
+Common Var(flag_cx_limited_range) Optimization SetByCombined
 Omit range reduction step when performing complex division.
 
 fcx-fortran-rules
-Common Report Var(flag_cx_fortran_rules) Optimization
+Common Var(flag_cx_fortran_rules) Optimization
 Complex multiplication and division follow Fortran rules.
 
 fdata-sections
-Common Report Var(flag_data_sections)
+Common Var(flag_data_sections)
 Place data items into their own section.
 
 fdbg-cnt-list
-Common Report Var(flag_dbg_cnt_list)
+Common Var(flag_dbg_cnt_list)
 List all available debugging counters with their limits and counts.
 
 fdbg-cnt=
@@ -1226,37 +1226,37 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 -ffile-prefix-map=<old>=<new>	Map one directory name to another in compilation result.
 
 fdebug-types-section
-Common Report Var(flag_debug_types_section) Init(0)
+Common Var(flag_debug_types_section) Init(0)
 Output .debug_types section when using DWARF v4 debuginfo.
 
 ; Nonzero for -fdefer-pop: don't pop args after each function call
 ; instead save them up to pop many calls' args with one insns.
 fdefer-pop
-Common Report Var(flag_defer_pop) Optimization
+Common Var(flag_defer_pop) Optimization
 Defer popping functions args from stack until later.
 
 fdelayed-branch
-Common Report Var(flag_delayed_branch) Optimization
+Common Var(flag_delayed_branch) Optimization
 Attempt to fill delay slots of branch instructions.
 
 fdelete-dead-exceptions
-Common Report Var(flag_delete_dead_exceptions) Init(0) Optimization
+Common Var(flag_delete_dead_exceptions) Init(0) Optimization
 Delete dead instructions that may throw exceptions.
 
 fdelete-null-pointer-checks
-Common Report Var(flag_delete_null_pointer_checks) Init(-1) Optimization
+Common Var(flag_delete_null_pointer_checks) Init(-1) Optimization
 Delete useless null pointer checks.
 
 fdevirtualize-at-ltrans
-Common Report Var(flag_ltrans_devirtualize)
+Common Var(flag_ltrans_devirtualize)
 Stream extra data to support more aggressive devirtualization in LTO local transformation mode.
 
 fdevirtualize-speculatively
-Common Report Var(flag_devirtualize_speculatively) Optimization
+Common Var(flag_devirtualize_speculatively) Optimization
 Perform speculative devirtualization.
 
 fdevirtualize
-Common Report Var(flag_devirtualize) Optimization
+Common Var(flag_devirtualize) Optimization
 Try to convert virtual calls to direct ones.
 
 fdiagnostics-show-location=
@@ -1438,7 +1438,7 @@ Common RejectNegative Joined Var(flag_dump_go_spec)
 -fdump-go-spec=filename	Write all declarations to file as Go code.
 
 fdump-noaddr
-Common Report Var(flag_dump_noaddr)
+Common Var(flag_dump_noaddr)
 Suppress output of addresses in debugging dumps.
 
 freport-bug
@@ -1455,19 +1455,19 @@ Common Var(flag_dump_passes) Init(0)
 Dump optimization passes.
 
 fdump-unnumbered
-Common Report Var(flag_dump_unnumbered)
+Common Var(flag_dump_unnumbered)
 Suppress output of instruction numbers, line number notes and addresses in debugging dumps.
 
 fdump-unnumbered-links
-Common Report Var(flag_dump_unnumbered_links)
+Common Var(flag_dump_unnumbered_links)
 Suppress output of previous and next insn numbers in debugging dumps.
 
 fdwarf2-cfi-asm
-Common Report Var(flag_dwarf2_cfi_asm) Init(HAVE_GAS_CFI_DIRECTIVE)
+Common Var(flag_dwarf2_cfi_asm) Init(HAVE_GAS_CFI_DIRECTIVE)
 Enable CFI tables via GAS assembler directives.
 
 fearly-inlining
-Common Report Var(flag_early_inlining) Init(1) Optimization
+Common Var(flag_early_inlining) Init(1) Optimization
 Perform early inlining.
 
 feliminate-dwarf2-dups
@@ -1475,27 +1475,27 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 fipa-sra
-Common Report Var(flag_ipa_sra) Init(0) Optimization
+Common Var(flag_ipa_sra) Init(0) Optimization
 Perform interprocedural reduction of aggregates.
 
 feliminate-unused-debug-symbols
-Common Report Var(flag_debug_only_used_symbols) Init(1)
+Common Var(flag_debug_only_used_symbols) Init(1)
 Perform unused symbol elimination in debug info.
 
 feliminate-unused-debug-types
-Common Report Var(flag_eliminate_unused_debug_types) Init(1)
+Common Var(flag_eliminate_unused_debug_types) Init(1)
 Perform unused type elimination in debug info.
 
 femit-class-debug-always
-Common Report Var(flag_emit_class_debug_always) Init(0)
+Common Var(flag_emit_class_debug_always) Init(0)
 Do not suppress C++ class debug information.
 
 fexceptions
-Common Report Var(flag_exceptions) Optimization
+Common Var(flag_exceptions) Optimization
 Enable exception handling.
 
 fexpensive-optimizations
-Common Report Var(flag_expensive_optimizations) Optimization
+Common Var(flag_expensive_optimizations) Optimization
 Perform a number of minor, expensive optimizations.
 
 fexcess-precision=
@@ -1534,11 +1534,11 @@ Common Var(flag_fat_lto_objects)
 Output lto objects containing both the intermediate language and binary output.
 
 ffinite-math-only
-Common Report Var(flag_finite_math_only) Optimization SetByCombined
+Common Var(flag_finite_math_only) Optimization SetByCombined
 Assume no NaNs or infinities are generated.
 
 ffinite-loops
-Common Report Var(flag_finite_loops) Optimization Init(0)
+Common Var(flag_finite_loops) Optimization Init(0)
 Assume that loops with an exit will terminate and not loop indefinitely.
 
 ffixed-
@@ -1546,7 +1546,7 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 -ffixed-<register>	Mark <register> as being unavailable to the compiler.
 
 ffloat-store
-Common Report Var(flag_float_store) Optimization
+Common Var(flag_float_store) Optimization
 Don't allocate floats and doubles in extended-precision registers.
 
 fforce-addr
@@ -1554,7 +1554,7 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 fforward-propagate
-Common Report Var(flag_forward_propagate) Optimization
+Common Var(flag_forward_propagate) Optimization
 Perform a forward propagation pass on RTL.
 
 ffp-contract=
@@ -1575,39 +1575,39 @@ EnumValue
 Enum(fp_contract_mode) String(fast) Value(FP_CONTRACT_FAST)
 
 ffp-int-builtin-inexact
-Common Report Var(flag_fp_int_builtin_inexact) Init(1) Optimization
+Common Var(flag_fp_int_builtin_inexact) Init(1) Optimization
 Allow built-in functions ceil, floor, round, trunc to raise \"inexact\" exceptions.
 
 ; Nonzero means don't put addresses of constant functions in registers.
 ; Used for compiling the Unix kernel, where strange substitutions are
 ; done on the assembly output.
 ffunction-cse
-Common Report Var(flag_no_function_cse,0) Optimization
+Common Var(flag_no_function_cse,0) Optimization
 Allow function addresses to be held in registers.
 
 ffunction-sections
-Common Report Var(flag_function_sections)
+Common Var(flag_function_sections)
 Place each function into its own section.
 
 fgcse
-Common Report Var(flag_gcse) Optimization
+Common Var(flag_gcse) Optimization
 Perform global common subexpression elimination.
 
 fgcse-lm
-Common Report Var(flag_gcse_lm) Init(1) Optimization
+Common Var(flag_gcse_lm) Init(1) Optimization
 Perform enhanced load motion during global common subexpression elimination.
 
 fgcse-sm
-Common Report Var(flag_gcse_sm) Init(0) Optimization
+Common Var(flag_gcse_sm) Init(0) Optimization
 Perform store motion after global common subexpression elimination.
 
 fgcse-las
-Common Report Var(flag_gcse_las) Init(0) Optimization
+Common Var(flag_gcse_las) Init(0) Optimization
 Perform redundant load after store elimination in global common subexpression
 elimination.
 
 fgcse-after-reload
-Common Report Var(flag_gcse_after_reload) Optimization
+Common Var(flag_gcse_after_reload) Optimization
 Perform global common subexpression elimination after register allocation has
 finished.
 
@@ -1624,34 +1624,34 @@ EnumValue
 Enum(dwarf_gnat_encodings) String(minimal) Value(DWARF_GNAT_ENCODINGS_MINIMAL)
 
 fgnat-encodings=
-Common Enum(dwarf_gnat_encodings) Joined RejectNegative Report Undocumented Var(gnat_encodings)
+Common Enum(dwarf_gnat_encodings) Joined RejectNegative Undocumented Var(gnat_encodings)
 -fgnat-encodings=[all|gdb|minimal]	Select the balance between GNAT encodings and standard DWARF emitted in the debug information.
 
 ; This option is not documented yet as its semantics will change.
 fgraphite
-Common Report Var(flag_graphite) Optimization
+Common Var(flag_graphite) Optimization
 Enable in and out of Graphite representation.
 
 fgraphite-identity
-Common Report Var(flag_graphite_identity) Optimization
+Common Var(flag_graphite_identity) Optimization
 Enable Graphite Identity transformation.
 
 fhoist-adjacent-loads
-Common Report Var(flag_hoist_adjacent_loads) Optimization
+Common Var(flag_hoist_adjacent_loads) Optimization
 Enable hoisting adjacent loads to encourage generating conditional move
 instructions.
 
 fkeep-gc-roots-live
-Common Undocumented Report Var(flag_keep_gc_roots_live) Optimization
+Common Undocumented Var(flag_keep_gc_roots_live) Optimization
 ; Always keep a pointer to a live memory block
 
 flarge-source-files
-Common Report Var(flag_large_source_files) Init(0)
+Common Var(flag_large_source_files) Init(0)
 Improve GCC's ability to track column numbers in large source files,
 at the expense of slower compilation.
 
 floop-parallelize-all
-Common Report Var(flag_loop_parallelize_all) Optimization
+Common Var(flag_loop_parallelize_all) Optimization
 Mark all loops as parallel.
 
 floop-strip-mine
@@ -1659,7 +1659,7 @@ Common Alias(floop-nest-optimize)
 Enable loop nest transforms.  Same as -floop-nest-optimize.
 
 floop-interchange
-Common Report Var(flag_loop_interchange) Optimization
+Common Var(flag_loop_interchange) Optimization
 Enable loop interchange on trees.
 
 floop-block
@@ -1667,15 +1667,15 @@ Common Alias(floop-nest-optimize)
 Enable loop nest transforms.  Same as -floop-nest-optimize.
 
 floop-unroll-and-jam
-Common Report Var(flag_unroll_jam) Optimization
+Common Var(flag_unroll_jam) Optimization
 Perform unroll-and-jam on loops.
 
 fgnu-tm
-Common Report Var(flag_tm)
+Common Var(flag_tm)
 Enable support for GNU transactional memory.
 
 fgnu-unique
-Common Report Var(flag_gnu_unique) Init(1)
+Common Var(flag_gnu_unique) Init(1)
 Use STB_GNU_UNIQUE if supported by the assembler.
 
 floop-flatten
@@ -1683,19 +1683,19 @@ Common Ignore
 Does nothing. Preserved for backward compatibility.
 
 floop-nest-optimize
-Common Report Var(flag_loop_nest_optimize) Optimization
+Common Var(flag_loop_nest_optimize) Optimization
 Enable the loop nest optimizer.
 
 fstrict-volatile-bitfields
-Common Report Var(flag_strict_volatile_bitfields) Init(-1) Optimization
+Common Var(flag_strict_volatile_bitfields) Init(-1) Optimization
 Force bitfield accesses to match their type width.
 
 fstore-merging
-Common Report Var(flag_store_merging) Optimization
+Common Var(flag_store_merging) Optimization
 Merge adjacent stores.
 
 fguess-branch-probability
-Common Report Var(flag_guess_branch_prob) Optimization
+Common Var(flag_guess_branch_prob) Optimization
 Enable guessing of branch probabilities.
 
 ; Nonzero means ignore `#ident' directives.  0 means handle them.
@@ -1703,15 +1703,15 @@ Enable guessing of branch probabilities.
 ; On SVR4 targets, it also controls whether or not to emit a
 ; string identifying the compiler.
 fident
-Common Report Var(flag_no_ident,0)
+Common Var(flag_no_ident,0)
 Process #ident directives.
 
 fif-conversion
-Common Report Var(flag_if_conversion) Optimization
+Common Var(flag_if_conversion) Optimization
 Perform conversion of conditional jumps to branchless equivalents.
 
 fif-conversion2
-Common Report Var(flag_if_conversion2) Optimization
+Common Var(flag_if_conversion2) Optimization
 Perform conversion of conditional jumps to conditional execution.
 
 fstack-reuse=
@@ -1731,7 +1731,7 @@ EnumValue
 Enum(stack_reuse_level) String(none) Value(SR_NONE)
 
 ftree-loop-if-convert
-Common Report Var(flag_tree_loop_if_convert) Init(-1) Optimization
+Common Var(flag_tree_loop_if_convert) Init(-1) Optimization
 Convert conditional jumps in innermost loops to branchless equivalents.
 
 ftree-loop-if-convert-stores
@@ -1743,29 +1743,29 @@ Does nothing. Preserved for backward compatibility.
 ; and it may be extended to other effects
 ; needed for crtstuff.c on other systems.
 finhibit-size-directive
-Common Report Var(flag_inhibit_size_directive)
+Common Var(flag_inhibit_size_directive)
 Do not generate .size directives.
 
 findirect-inlining
-Common Report Var(flag_indirect_inlining) Optimization
+Common Var(flag_indirect_inlining) Optimization
 Perform indirect inlining.
 
 ; General flag to enable inlining.  Specifying -fno-inline will disable
 ; all inlining apart from always-inline functions.
 finline
-Common Report Var(flag_no_inline,0) Init(0) Optimization
+Common Var(flag_no_inline,0) Init(0) Optimization
 Enable inlining of function declared \"inline\", disabling disables all inlining.
 
 finline-small-functions
-Common Report Var(flag_inline_small_functions) Optimization
+Common Var(flag_inline_small_functions) Optimization
 Integrate functions into their callers when code size is known not to grow.
 
 finline-functions
-Common Report Var(flag_inline_functions) Optimization
+Common Var(flag_inline_functions) Optimization
 Integrate functions not declared \"inline\" into their callers when profitable.
 
 finline-functions-called-once
-Common Report Var(flag_inline_functions_called_once) Optimization
+Common Var(flag_inline_functions_called_once) Optimization
 Integrate functions only required by their single caller.
 
 finline-limit-
@@ -1776,14 +1776,14 @@ Common RejectNegative Joined UInteger
 -finline-limit=<number>	Limit the size of inlined functions to <number>.
 
 finline-atomics
-Common Report Var(flag_inline_atomics) Init(1) Optimization
+Common Var(flag_inline_atomics) Init(1) Optimization
 Inline __atomic operations when a lock free instruction sequence is available.
 
 fcf-protection
 Common RejectNegative Alias(fcf-protection=,full)
 
 fcf-protection=
-Common Report Joined RejectNegative Enum(cf_protection_level) Var(flag_cf_protection) Init(CF_NONE)
+Common Joined RejectNegative Enum(cf_protection_level) Var(flag_cf_protection) Init(CF_NONE)
 -fcf-protection=[full|branch|return|none|check]	Instrument functions with checks to verify jump/call/return control-flow transfer
 instructions have valid targets.
 
@@ -1806,7 +1806,7 @@ EnumValue
 Enum(cf_protection_level) String(none) Value(CF_NONE)
 
 finstrument-functions
-Common Report Var(flag_instrument_function_entry_exit)
+Common Var(flag_instrument_function_entry_exit)
 Instrument function entry and exit with profiling calls.
 
 finstrument-functions-exclude-function-list=
@@ -1818,11 +1818,11 @@ Common RejectNegative Joined
 -finstrument-functions-exclude-file-list=filename,...	Do not instrument functions listed in files.
 
 fipa-cp
-Common Report Var(flag_ipa_cp) Optimization
+Common Var(flag_ipa_cp) Optimization
 Perform interprocedural constant propagation.
 
 fipa-cp-clone
-Common Report Var(flag_ipa_cp_clone) Optimization
+Common Var(flag_ipa_cp_clone) Optimization
 Perform cloning to make Interprocedural constant propagation stronger.
 
 fipa-cp-alignment
@@ -1830,47 +1830,47 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 fipa-bit-cp
-Common Report Var(flag_ipa_bit_cp) Optimization
+Common Var(flag_ipa_bit_cp) Optimization
 Perform interprocedural bitwise constant propagation.
 
 fipa-modref
-Common Report Var(flag_ipa_modref) Optimization
+Common Var(flag_ipa_modref) Optimization
 Perform interprocedural modref analysis.
 
 fipa-profile
-Common Report Var(flag_ipa_profile) Init(0) Optimization
+Common Var(flag_ipa_profile) Init(0) Optimization
 Perform interprocedural profile propagation.
 
 fipa-pta
-Common Report Var(flag_ipa_pta) Init(0) Optimization
+Common Var(flag_ipa_pta) Init(0) Optimization
 Perform interprocedural points-to analysis.
 
 fipa-pure-const
-Common Report Var(flag_ipa_pure_const) Init(0) Optimization
+Common Var(flag_ipa_pure_const) Init(0) Optimization
 Discover pure and const functions.
 
 fipa-icf
-Common Report Var(flag_ipa_icf) Optimization
+Common Var(flag_ipa_icf) Optimization
 Perform Identical Code Folding for functions and read-only variables.
 
 fipa-icf-functions
-Common Report Var(flag_ipa_icf_functions) Optimization
+Common Var(flag_ipa_icf_functions) Optimization
 Perform Identical Code Folding for functions.
 
 fipa-icf-variables
-Common Report Var(flag_ipa_icf_variables) Optimization
+Common Var(flag_ipa_icf_variables) Optimization
 Perform Identical Code Folding for variables.
 
 fipa-reference
-Common Report Var(flag_ipa_reference) Init(0) Optimization
+Common Var(flag_ipa_reference) Init(0) Optimization
 Discover read-only and non addressable static variables.
 
 fipa-reference-addressable
-Common Report Var(flag_ipa_reference_addressable) Init(0) Optimization
+Common Var(flag_ipa_reference_addressable) Init(0) Optimization
 Discover read-only, write-only and non-addressable static variables.
 
 fipa-stack-alignment
-Common Report Var(flag_ipa_stack_alignment) Init(1) Optimization
+Common Var(flag_ipa_stack_alignment) Init(1) Optimization
 Reduce stack alignment on call sites if possible.
 
 fipa-matrix-reorg
@@ -1882,7 +1882,7 @@ Common Ignore
 Does nothing. Preserved for backward compatibility.
 
 fipa-vrp
-Common Report Var(flag_ipa_vrp) Optimization
+Common Var(flag_ipa_vrp) Optimization
 Perform IPA Value Range Propagation.
 
 fira-algorithm=
@@ -1915,21 +1915,21 @@ EnumValue
 Enum(ira_region) String(mixed) Value(IRA_REGION_MIXED)
 
 fira-hoist-pressure
-Common Report Var(flag_ira_hoist_pressure) Init(1) Optimization
+Common Var(flag_ira_hoist_pressure) Init(1) Optimization
 Use IRA based register pressure calculation
 in RTL hoist optimizations.
 
 fira-loop-pressure
-Common Report Var(flag_ira_loop_pressure) Optimization
+Common Var(flag_ira_loop_pressure) Optimization
 Use IRA based register pressure calculation
 in RTL loop optimizations.
 
 fira-share-save-slots
-Common Report Var(flag_ira_share_save_slots) Init(1) Optimization
+Common Var(flag_ira_share_save_slots) Init(1) Optimization
 Share slots for saving different hard registers.
 
 fira-share-spill-slots
-Common Report Var(flag_ira_share_spill_slots) Init(1) Optimization
+Common Var(flag_ira_share_spill_slots) Init(1) Optimization
 Share stack slots for spilled pseudo-registers.
 
 fira-verbose=
@@ -1937,7 +1937,7 @@ Common RejectNegative Joined UInteger Var(flag_ira_verbose) Init(5)
 -fira-verbose=<number>	Control IRA's level of diagnostic messages.
 
 fivopts
-Common Report Var(flag_ivopts) Init(1) Optimization
+Common Var(flag_ivopts) Init(1) Optimization
 Optimize induction variables on trees.
 
 fjump-tables
@@ -1949,19 +1949,19 @@ Common Var(flag_bit_tests) Init(1) Optimization
 Use bit tests for sufficiently large switch statements.
 
 fkeep-inline-functions
-Common Report Var(flag_keep_inline_functions)
+Common Var(flag_keep_inline_functions)
 Generate code for functions even if they are fully inlined.
 
 fkeep-static-functions
-Common Report Var(flag_keep_static_functions)
+Common Var(flag_keep_static_functions)
 Generate code for static functions even if they are never called.
 
 fkeep-static-consts
-Common Report Var(flag_keep_static_consts) Init(1)
+Common Var(flag_keep_static_consts) Init(1)
 Emit static const variables even if they are not used.
 
 fleading-underscore
-Common Report Var(flag_leading_underscore) Init(-1)
+Common Var(flag_leading_underscore) Init(-1)
 Give external symbols a leading underscore.
 
 floop-optimize
@@ -1969,7 +1969,7 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 flra-remat
-Common Report Var(flag_lra_remat) Optimization
+Common Var(flag_lra_remat) Optimization
 Do CFG-sensitive rematerialization in LRA.
 
 flto
@@ -2012,15 +2012,15 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 flto-report
-Common Report Var(flag_lto_report) Init(0)
+Common Var(flag_lto_report) Init(0)
 Report various link-time optimization statistics.
 
 flto-report-wpa
-Common Report Var(flag_lto_report_wpa) Init(0)
+Common Var(flag_lto_report_wpa) Init(0)
 Report various link-time optimization statistics for WPA only.
 
 fmath-errno
-Common Report Var(flag_errno_math) Init(1) Optimization SetByCombined
+Common Var(flag_errno_math) Init(1) Optimization SetByCombined
 Set errno after built-in math functions.
 
 fmax-errors=
@@ -2028,26 +2028,26 @@ Common Joined RejectNegative UInteger Var(flag_max_errors)
 -fmax-errors=<number>	Maximum number of errors to report.
 
 fmem-report
-Common Report Var(mem_report)
+Common Var(mem_report)
 Report on permanent memory allocation.
 
 fmem-report-wpa
-Common Report Var(mem_report_wpa)
+Common Var(mem_report_wpa)
 Report on permanent memory allocation in WPA only.
 
 ; This will attempt to merge constant section constants, if 1 only
 ; string constants and constants from constant pool, if 2 also constant
 ; variables.
 fmerge-all-constants
-Common Report Var(flag_merge_constants,2) Init(1)
+Common Var(flag_merge_constants,2) Init(1)
 Attempt to merge identical constants and constant variables.
 
 fmerge-constants
-Common Report Var(flag_merge_constants,1)
+Common Var(flag_merge_constants,1)
 Attempt to merge identical constants across compilation units.
 
 fmerge-debug-strings
-Common Report Var(flag_merge_debug_strings) Init(1)
+Common Var(flag_merge_debug_strings) Init(1)
 Attempt to merge identical debug strings across compilation units.
 
 fmessage-length=
@@ -2055,15 +2055,15 @@ Common RejectNegative Joined UInteger
 -fmessage-length=<number>	Limit diagnostics to <number> characters per line.  0 suppresses line-wrapping.
 
 fmodulo-sched
-Common Report Var(flag_modulo_sched) Optimization
+Common Var(flag_modulo_sched) Optimization
 Perform SMS based modulo scheduling before the first scheduling pass.
 
 fmodulo-sched-allow-regmoves
-Common Report Var(flag_modulo_sched_allow_regmoves) Optimization
+Common Var(flag_modulo_sched_allow_regmoves) Optimization
 Perform SMS based modulo scheduling with register moves allowed.
 
 fmove-loop-invariants
-Common Report Var(flag_move_loop_invariants) Optimization
+Common Var(flag_move_loop_invariants) Optimization
 Move loop invariant computations out of loops.
 
 fdce
@@ -2075,11 +2075,11 @@ Common Var(flag_dse) Init(0) Optimization
 Use the RTL dead store elimination pass.
 
 freschedule-modulo-scheduled-loops
-Common Report Var(flag_resched_modulo_sched) Optimization
+Common Var(flag_resched_modulo_sched) Optimization
 Enable/Disable the traditional scheduling in loops that already passed modulo scheduling.
 
 fnon-call-exceptions
-Common Report Var(flag_non_call_exceptions) Optimization
+Common Var(flag_non_call_exceptions) Optimization
 Support synchronous non-call exceptions.
 
 foffload=
@@ -2100,11 +2100,11 @@ EnumValue
 Enum(offload_abi) String(lp64) Value(OFFLOAD_ABI_LP64)
 
 fomit-frame-pointer
-Common Report Var(flag_omit_frame_pointer) Optimization
+Common Var(flag_omit_frame_pointer) Optimization
 When possible do not generate stack frames.
 
 fopt-info
-Common Report Var(flag_opt_info) Optimization
+Common Var(flag_opt_info) Optimization
 Enable all optimization info dumps on stderr.
 
 fopt-info-
@@ -2112,7 +2112,7 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 -fopt-info[-<type>=filename]	Dump compiler optimization details.
 
 fsave-optimization-record
-Common Report Var(flag_save_optimization_record) Optimization
+Common Var(flag_save_optimization_record) Optimization
 Write a SRCFILE.opt-record.json file detailing what optimizations were performed.
 
 foptimize-register-move
@@ -2120,23 +2120,23 @@ Common Ignore
 Does nothing. Preserved for backward compatibility.
 
 foptimize-sibling-calls
-Common Report Var(flag_optimize_sibling_calls) Optimization
+Common Var(flag_optimize_sibling_calls) Optimization
 Optimize sibling and tail recursive calls.
 
 fpartial-inlining
-Common Report Var(flag_partial_inlining) Optimization
+Common Var(flag_partial_inlining) Optimization
 Perform partial inlining.
 
 fpre-ipa-mem-report
-Common Report Var(pre_ipa_mem_report)
+Common Var(pre_ipa_mem_report)
 Report on memory allocation before interprocedural optimization.
 
 fpost-ipa-mem-report
-Common Report Var(post_ipa_mem_report)
+Common Var(post_ipa_mem_report)
 Report on memory allocation before interprocedural optimization.
 
 fpack-struct
-Common Report Var(flag_pack_struct) Optimization
+Common Var(flag_pack_struct) Optimization
 Pack structure members together without holes.
 
 fpack-struct=
@@ -2144,39 +2144,39 @@ Common RejectNegative Joined UInteger Optimization
 -fpack-struct=<number>	Set initial maximum structure member alignment.
 
 fpcc-struct-return
-Common Report Var(flag_pcc_struct_return,1) Init(DEFAULT_PCC_STRUCT_RETURN)
+Common Var(flag_pcc_struct_return,1) Init(DEFAULT_PCC_STRUCT_RETURN)
 Return small aggregates in memory, not registers.
 
 fpeel-loops
-Common Report Var(flag_peel_loops) Optimization
+Common Var(flag_peel_loops) Optimization
 Perform loop peeling.
 
 fpeephole
-Common Report Var(flag_no_peephole,0) Optimization
+Common Var(flag_no_peephole,0) Optimization
 Enable machine specific peephole optimizations.
 
 fpeephole2
-Common Report Var(flag_peephole2) Optimization
+Common Var(flag_peephole2) Optimization
 Enable an RTL peephole pass before sched2.
 
 fPIC
-Common Report Var(flag_pic,2) Negative(fPIE) Init(-1)
+Common Var(flag_pic,2) Negative(fPIE) Init(-1)
 Generate position-independent code if possible (large mode).
 
 fPIE
-Common Report Var(flag_pie,2) Negative(fpic) Init(-1)
+Common Var(flag_pie,2) Negative(fpic) Init(-1)
 Generate position-independent code for executables if possible (large mode).
 
 fpic
-Common Report Var(flag_pic,1) Negative(fpie) Init(-1)
+Common Var(flag_pic,1) Negative(fpie) Init(-1)
 Generate position-independent code if possible (small mode).
 
 fpie
-Common Report Var(flag_pie,1) Negative(fPIC) Init(-1)
+Common Var(flag_pie,1) Negative(fPIC) Init(-1)
 Generate position-independent code for executables if possible (small mode).
 
 fplt
-Common Report Var(flag_plt) Init(1) Optimization
+Common Var(flag_plt) Init(1) Optimization
 Use PLT for PIC calls (-fno-plt: load the address from GOT at call site).
 
 fplugin=
@@ -2188,23 +2188,23 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 -fplugin-arg-<name>-<key>[=<value>]	Specify argument <key>=<value> for plugin <name>.
 
 fpredictive-commoning
-Common Report Var(flag_predictive_commoning) Optimization
+Common Var(flag_predictive_commoning) Optimization
 Run predictive commoning optimization.
 
 fprefetch-loop-arrays
-Common Report Var(flag_prefetch_loop_arrays) Init(-1) Optimization
+Common Var(flag_prefetch_loop_arrays) Init(-1) Optimization
 Generate prefetch instructions, if available, for arrays in loops.
 
 fprofile
-Common Report Var(profile_flag)
+Common Var(profile_flag)
 Enable basic program profiling code.
 
 fprofile-abs-path
-Common Report Var(profile_abs_path_flag)
+Common Var(profile_abs_path_flag)
 Generate absolute source path names for gcov.
 
 fprofile-arcs
-Common Report Var(profile_arc_flag)
+Common Var(profile_arc_flag)
 Insert arc-based program profiling code.
 
 fprofile-dir=
@@ -2217,7 +2217,7 @@ Common Joined RejectNegative Var(profile_note_location)
 Select the name for storing the profile note file.
 
 fprofile-correction
-Common Report Var(flag_profile_correction)
+Common Var(flag_profile_correction)
 Enable correction of flow inconsistent profile data input.
 
 fprofile-update=
@@ -2281,7 +2281,7 @@ Common Joined RejectNegative Var(profile_info_section)
 Register the profile information in the specified section instead of using a constructor/destructor.
 
 fprofile-partial-training
-Common Report Var(flag_profile_partial_training) Optimization
+Common Var(flag_profile_partial_training) Optimization
 Do not assume that functions never executed during the train run are cold.
 
 fprofile-use
@@ -2293,15 +2293,15 @@ Common Joined RejectNegative
 Enable common options for performing profile feedback directed optimizations, and set -fprofile-dir=.
 
 fprofile-values
-Common Report Var(flag_profile_values)
+Common Var(flag_profile_values)
 Insert code to profile values of expressions.
 
 fprofile-report
-Common Report Var(profile_report)
+Common Var(profile_report)
 Report on consistency of profile.
 
 fprofile-reorder-functions
-Common Report Var(flag_profile_reorder_functions) Optimization
+Common Var(flag_profile_reorder_functions) Optimization
 Enable function reordering that improves code placement.
 
 fpatchable-function-entry=
@@ -2322,11 +2322,11 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Report Var(flag_record_gcc_switches)
+Common Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
 freg-struct-return
-Common Report Var(flag_pcc_struct_return,0) Optimization
+Common Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
 
 fregmove
@@ -2334,7 +2334,7 @@ Common Ignore
 Does nothing. Preserved for backward compatibility.
 
 flifetime-dse
-Common Report Var(flag_lifetime_dse,2) Init(2) Optimization
+Common Var(flag_lifetime_dse,2) Init(2) Optimization
 Tell DSE that the storage for a C++ object is dead when the constructor
 starts and when the destructor finishes.
 
@@ -2345,7 +2345,7 @@ flive-patching
 Common RejectNegative Alias(flive-patching=,inline-clone) Optimization
 
 flive-patching=
-Common Report Joined RejectNegative Enum(live_patching_level) Var(flag_live_patching) Init(LIVE_PATCHING_NONE) Optimization
+Common Joined RejectNegative Enum(live_patching_level) Var(flag_live_patching) Init(LIVE_PATCHING_NONE) Optimization
 -flive-patching=[inline-only-static|inline-clone]	Control IPA
 optimizations to provide a safe compilation for live-patching.  At the same
 time, provides multiple-level control on the enabled IPA optimizations.
@@ -2360,23 +2360,23 @@ EnumValue
 Enum(live_patching_level) String(inline-clone) Value(LIVE_PATCHING_INLINE_CLONE)
 
 fallocation-dce
-Common Report Var(flag_allocation_dce) Init(1) Optimization
+Common Var(flag_allocation_dce) Init(1) Optimization
 Tell DCE to remove unused C++ allocations.
 
 flive-range-shrinkage
-Common Report Var(flag_live_range_shrinkage) Init(0) Optimization
+Common Var(flag_live_range_shrinkage) Init(0) Optimization
 Relief of register pressure through live range shrinkage.
 
 frename-registers
-Common Report Var(flag_rename_registers) Init(2) Optimization
+Common Var(flag_rename_registers) Init(2) Optimization
 Perform a register renaming optimization pass.
 
 fschedule-fusion
-Common Report Var(flag_schedule_fusion) Init(2) Optimization
+Common Var(flag_schedule_fusion) Init(2) Optimization
 Perform a target dependent instruction fusion optimization pass.
 
 freorder-blocks
-Common Report Var(flag_reorder_blocks) Optimization
+Common Var(flag_reorder_blocks) Optimization
 Reorder basic blocks to improve code placement.
 
 freorder-blocks-algorithm=
@@ -2393,15 +2393,15 @@ EnumValue
 Enum(reorder_blocks_algorithm) String(stc) Value(REORDER_BLOCKS_ALGORITHM_STC)
 
 freorder-blocks-and-partition
-Common Report Var(flag_reorder_blocks_and_partition) Optimization
+Common Var(flag_reorder_blocks_and_partition) Optimization
 Reorder basic blocks and partition into hot and cold sections.
 
 freorder-functions
-Common Report Var(flag_reorder_functions) Optimization
+Common Var(flag_reorder_functions) Optimization
 Reorder functions to improve code placement.
 
 frerun-cse-after-loop
-Common Report Var(flag_rerun_cse_after_loop) Optimization
+Common Var(flag_rerun_cse_after_loop) Optimization
 Add a common subexpression elimination pass after loop optimizations.
 
 frerun-loop-opt
@@ -2409,27 +2409,27 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 frounding-math
-Common Report Var(flag_rounding_math) Optimization SetByCombined
+Common Var(flag_rounding_math) Optimization SetByCombined
 Disable optimizations that assume default FP rounding behavior.
 
 fsched-interblock
-Common Report Var(flag_schedule_interblock) Init(1) Optimization
+Common Var(flag_schedule_interblock) Init(1) Optimization
 Enable scheduling across basic blocks.
 
 fsched-pressure
-Common Report Var(flag_sched_pressure) Init(0) Optimization
+Common Var(flag_sched_pressure) Init(0) Optimization
 Enable register pressure sensitive insn scheduling.
 
 fsched-spec
-Common Report Var(flag_schedule_speculative) Init(1) Optimization
+Common Var(flag_schedule_speculative) Init(1) Optimization
 Allow speculative motion of non-loads.
 
 fsched-spec-load
-Common Report Var(flag_schedule_speculative_load) Optimization
+Common Var(flag_schedule_speculative_load) Optimization
 Allow speculative motion of some loads.
 
 fsched-spec-load-dangerous
-Common Report Var(flag_schedule_speculative_load_dangerous) Optimization
+Common Var(flag_schedule_speculative_load_dangerous) Optimization
 Allow speculative motion of more loads.
 
 fsched-verbose=
@@ -2437,7 +2437,7 @@ Common RejectNegative Joined UInteger Var(sched_verbose_param) Init(1)
 -fsched-verbose=<number>	Set the verbosity level of the scheduler.
 
 fsched2-use-superblocks
-Common Report Var(flag_sched2_use_superblocks) Optimization
+Common Var(flag_sched2_use_superblocks) Optimization
 If scheduling post reload, do superblock scheduling.
 
 fsched2-use-traces
@@ -2445,22 +2445,22 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 fschedule-insns
-Common Report Var(flag_schedule_insns) Optimization
+Common Var(flag_schedule_insns) Optimization
 Reschedule instructions before register allocation.
 
 fschedule-insns2
-Common Report Var(flag_schedule_insns_after_reload) Optimization
+Common Var(flag_schedule_insns_after_reload) Optimization
 Reschedule instructions after register allocation.
 
 ; This flag should be on when a target implements non-trivial
 ; scheduling hooks, maybe saving some information for its own sake.
 ; On IA64, for example, this is used for correct bundling.
 fselective-scheduling
-Common Report Var(flag_selective_scheduling) Optimization
+Common Var(flag_selective_scheduling) Optimization
 Schedule instructions using selective scheduling algorithm.
 
 fselective-scheduling2
-Common Report Var(flag_selective_scheduling2) Optimization
+Common Var(flag_selective_scheduling2) Optimization
 Run selective scheduling after reload.
 
 fself-test=
@@ -2468,25 +2468,25 @@ Common Undocumented Joined Var(flag_self_test)
 Run self-tests, using the given path to locate test files.
 
 fsel-sched-pipelining
-Common Report Var(flag_sel_sched_pipelining) Init(0) Optimization
+Common Var(flag_sel_sched_pipelining) Init(0) Optimization
 Perform software pipelining of inner loops during selective scheduling.
 
 fsel-sched-pipelining-outer-loops
-Common Report Var(flag_sel_sched_pipelining_outer_loops) Init(0) Optimization
+Common Var(flag_sel_sched_pipelining_outer_loops) Init(0) Optimization
 Perform software pipelining of outer loops during selective scheduling.
 
 fsel-sched-reschedule-pipelined
-Common Report Var(flag_sel_sched_reschedule_pipelined) Init(0) Optimization
+Common Var(flag_sel_sched_reschedule_pipelined) Init(0) Optimization
 Reschedule pipelined regions without pipelining.
 
 fsemantic-interposition
-Common Report Var(flag_semantic_interposition) Init(1)
+Common Var(flag_semantic_interposition) Init(1)
 Allow interposing function (or variables) by ones with different semantics (or initializer) respectively by dynamic linker.
 
 ; sched_stalled_insns means that insns can be moved prematurely from the queue
 ; of stalled insns into the ready list.
 fsched-stalled-insns
-Common Report Var(flag_sched_stalled_insns) Optimization UInteger
+Common Var(flag_sched_stalled_insns) Optimization UInteger
 Allow premature scheduling of queued insns.
 
 fsched-stalled-insns=
@@ -2498,7 +2498,7 @@ Common RejectNegative Joined UInteger Optimization
 ; premature removal from the queue of stalled insns into the ready list (has
 ; an effect only if the flag 'sched_stalled_insns' is set).
 fsched-stalled-insns-dep
-Common Report Var(flag_sched_stalled_insns_dep,1) Init(1) Optimization UInteger
+Common Var(flag_sched_stalled_insns_dep,1) Init(1) Optimization UInteger
 Set dependence distance checking in premature scheduling of queued insns.
 
 fsched-stalled-insns-dep=
@@ -2506,31 +2506,31 @@ Common RejectNegative Joined UInteger Optimization
 -fsched-stalled-insns-dep=<number>	Set dependence distance checking in premature scheduling of queued insns.
 
 fsched-group-heuristic
-Common Report Var(flag_sched_group_heuristic) Init(1) Optimization
+Common Var(flag_sched_group_heuristic) Init(1) Optimization
 Enable the group heuristic in the scheduler.
 
 fsched-critical-path-heuristic
-Common Report Var(flag_sched_critical_path_heuristic) Init(1) Optimization
+Common Var(flag_sched_critical_path_heuristic) Init(1) Optimization
 Enable the critical path heuristic in the scheduler.
 
 fsched-spec-insn-heuristic
-Common Report Var(flag_sched_spec_insn_heuristic) Init(1) Optimization
+Common Var(flag_sched_spec_insn_heuristic) Init(1) Optimization
 Enable the speculative instruction heuristic in the scheduler.
 
 fsched-rank-heuristic
-Common Report Var(flag_sched_rank_heuristic) Init(1) Optimization
+Common Var(flag_sched_rank_heuristic) Init(1) Optimization
 Enable the rank heuristic in the scheduler.
 
 fsched-last-insn-heuristic
-Common Report Var(flag_sched_last_insn_heuristic) Init(1) Optimization
+Common Var(flag_sched_last_insn_heuristic) Init(1) Optimization
 Enable the last instruction heuristic in the scheduler.
 
 fsched-dep-count-heuristic
-Common Report Var(flag_sched_dep_count_heuristic) Init(1) Optimization
+Common Var(flag_sched_dep_count_heuristic) Init(1) Optimization
 Enable the dependent count heuristic in the scheduler.
 
 fsection-anchors
-Common Report Var(flag_section_anchors) Optimization
+Common Var(flag_section_anchors) Optimization
 Access data in the same section from shared anchor points.
 
 fsee
@@ -2542,68 +2542,68 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 free
-Common Report Var(flag_ree) Init(0) Optimization
+Common Var(flag_ree) Init(0) Optimization
 Turn on Redundant Extensions Elimination pass.
 
 fshow-column
-Common Report Var(flag_show_column) Init(1)
+Common Var(flag_show_column) Init(1)
 Show column numbers in diagnostics, when available.  Default on.
 
 fshrink-wrap
-Common Report Var(flag_shrink_wrap) Optimization
+Common Var(flag_shrink_wrap) Optimization
 Emit function prologues only before parts of the function that need it,
 rather than at the top of the function.
 
 fshrink-wrap-separate
-Common Report Var(flag_shrink_wrap_separate) Init(1) Optimization
+Common Var(flag_shrink_wrap_separate) Init(1) Optimization
 Shrink-wrap parts of the prologue and epilogue separately.
 
 fsignaling-nans
-Common Report Var(flag_signaling_nans) Optimization SetByCombined
+Common Var(flag_signaling_nans) Optimization SetByCombined
 Disable optimizations observable by IEEE signaling NaNs.
 
 fsigned-zeros
-Common Report Var(flag_signed_zeros) Init(1) Optimization SetByCombined
+Common Var(flag_signed_zeros) Init(1) Optimization SetByCombined
 Disable floating point optimizations that ignore the IEEE signedness of zero.
 
 fsingle-precision-constant
-Common Report Var(flag_single_precision_constant) Optimization
+Common Var(flag_single_precision_constant) Optimization
 Convert floating point constants to single precision constants.
 
 fsplit-ivs-in-unroller
-Common Report Var(flag_split_ivs_in_unroller) Init(1) Optimization
+Common Var(flag_split_ivs_in_unroller) Init(1) Optimization
 Split lifetimes of induction variables when loops are unrolled.
 
 fsplit-stack
-Common Report Var(flag_split_stack) Init(-1)
+Common Var(flag_split_stack) Init(-1)
 Generate discontiguous stack frames.
 
 fsplit-wide-types
-Common Report Var(flag_split_wide_types) Optimization
+Common Var(flag_split_wide_types) Optimization
 Split wide types into independent registers.
 
 fsplit-wide-types-early
-Common Report Var(flag_split_wide_types_early) Optimization
+Common Var(flag_split_wide_types_early) Optimization
 Split wide types into independent registers earlier.
 
 fssa-backprop
-Common Report Var(flag_ssa_backprop) Init(1) Optimization
+Common Var(flag_ssa_backprop) Init(1) Optimization
 Enable backward propagation of use properties at the SSA level.
 
 fssa-phiopt
-Common Report Var(flag_ssa_phiopt) Optimization
+Common Var(flag_ssa_phiopt) Optimization
 Optimize conditional patterns using SSA PHI nodes.
 
 fstdarg-opt
-Common Report Var(flag_stdarg_opt) Init(1) Optimization
+Common Var(flag_stdarg_opt) Init(1) Optimization
 Optimize amount of stdarg registers saved to stack at start of function.
 
 fvariable-expansion-in-unroller
-Common Report Var(flag_variable_expansion_in_unroller) Optimization
+Common Var(flag_variable_expansion_in_unroller) Optimization
 Apply variable expansion when loops are unrolled.
 
 fstack-check=
-Common Report RejectNegative Joined Optimization
+Common RejectNegative Joined Optimization
 -fstack-check=[no|generic|specific]	Insert stack checking code into the program.
 
 fstack-check
@@ -2611,7 +2611,7 @@ Common Alias(fstack-check=, specific, no)
 Insert stack checking code into the program.  Same as -fstack-check=specific.
 
 fstack-clash-protection
-Common Report Var(flag_stack_clash_protection) Optimization
+Common Var(flag_stack_clash_protection) Optimization
 Insert code to probe each page of stack space as it is allocated to protect
 from stack-clash style attacks.
 
@@ -2627,19 +2627,19 @@ Common RejectNegative Joined Var(common_deferred_options) Defer
 -fstack-limit-symbol=<name>	Trap if the stack goes past symbol <name>.
 
 fstack-protector
-Common Report Var(flag_stack_protect, 1) Init(-1) Optimization
+Common Var(flag_stack_protect, 1) Init(-1) Optimization
 Use propolice as a stack protection method.
 
 fstack-protector-all
-Common Report RejectNegative Var(flag_stack_protect, 2) Init(-1) Optimization
+Common RejectNegative Var(flag_stack_protect, 2) Init(-1) Optimization
 Use a stack protection method for every function.
 
 fstack-protector-strong
-Common Report RejectNegative Var(flag_stack_protect, 3) Init(-1) Optimization
+Common RejectNegative Var(flag_stack_protect, 3) Init(-1) Optimization
 Use a smart stack protection method for certain functions.
 
 fstack-protector-explicit
-Common Report RejectNegative Var(flag_stack_protect, 4) Optimization
+Common RejectNegative Var(flag_stack_protect, 4) Optimization
 Use stack protection method only for functions with the stack_protect attribute.
 
 fstack-usage
@@ -2655,35 +2655,35 @@ Does nothing.  Preserved for backward compatibility.
 ; types do not alias expressions of certain other types.  Only used
 ; if alias analysis (in general) is enabled.
 fstrict-aliasing
-Common Report Var(flag_strict_aliasing) Optimization
+Common Var(flag_strict_aliasing) Optimization
 Assume strict aliasing rules apply.
 
 fstrict-overflow
-Common Report
+Common
 Treat signed overflow as undefined.  Negated as -fwrapv -fwrapv-pointer.
 
 fsync-libcalls
-Common Report Var(flag_sync_libcalls) Init(1)
+Common Var(flag_sync_libcalls) Init(1)
 Implement __atomic operations via libcalls to legacy __sync functions.
 
 fsyntax-only
-Common Report Var(flag_syntax_only)
+Common Var(flag_syntax_only)
 Check for syntax errors, then stop.
 
 ftest-coverage
-Common Report Var(flag_test_coverage)
+Common Var(flag_test_coverage)
 Create data files needed by \"gcov\".
 
 fthread-jumps
-Common Report Var(flag_thread_jumps) Optimization
+Common Var(flag_thread_jumps) Optimization
 Perform jump threading optimizations.
 
 ftime-report
-Common Report Var(time_report)
+Common Var(time_report)
 Report the time taken by each compiler pass.
 
 ftime-report-details
-Common Report Var(time_report_details)
+Common Var(time_report_details)
 Record times taken by sub-phases separately.
 
 ftls-model=
@@ -2706,15 +2706,15 @@ EnumValue
 Enum(tls_model) String(local-exec) Value(TLS_MODEL_LOCAL_EXEC)
 
 ftoplevel-reorder
-Common Report Var(flag_toplevel_reorder) Init(2) Optimization
+Common Var(flag_toplevel_reorder) Init(2) Optimization
 Reorder top level functions, variables, and asms.
 
 ftracer
-Common Report Var(flag_tracer) Optimization
+Common Var(flag_tracer) Optimization
 Perform superblock formation via tail duplication.
 
 ftrampolines
-Common Report Var(flag_trampolines) Init(0)
+Common Var(flag_trampolines) Init(0)
 For targets that normally need trampolines for nested functions, always
 generate them instead of using descriptors.
 
@@ -2722,19 +2722,19 @@ generate them instead of using descriptors.
 ; (user-visible) trap.  This is the case, for example, in nonstop
 ; IEEE 754 arithmetic.
 ftrapping-math
-Common Report Var(flag_trapping_math) Init(1) Optimization SetByCombined
+Common Var(flag_trapping_math) Init(1) Optimization SetByCombined
 Assume floating-point operations can trap.
 
 ftrapv
-Common Report Var(flag_trapv) Optimization
+Common Var(flag_trapv) Optimization
 Trap for signed overflow in addition, subtraction and multiplication.
 
 ftree-ccp
-Common Report Var(flag_tree_ccp) Optimization
+Common Var(flag_tree_ccp) Optimization
 Enable SSA-CCP optimization on trees.
 
 ftree-bit-ccp
-Common Report Var(flag_tree_bit_ccp) Optimization
+Common Var(flag_tree_bit_ccp) Optimization
 Enable SSA-BIT-CCP optimization on trees.
 
 ftree-store-ccp
@@ -2742,7 +2742,7 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 ftree-ch
-Common Report Var(flag_tree_ch) Optimization
+Common Var(flag_tree_ch) Optimization
 Enable loop header copying on trees.
 
 ftree-coalesce-inlined-vars
@@ -2750,7 +2750,7 @@ Common Ignore RejectNegative
 Does nothing.  Preserved for backward compatibility.
 
 ftree-coalesce-vars
-Common Report Var(flag_tree_coalesce_vars) Optimization
+Common Var(flag_tree_coalesce_vars) Optimization
 Enable SSA coalescing of user variables.
 
 ftree-copyrename
@@ -2758,7 +2758,7 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 ftree-copy-prop
-Common Report Var(flag_tree_copy_prop) Optimization
+Common Var(flag_tree_copy_prop) Optimization
 Enable copy propagation on trees.
 
 ftree-store-copy-prop
@@ -2766,64 +2766,64 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 ftree-cselim
-Common Report Var(flag_tree_cselim) Init(2) Optimization
+Common Var(flag_tree_cselim) Init(2) Optimization
 Transform condition stores into unconditional ones.
 
 ftree-switch-conversion
-Common Report Var(flag_tree_switch_conversion) Optimization
+Common Var(flag_tree_switch_conversion) Optimization
 Perform conversions of switch initializations.
 
 ftree-dce
-Common Report Var(flag_tree_dce) Optimization
+Common Var(flag_tree_dce) Optimization
 Enable SSA dead code elimination optimization on trees.
 
 ftree-dominator-opts
-Common Report Var(flag_tree_dom) Optimization
+Common Var(flag_tree_dom) Optimization
 Enable dominator optimizations.
 
 ftree-tail-merge
-Common Report Var(flag_tree_tail_merge) Optimization
+Common Var(flag_tree_tail_merge) Optimization
 Enable tail merging on trees.
 
 ftree-dse
-Common Report Var(flag_tree_dse) Optimization
+Common Var(flag_tree_dse) Optimization
 Enable dead store elimination.
 
 ftree-forwprop
-Common Report Var(flag_tree_forwprop) Init(1) Optimization
+Common Var(flag_tree_forwprop) Init(1) Optimization
 Enable forward propagation on trees.
 
 ftree-fre
-Common Report Var(flag_tree_fre) Optimization
+Common Var(flag_tree_fre) Optimization
 Enable Full Redundancy Elimination (FRE) on trees.
 
 foptimize-strlen
-Common Report Var(flag_optimize_strlen) Optimization
+Common Var(flag_optimize_strlen) Optimization
 Enable string length optimizations on trees.
 
 fisolate-erroneous-paths-dereference
-Common Report Var(flag_isolate_erroneous_paths_dereference) Optimization
+Common Var(flag_isolate_erroneous_paths_dereference) Optimization
 Detect paths that trigger erroneous or undefined behavior due to
 dereferencing a null pointer.  Isolate those paths from the main control
 flow and turn the statement with erroneous or undefined behavior into a trap.
 
 fisolate-erroneous-paths-attribute
-Common Report Var(flag_isolate_erroneous_paths_attribute) Optimization
+Common Var(flag_isolate_erroneous_paths_attribute) Optimization
 Detect paths that trigger erroneous or undefined behavior due to a null value
 being used in a way forbidden by a returns_nonnull or nonnull
 attribute.  Isolate those paths from the main control flow and turn the
 statement with erroneous or undefined behavior into a trap.
 
 ftree-loop-distribution
-Common Report Var(flag_tree_loop_distribution) Optimization
+Common Var(flag_tree_loop_distribution) Optimization
 Enable loop distribution on trees.
 
 ftree-loop-distribute-patterns
-Common Report Var(flag_tree_loop_distribute_patterns) Optimization
+Common Var(flag_tree_loop_distribute_patterns) Optimization
 Enable loop distribution for patterns transformed into a library call.
 
 ftree-loop-im
-Common Report Var(flag_tree_loop_im) Init(1) Optimization
+Common Var(flag_tree_loop_im) Init(1) Optimization
 Enable loop invariant motion on trees.
 
 ftree-loop-linear
@@ -2831,35 +2831,35 @@ Common Alias(floop-nest-optimize)
 Enable loop nest transforms.  Same as -floop-nest-optimize.
 
 ftree-loop-ivcanon
-Common Report Var(flag_tree_loop_ivcanon) Init(1) Optimization
+Common Var(flag_tree_loop_ivcanon) Init(1) Optimization
 Create canonical induction variables in loops.
 
 ftree-loop-optimize
-Common Report Var(flag_tree_loop_optimize) Init(1) Optimization
+Common Var(flag_tree_loop_optimize) Init(1) Optimization
 Enable loop optimizations on tree level.
 
 ftree-parallelize-loops=
-Common Report Joined RejectNegative UInteger Var(flag_tree_parallelize_loops) Init(1) Optimization
+Common Joined RejectNegative UInteger Var(flag_tree_parallelize_loops) Init(1) Optimization
 -ftree-parallelize-loops=<number>	Enable automatic parallelization of loops.
 
 ftree-phiprop
-Common Report Var(flag_tree_phiprop) Init(1) Optimization
+Common Var(flag_tree_phiprop) Init(1) Optimization
 Enable hoisting loads from conditional pointers.
 
 ftree-pre
-Common Report Var(flag_tree_pre) Optimization
+Common Var(flag_tree_pre) Optimization
 Enable SSA-PRE optimization on trees.
 
 ftree-partial-pre
-Common Report Var(flag_tree_partial_pre) Optimization
+Common Var(flag_tree_partial_pre) Optimization
 In SSA-PRE optimization on trees, enable partial-partial redundancy elimination.
 
 ftree-pta
-Common Report Var(flag_tree_pta) Optimization
+Common Var(flag_tree_pta) Optimization
 Perform function-local points-to analysis on trees.
 
 ftree-reassoc
-Common Report Var(flag_tree_reassoc) Init(1) Optimization
+Common Var(flag_tree_reassoc) Init(1) Optimization
 Enable reassociation on tree level.
 
 ftree-salias
@@ -2867,31 +2867,31 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 ftree-sink
-Common Report Var(flag_tree_sink) Optimization
+Common Var(flag_tree_sink) Optimization
 Enable SSA code sinking on trees.
 
 ftree-slsr
-Common Report Var(flag_tree_slsr) Optimization
+Common Var(flag_tree_slsr) Optimization
 Perform straight-line strength reduction.
 
 ftree-sra
-Common Report Var(flag_tree_sra) Optimization
+Common Var(flag_tree_sra) Optimization
 Perform scalar replacement of aggregates.
 
 ftree-ter
-Common Report Var(flag_tree_ter) Optimization
+Common Var(flag_tree_ter) Optimization
 Replace temporary expressions in the SSA->normal pass.
 
 ftree-lrs
-Common Report Var(flag_tree_live_range_split) Optimization
+Common Var(flag_tree_live_range_split) Optimization
 Perform live range splitting during the SSA->normal pass.
 
 ftree-vrp
-Common Report Var(flag_tree_vrp) Init(0) Optimization
+Common Var(flag_tree_vrp) Init(0) Optimization
 Perform Value Range Propagation on trees.
 
 fsplit-paths
-Common Report Var(flag_split_paths) Init(0) Optimization
+Common Var(flag_split_paths) Init(0) Optimization
 Split paths leading to loop backedges.
 
 funconstrained-commons
@@ -2900,15 +2900,15 @@ Assume common declarations may be overridden with ones with a larger
 trailing array.
 
 funit-at-a-time
-Common Report Var(flag_unit_at_a_time) Init(1)
+Common Var(flag_unit_at_a_time) Init(1)
 Compile whole compilation unit at a time.
 
 funroll-loops
-Common Report Var(flag_unroll_loops) Optimization
+Common Var(flag_unroll_loops) Optimization
 Perform loop unrolling when iteration count is known.
 
 funroll-all-loops
-Common Report Var(flag_unroll_all_loops) Optimization
+Common Var(flag_unroll_all_loops) Optimization
 Perform loop unrolling for all loops.
 
 funroll-completely-grow-size
@@ -2923,12 +2923,12 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 fassociative-math
-Common Report Var(flag_associative_math) SetByCombined Optimization
+Common Var(flag_associative_math) SetByCombined Optimization
 Allow optimization for floating-point arithmetic which may change the
 result of the operation due to rounding.
 
 freciprocal-math
-Common Report Var(flag_reciprocal_math) SetByCombined Optimization
+Common Var(flag_reciprocal_math) SetByCombined Optimization
 Same as -fassociative-math for expressions which include division.
 
 ; Nonzero means that unsafe floating-point math optimizations are allowed
@@ -2936,23 +2936,23 @@ Same as -fassociative-math for expressions which include division.
 ; are allowed to assume that their arguments and results are "normal"
 ; (e.g., nonnegative for SQRT).
 funsafe-math-optimizations
-Common Report Var(flag_unsafe_math_optimizations) Optimization SetByCombined
+Common Var(flag_unsafe_math_optimizations) Optimization SetByCombined
 Allow math optimizations that may violate IEEE or ISO standards.
 
 funswitch-loops
-Common Report Var(flag_unswitch_loops) Optimization
+Common Var(flag_unswitch_loops) Optimization
 Perform loop unswitching.
 
 fsplit-loops
-Common Report Var(flag_split_loops) Optimization
+Common Var(flag_split_loops) Optimization
 Perform loop splitting.
 
 fversion-loops-for-strides
-Common Report Var(flag_version_loops_for_strides) Optimization
+Common Var(flag_version_loops_for_strides) Optimization
 Version loops based on whether indices have a stride of one.
 
 funwind-tables
-Common Report Var(flag_unwind_tables) Optimization
+Common Var(flag_unwind_tables) Optimization
 Just generate unwind tables for exception handling.
 
 fuse-ld=bfd
@@ -2976,7 +2976,7 @@ Common Undocumented Var(flag_use_linker_plugin)
 ; will be set according to optimize, debug_info_level and debug_hooks
 ; in process_options ().
 fvar-tracking
-Common Report Var(flag_var_tracking) Init(2) PerFunction
+Common Var(flag_var_tracking) Init(2) PerFunction
 Perform variable tracking.
 
 ; Positive if we should track variables at assignments, negative if
@@ -2984,13 +2984,13 @@ Perform variable tracking.
 ; annotations.  When flag_var_tracking_assignments ==
 ; AUTODETECT_VALUE it will be set according to flag_var_tracking.
 fvar-tracking-assignments
-Common Report Var(flag_var_tracking_assignments) Init(2) PerFunction
+Common Var(flag_var_tracking_assignments) Init(2) PerFunction
 Perform variable tracking by annotating assignments.
 
 ; Nonzero if we should toggle flag_var_tracking_assignments after
 ; processing options and computing its default.  */
 fvar-tracking-assignments-toggle
-Common Report Var(flag_var_tracking_assignments_toggle) PerFunction
+Common Var(flag_var_tracking_assignments_toggle) PerFunction
 Toggle -fvar-tracking-assignments.
 
 ; Positive if we should track uninitialized variables, negative if
@@ -2998,12 +2998,12 @@ Toggle -fvar-tracking-assignments.
 ; annotations.  When flag_var_tracking_uninit == AUTODETECT_VALUE it
 ; will be set according to flag_var_tracking.
 fvar-tracking-uninit
-Common Report Var(flag_var_tracking_uninit) PerFunction
+Common Var(flag_var_tracking_uninit) PerFunction
 Perform variable tracking and also tag variables that are uninitialized.
 
 ; Alias to enable both -ftree-loop-vectorize and -ftree-slp-vectorize.
 ftree-vectorize
-Common Report Optimization
+Common Optimization
 Enable vectorization on trees.
 
 ftree-vectorizer-verbose=
@@ -3011,11 +3011,11 @@ Common Joined RejectNegative Ignore
 Does nothing.  Preserved for backward compatibility.
 
 ftree-loop-vectorize
-Common Report Var(flag_tree_loop_vectorize) Optimization EnabledBy(ftree-vectorize)
+Common Var(flag_tree_loop_vectorize) Optimization EnabledBy(ftree-vectorize)
 Enable loop vectorization on trees.
 
 ftree-slp-vectorize
-Common Report Var(flag_tree_slp_vectorize) Optimization EnabledBy(ftree-vectorize)
+Common Var(flag_tree_slp_vectorize) Optimization EnabledBy(ftree-vectorize)
 Enable basic block vectorization (SLP) on trees.
 
 fvect-cost-model=
@@ -3050,7 +3050,7 @@ Common Ignore
 Does nothing. Preserved for backward compatibility.
 
 ftree-scev-cprop
-Common Report Var(flag_tree_scev_cprop) Init(1) Optimization
+Common Var(flag_tree_scev_cprop) Init(1) Optimization
 Enable copy propagation of scalar-evolution information.
 
 ; -fverbose-asm causes extra commentary information to be produced in
@@ -3060,7 +3060,7 @@ Enable copy propagation of scalar-evolution information.
 ; -fno-verbose-asm, the default, causes the extra information
 ; to not be added and is useful when comparing two assembler files.
 fverbose-asm
-Common Report Var(flag_verbose_asm)
+Common Var(flag_verbose_asm)
 Add extra commentary to assembler output.
 
 fvisibility=
@@ -3107,35 +3107,35 @@ Common Var(flag_vtv_debug)
 Output vtable verification pointer sets information.
 
 fvpt
-Common Report Var(flag_value_profile_transformations) Optimization
+Common Var(flag_value_profile_transformations) Optimization
 Use expression value profiles in optimizations.
 
 fweb
-Common Report Var(flag_web) Init(2) Optimization
+Common Var(flag_web) Init(2) Optimization
 Construct webs and split unrelated uses of single variable.
 
 ftree-builtin-call-dce
-Common Report Var(flag_tree_builtin_call_dce) Init(0) Optimization
+Common Var(flag_tree_builtin_call_dce) Init(0) Optimization
 Enable conditional dead code elimination for builtin calls.
 
 fwhole-program
-Common Report Var(flag_whole_program) Init(0)
+Common Var(flag_whole_program) Init(0)
 Perform whole program optimizations.
 
 fwrapv-pointer
-Common Report Var(flag_wrapv_pointer) Optimization
+Common Var(flag_wrapv_pointer) Optimization
 Assume pointer overflow wraps around.
 
 fwrapv
-Common Report Var(flag_wrapv) Optimization
+Common Var(flag_wrapv) Optimization
 Assume signed arithmetic overflow wraps around.
 
 fzero-initialized-in-bss
-Common Report Var(flag_zero_initialized_in_bss) Init(1)
+Common Var(flag_zero_initialized_in_bss) Init(1)
 Put zero initialized data in the bss section.
 
 fzero-call-used-regs=
-Common Report RejectNegative Joined
+Common RejectNegative Joined
 Clear call-used registers upon function return.
 
 g
@@ -3235,15 +3235,15 @@ Common Driver Var(debug_nonbind_markers_p) Init(2)
 Emit progressive recommended breakpoint locations.
 
 gstrict-dwarf
-Common Driver Report Var(dwarf_strict) Init(0)
+Common Driver Var(dwarf_strict) Init(0)
 Don't emit DWARF additions beyond selected version.
 
 gdescribe-dies
-Common Driver Report Var(flag_describe_dies) Init(0)
+Common Driver Var(flag_describe_dies) Init(0)
 Add description attributes to some DWARF DIEs that have no name attribute.
 
 gtoggle
-Common Driver Report Var(flag_gtoggle)
+Common Driver Var(flag_gtoggle)
 Toggle debug information generation.
 
 gvariable-location-views
@@ -3487,7 +3487,7 @@ z
 Driver Joined Separate
 
 fipa-ra
-Common Report Var(flag_ipa_ra) Optimization
+Common Var(flag_ipa_ra) Optimization
 Use caller save register across calls if possible.
 
 ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
index 1b3d942e0f5..ded13a5be8a 100644
--- a/gcc/config/aarch64/aarch64.opt
+++ b/gcc/config/aarch64/aarch64.opt
@@ -64,11 +64,11 @@ EnumValue
 Enum(cmodel) String(large) Value(AARCH64_CMODEL_LARGE)
 
 mbig-endian
-Target Report RejectNegative Mask(BIG_END)
+Target RejectNegative Mask(BIG_END)
 Assume target CPU is configured as big endian.
 
 mgeneral-regs-only
-Target Report RejectNegative Mask(GENERAL_REGS_ONLY) Save
+Target RejectNegative Mask(GENERAL_REGS_ONLY) Save
 Generate code which uses only the general registers.
 
 mharden-sls=
@@ -76,15 +76,15 @@ Target RejectNegative Joined Var(aarch64_harden_sls_string)
 Generate code to mitigate against straight line speculation.
 
 mfix-cortex-a53-835769
-Target Report Var(aarch64_fix_a53_err835769) Init(2) Save
+Target Var(aarch64_fix_a53_err835769) Init(2) Save
 Workaround for ARM Cortex-A53 Erratum number 835769.
 
 mfix-cortex-a53-843419
-Target Report Var(aarch64_fix_a53_err843419) Init(2) Save
+Target Var(aarch64_fix_a53_err843419) Init(2) Save
 Workaround for ARM Cortex-A53 Erratum number 843419.
 
 mlittle-endian
-Target Report RejectNegative InverseMask(BIG_END)
+Target RejectNegative InverseMask(BIG_END)
 Assume target CPU is configured as little endian.
 
 mcmodel=
@@ -92,11 +92,11 @@ Target RejectNegative Joined Enum(cmodel) Var(aarch64_cmodel_var) Init(AARCH64_C
 Specify the code model.
 
 mstrict-align
-Target Report Mask(STRICT_ALIGN) Save
+Target Mask(STRICT_ALIGN) Save
 Don't assume that unaligned accesses are handled by the system.
 
 momit-leaf-frame-pointer
-Target Report Var(flag_omit_leaf_frame_pointer) Init(2) Save
+Target Var(flag_omit_leaf_frame_pointer) Init(2) Save
 Omit the frame pointer in leaf functions.
 
 mtls-dialect=
@@ -153,7 +153,7 @@ EnumValue
 Enum(aarch64_abi) String(lp64) Value(AARCH64_ABI_LP64)
 
 mpc-relative-literal-loads
-Target Report Save Var(pcrelative_literal_loads) Init(2) Save
+Target Save Var(pcrelative_literal_loads) Init(2) Save
 PC relative literal loads.
 
 mbranch-protection=
@@ -260,7 +260,7 @@ TargetVariable
 long aarch64_stack_protector_guard_offset = 0
 
 moutline-atomics
-Target Report Var(aarch64_flag_outline_atomics) Init(2) Save
+Target Var(aarch64_flag_outline_atomics) Init(2) Save
 Generate local calls to out-of-line atomic operations.
 
 -param=aarch64-sve-compare-costs=
diff --git a/gcc/config/alpha/alpha.opt b/gcc/config/alpha/alpha.opt
index 43b35e2acab..36dcdcaaef1 100644
--- a/gcc/config/alpha/alpha.opt
+++ b/gcc/config/alpha/alpha.opt
@@ -19,11 +19,11 @@
 ; <http://www.gnu.org/licenses/>.
 
 msoft-float
-Target Report Mask(SOFT_FP)
+Target Mask(SOFT_FP)
 Do not use hardware fp.
 
 mfp-regs
-Target Report Mask(FPREGS)
+Target Mask(FPREGS)
 Use fp registers.
 
 mgas
@@ -35,70 +35,70 @@ Target RejectNegative Mask(IEEE_CONFORMANT)
 Request IEEE-conformant math library routines (OSF/1).
 
 mieee
-Target Report RejectNegative Mask(IEEE)
+Target RejectNegative Mask(IEEE)
 Emit IEEE-conformant code, without inexact exceptions.
 
 mieee-with-inexact
-Target Report RejectNegative Mask(IEEE_WITH_INEXACT)
+Target RejectNegative Mask(IEEE_WITH_INEXACT)
 
 mbuild-constants
-Target Report Mask(BUILD_CONSTANTS)
+Target Mask(BUILD_CONSTANTS)
 Do not emit complex integer constants to read-only memory.
 
 mfloat-vax
-Target Report RejectNegative Mask(FLOAT_VAX)
+Target RejectNegative Mask(FLOAT_VAX)
 Use VAX fp.
 
 mfloat-ieee
-Target Report RejectNegative InverseMask(FLOAT_VAX)
+Target RejectNegative InverseMask(FLOAT_VAX)
 Do not use VAX fp.
 
 mbwx
-Target Report Mask(BWX)
+Target Mask(BWX)
 Emit code for the byte/word ISA extension.
 
 mmax
-Target Report Mask(MAX)
+Target Mask(MAX)
 Emit code for the motion video ISA extension.
 
 mfix
-Target Report Mask(FIX)
+Target Mask(FIX)
 Emit code for the fp move and sqrt ISA extension.
 
 mcix
-Target Report Mask(CIX)
+Target Mask(CIX)
 Emit code for the counting ISA extension.
 
 mexplicit-relocs
-Target Report Mask(EXPLICIT_RELOCS)
+Target Mask(EXPLICIT_RELOCS)
 Emit code using explicit relocation directives.
 
 msmall-data
-Target Report RejectNegative Mask(SMALL_DATA)
+Target RejectNegative Mask(SMALL_DATA)
 Emit 16-bit relocations to the small data areas.
 
 mlarge-data
-Target Report RejectNegative InverseMask(SMALL_DATA)
+Target RejectNegative InverseMask(SMALL_DATA)
 Emit 32-bit relocations to the small data areas.
 
 msmall-text
-Target Report RejectNegative Mask(SMALL_TEXT)
+Target RejectNegative Mask(SMALL_TEXT)
 Emit direct branches to local functions.
 
 mlarge-text
-Target Report RejectNegative InverseMask(SMALL_TEXT)
+Target RejectNegative InverseMask(SMALL_TEXT)
 Emit indirect branches to local functions.
 
 mtls-kernel
-Target Report Mask(TLS_KERNEL)
+Target Mask(TLS_KERNEL)
 Emit rdval instead of rduniq for thread pointer.
 
 mlong-double-128
-Target Report RejectNegative Mask(LONG_DOUBLE_128)
+Target RejectNegative Mask(LONG_DOUBLE_128)
 Use 128-bit long double.
 
 mlong-double-64
-Target Report RejectNegative InverseMask(LONG_DOUBLE_128)
+Target RejectNegative InverseMask(LONG_DOUBLE_128)
 Use 64-bit long double.
 
 mcpu=
diff --git a/gcc/config/arc/arc.opt b/gcc/config/arc/arc.opt
index c6c64afa59c..3696a1d5b18 100644
--- a/gcc/config/arc/arc.opt
+++ b/gcc/config/arc/arc.opt
@@ -22,39 +22,39 @@ HeaderInclude
 config/arc/arc-opts.h
 
 mbig-endian
-Target Report RejectNegative Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Compile code for big endian mode.
 
 mlittle-endian
-Target Report RejectNegative InverseMask(BIG_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN)
 Compile code for little endian mode.  This is the default.
 
 mno-cond-exec
-Target Report RejectNegative Mask(NO_COND_EXEC)
+Target RejectNegative Mask(NO_COND_EXEC)
 Disable ARCompact specific pass to generate conditional execution instructions.
 
 mA6
-Target Report
+Target
 Generate ARCompact 32-bit code for ARC600 processor.
 
 mARC600
-Target Report
+Target
 Same as -mA6.
 
 mARC601
-Target Report
+Target
 Generate ARCompact 32-bit code for ARC601 processor.
 
 mA7
-Target Report
+Target
 Generate ARCompact 32-bit code for ARC700 processor.
 
 mARC700
-Target Report
+Target
 Same as -mA7.
 
 mjli-always
-Target Report Mask(JLI_ALWAYS)
+Target Mask(JLI_ALWAYS)
 Force all calls to be made via a jli instruction.
 
 mmpy-option=
@@ -128,15 +128,15 @@ EnumValue
 Enum(arc_mpy) String(plus_qmacw) Value(9) Canonical
 
 mdiv-rem
-Target Report Mask(DIVREM)
+Target Mask(DIVREM)
 Enable DIV-REM instructions for ARCv2.
 
 mcode-density
-Target Report Mask(CODE_DENSITY)
+Target Mask(CODE_DENSITY)
 Enable code density instructions for ARCv2.
 
 mmixed-code
-Target Report Mask(MIXED_CODE_SET)
+Target Mask(MIXED_CODE_SET)
 Tweak register allocation to help 16-bit instruction generation.
 ; originally this was:
 ;Generate ARCompact 16-bit instructions intermixed with 32-bit instructions
@@ -146,91 +146,91 @@ Tweak register allocation to help 16-bit instruction generation.
 ; We use an explict definition for the negative form because that is the
 ; actually interesting option, and we want that to have its own comment.
 mvolatile-cache
-Target Report RejectNegative Mask(VOLATILE_CACHE_SET)
+Target RejectNegative Mask(VOLATILE_CACHE_SET)
 Use ordinarily cached memory accesses for volatile references.
 
 mno-volatile-cache
-Target Report RejectNegative InverseMask(VOLATILE_CACHE_SET)
+Target RejectNegative InverseMask(VOLATILE_CACHE_SET)
 Enable cache bypass for volatile references.
 
 mbarrel-shifter
-Target Report Mask(BARREL_SHIFTER)
+Target Mask(BARREL_SHIFTER)
 Generate instructions supported by barrel shifter.
 
 mnorm
-Target Report Mask(NORM_SET)
+Target Mask(NORM_SET)
 Generate norm instruction.
 
 mswap
-Target Report Mask(SWAP_SET)
+Target Mask(SWAP_SET)
 Generate swap instruction.
 
 mmul64
-Target Report Mask(MUL64_SET)
+Target Mask(MUL64_SET)
 Generate mul64 and mulu64 instructions.
 
 mno-mpy
-Target Report Mask(NOMPY_SET) Warn(%qs is deprecated)
+Target Mask(NOMPY_SET) Warn(%qs is deprecated)
 Do not generate mpy instructions for ARC700.
 
 mea
-Target Report Mask(EA_SET)
+Target Mask(EA_SET)
 Generate extended arithmetic instructions, only valid for ARC700.
 
 msoft-float
-Target Report Mask(0)
+Target Mask(0)
 Dummy flag. This is the default unless FPX switches are provided explicitly.
 
 mlong-calls
-Target Report Mask(LONG_CALLS_SET)
+Target Mask(LONG_CALLS_SET)
 Generate call insns as register indirect calls.
 
 mno-brcc
-Target Report Mask(NO_BRCC_SET)
+Target Mask(NO_BRCC_SET)
 Do no generate BRcc instructions in arc_reorg.
 
 msdata
-Target Report InverseMask(NO_SDATA_SET)
+Target InverseMask(NO_SDATA_SET)
 Generate sdata references.  This is the default, unless you compile for PIC.
 
 mmillicode
-Target Report Mask(MILLICODE_THUNK_SET)
+Target Mask(MILLICODE_THUNK_SET)
 Generate millicode thunks.
 
 mspfp
-Target Report Mask(SPFP_COMPACT_SET)
+Target Mask(SPFP_COMPACT_SET)
 FPX: Generate Single Precision FPX (compact) instructions.
 
 mspfp-compact
-Target Report Mask(SPFP_COMPACT_SET) MaskExists
+Target Mask(SPFP_COMPACT_SET) MaskExists
 FPX: Generate Single Precision FPX (compact) instructions.
 
 mspfp-fast
-Target Report Mask(SPFP_FAST_SET)
+Target Mask(SPFP_FAST_SET)
 FPX: Generate Single Precision FPX (fast) instructions.
 
 margonaut
-Target Report Mask(ARGONAUT_SET)
+Target Mask(ARGONAUT_SET)
 FPX: Enable Argonaut ARC CPU Double Precision Floating Point extensions.
 
 mdpfp
-Target Report Mask(DPFP_COMPACT_SET)
+Target Mask(DPFP_COMPACT_SET)
 FPX: Generate Double Precision FPX (compact) instructions.
 
 mdpfp-compact
-Target Report Mask(DPFP_COMPACT_SET) MaskExists
+Target Mask(DPFP_COMPACT_SET) MaskExists
 FPX: Generate Double Precision FPX (compact) instructions.
 
 mdpfp-fast
-Target Report Mask(DPFP_FAST_SET)
+Target Mask(DPFP_FAST_SET)
 FPX: Generate Double Precision FPX (fast) instructions.
 
 mno-dpfp-lrsr
-Target Report Mask(DPFP_DISABLE_LRSR)
+Target Mask(DPFP_DISABLE_LRSR)
 Disable LR and SR instructions from using FPX extension aux registers.
 
 msimd
-Target Report Mask(SIMD_SET)
+Target Mask(SIMD_SET)
 Enable generation of ARC SIMD instructions via target-specific builtins.
 
 mcpu=
@@ -242,7 +242,7 @@ Target RejectNegative Joined UInteger Var(arc_size_opt_level) Init(-1)
 Size optimization level: 0:none 1:opportunistic 2: regalloc 3:drop align, -Os.
 
 misize
-Target Report PchIgnore Var(TARGET_DUMPISIZE)
+Target PchIgnore Var(TARGET_DUMPISIZE)
 Annotate assembler instructions with estimated addresses.
 
 mmultcost=
@@ -289,7 +289,7 @@ Target Var(TARGET_AUTO_MODIFY_REG) Init(TARGET_AUTO_MODIFY_REG_DEFAULT)
 Enable the use of pre/post modify with register displacement.
 
 mmul32x16
-Target Report Mask(MULMAC_32BY16_SET)
+Target Mask(MULMAC_32BY16_SET)
 Generate 32x16 multiply and mac instructions.
 
 ; the initializer is supposed to be: Init(REG_BR_PROB_BASE/2) ,
@@ -346,42 +346,42 @@ Expand adddi3 and subdi3 at rtl generation time into add.f / adc etc.
 ; Flags used by the assembler, but for which we define preprocessor
 ; macro symbols as well.
 mcrc
-Target Report Warn(%qs is deprecated)
+Target Warn(%qs is deprecated)
 Enable variable polynomial CRC extension.
 
 mdsp-packa
-Target Report Warn(%qs is deprecated)
+Target Warn(%qs is deprecated)
 Enable DSP 3.1 Pack A extensions.
 
 mdvbf
-Target Report Warn(%qs is deprecated)
+Target Warn(%qs is deprecated)
 Enable dual viterbi butterfly extension.
 
 mmac-d16
-Target Report Undocumented Warn(%qs is deprecated)
+Target Undocumented Warn(%qs is deprecated)
 
 mmac-24
-Target Report Undocumented Warn(%qs is deprecated)
+Target Undocumented Warn(%qs is deprecated)
 
 mtelephony
-Target Report RejectNegative Warn(%qs is deprecated)
+Target RejectNegative Warn(%qs is deprecated)
 Enable Dual and Single Operand Instructions for Telephony.
 
 mxy
-Target Report
+Target
 Enable XY Memory extension (DSP version 3).
 
 ; ARC700 4.10 extension instructions
 mlock
-Target Report
+Target
 Enable Locked Load/Store Conditional extension.
 
 mswape
-Target Report
+Target
 Enable swap byte ordering extension instruction.
 
 mrtsc
-Target Report Warn(%qs is deprecated)
+Target Warn(%qs is deprecated)
 Enable 64-bit Time-Stamp Counter extension instruction.
 
 EB
@@ -402,7 +402,7 @@ Pass -marclinux_prof option through to linker.
 
 ;; lra is still unproven for ARC, so allow to fall back to reload with -mno-lra.
 mlra
-Target Report Var(arc_lra_flag) Init(1) Save
+Target Var(arc_lra_flag) Init(1) Save
 Use LRA instead of reload.
 
 mlra-priority-none
@@ -426,11 +426,11 @@ multcost=
 Target RejectNegative Joined
 
 matomic
-Target Report Mask(ATOMIC)
+Target Mask(ATOMIC)
 Enable atomic instructions.
 
 mll64
-Target Report Mask(LL64)
+Target Mask(LL64)
 Enable double load/store instructions for ARC HS.
 
 mfpu=
@@ -484,15 +484,15 @@ mtp-regno=none
 Target RejectNegative Var(arc_tp_regno,-1)
 
 mbitops
-Target Report Var(TARGET_NPS_BITOPS) Init(TARGET_NPS_BITOPS_DEFAULT)
+Target Var(TARGET_NPS_BITOPS) Init(TARGET_NPS_BITOPS_DEFAULT)
 Enable use of NPS400 bit operations.
 
 mcmem
-Target Report Var(TARGET_NPS_CMEM) Init(TARGET_NPS_CMEM_DEFAULT)
+Target Var(TARGET_NPS_CMEM) Init(TARGET_NPS_CMEM_DEFAULT)
 Enable use of NPS400 xld/xst extension.
 
 munaligned-access
-Target Report Var(unaligned_access) Init(UNALIGNED_ACCESS_DEFAULT)
+Target Var(unaligned_access) Init(UNALIGNED_ACCESS_DEFAULT)
 Enable unaligned word and halfword accesses to packed data.
 
 mirq-ctrl-saved=
@@ -529,13 +529,13 @@ EnumValue
 Enum(arc_lpc) String(32) Value(32)
 
 mrf16
-Target Report Mask(RF16)
+Target Mask(RF16)
 Enable 16-entry register file.
 
 mbranch-index
-Target Report Var(TARGET_BRANCH_INDEX) Init(DEFAULT_BRANCH_INDEX)
+Target Var(TARGET_BRANCH_INDEX) Init(DEFAULT_BRANCH_INDEX)
 Enable use of BI/BIH instructions when available.
 
 mcode-density-frame
-Target Report Var(TARGET_CODE_DENSITY_FRAME) Init(TARGET_CODE_DENSITY_FRAME_DEFAULT)
+Target Var(TARGET_CODE_DENSITY_FRAME) Init(TARGET_CODE_DENSITY_FRAME_DEFAULT)
 Enable ENTER_S and LEAVE_S opcodes for ARCv2.
diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
index f01cd65eb33..b8490094e03 100644
--- a/gcc/config/arm/arm.opt
+++ b/gcc/config/arm/arm.opt
@@ -55,22 +55,22 @@ EnumValue
 Enum(arm_abi_type) String(aapcs-linux) Value(ARM_ABI_AAPCS_LINUX)
 
 mabort-on-noreturn
-Target Report Mask(ABORT_NORETURN)
+Target Mask(ABORT_NORETURN)
 Generate a call to abort if a noreturn function returns.
 
 mapcs
 Target RejectNegative Mask(APCS_FRAME) Undocumented
 
 mapcs-frame
-Target Report Mask(APCS_FRAME)
+Target Mask(APCS_FRAME)
 Generate APCS conformant stack frames.
 
 mapcs-reentrant
-Target Report Mask(APCS_REENT)
+Target Mask(APCS_REENT)
 Generate re-entrant, PIC code.
 
 mapcs-stack-check
-Target Report Mask(APCS_STACK) Undocumented
+Target Mask(APCS_STACK) Undocumented
 
 march=
 Target Save RejectNegative Negative(march=) ToLower Joined Var(arm_arch_string)
@@ -82,19 +82,19 @@ EnumValue
 Enum(arm_arch) String(native) Value(-1) DriverOnly
 
 marm
-Target Report RejectNegative Negative(mthumb) InverseMask(THUMB)
+Target RejectNegative Negative(mthumb) InverseMask(THUMB)
 Generate code in 32 bit ARM state.
 
 mbig-endian
-Target Report RejectNegative Negative(mlittle-endian) Mask(BIG_END)
+Target RejectNegative Negative(mlittle-endian) Mask(BIG_END)
 Assume target CPU is configured as big endian.
 
 mcallee-super-interworking
-Target Report Mask(CALLEE_INTERWORKING)
+Target Mask(CALLEE_INTERWORKING)
 Thumb: Assume non-static functions may be called from ARM code.
 
 mcaller-super-interworking
-Target Report Mask(CALLER_INTERWORKING)
+Target Mask(CALLER_INTERWORKING)
 Thumb: Assume function pointers may go to non-Thumb aware code.
 
 mcpu=
@@ -123,7 +123,7 @@ EnumValue
 Enum(float_abi_type) String(hard) Value(ARM_FLOAT_ABI_HARD)
 
 mflip-thumb
-Target Report Var(TARGET_FLIP_THUMB) Undocumented
+Target Var(TARGET_FLIP_THUMB) Undocumented
 Switch ARM/Thumb modes on alternating functions for compiler testing.
 
 mfp16-format=
@@ -151,15 +151,15 @@ mhard-float
 Target RejectNegative Alias(mfloat-abi=, hard) Undocumented
 
 mlittle-endian
-Target Report RejectNegative Negative(mbig-endian) InverseMask(BIG_END)
+Target RejectNegative Negative(mbig-endian) InverseMask(BIG_END)
 Assume target CPU is configured as little endian.
 
 mlong-calls
-Target Report Mask(LONG_CALLS)
+Target Mask(LONG_CALLS)
 Generate call insns as indirect calls, if necessary.
 
 mpic-data-is-text-relative
-Target Report Var(arm_pic_data_is_text_relative) Init(TARGET_DEFAULT_PIC_DATA_IS_TEXT_RELATIVE)
+Target Var(arm_pic_data_is_text_relative) Init(TARGET_DEFAULT_PIC_DATA_IS_TEXT_RELATIVE)
 Assume data segments are relative to text segment.
 
 mpic-register=
@@ -167,15 +167,15 @@ Target RejectNegative Joined Var(arm_pic_register_string)
 Specify the register to be used for PIC addressing.
 
 mpoke-function-name
-Target Report Mask(POKE_FUNCTION_NAME)
+Target Mask(POKE_FUNCTION_NAME)
 Store function names in object code.
 
 msched-prolog
-Target Report Mask(SCHED_PROLOG)
+Target Mask(SCHED_PROLOG)
 Permit scheduling of a function's prologue sequence.
 
 msingle-pic-base
-Target Report Mask(SINGLE_PIC_BASE)
+Target Mask(SINGLE_PIC_BASE)
 Do not load the PIC register in function prologues.
 
 msoft-float
@@ -186,11 +186,11 @@ Target RejectNegative Joined UInteger Var(arm_structure_size_boundary) Init(DEFA
 Specify the minimum bit alignment of structures. (Deprecated).
 
 mthumb
-Target Report RejectNegative Negative(marm) Mask(THUMB) Save
+Target RejectNegative Negative(marm) Mask(THUMB) Save
 Generate code for Thumb state.
 
 mthumb-interwork
-Target Report Mask(INTERWORK)
+Target Mask(INTERWORK)
 Support calls between Thumb and ARM instruction sets.
 
 mtls-dialect=
@@ -215,11 +215,11 @@ EnumValue
 Enum(arm_tp_type) String(cp15) Value(TP_CP15)
 
 mtpcs-frame
-Target Report Mask(TPCS_FRAME)
+Target Mask(TPCS_FRAME)
 Thumb: Generate (non-leaf) stack frames even if not needed.
 
 mtpcs-leaf-frame
-Target Report Mask(TPCS_LEAF_FRAME)
+Target Mask(TPCS_LEAF_FRAME)
 Thumb: Generate (leaf) stack frames even if not needed.
 
 mtune=
@@ -227,7 +227,7 @@ Target Save RejectNegative Negative(mtune=) ToLower Joined Var(arm_tune_string)
 Tune code for the given processor.
 
 mprint-tune-info
-Target Report RejectNegative Var(print_tune_info) Init(0)
+Target RejectNegative Var(print_tune_info) Init(0)
 Print CPU tuning information as comment in assembler file.  This is
 an option used only for regression testing of the compiler and not
 intended for ordinary use in compiling code.
@@ -238,11 +238,11 @@ EnumValue
 Enum(processor_type) String(native) Value(-1) DriverOnly
 
 mvectorize-with-neon-quad
-Target Report RejectNegative InverseMask(NEON_VECTORIZE_DOUBLE)
+Target RejectNegative InverseMask(NEON_VECTORIZE_DOUBLE)
 Use Neon quad-word (rather than double-word) registers for vectorization.
 
 mvectorize-with-neon-double
-Target Report RejectNegative Mask(NEON_VECTORIZE_DOUBLE)
+Target RejectNegative Mask(NEON_VECTORIZE_DOUBLE)
 Use Neon double-word (rather than quad-word) registers for vectorization.
 
 mverbose-cost-dump
@@ -250,20 +250,20 @@ Common Undocumented Var(arm_verbose_cost) Init(0)
 Enable more verbose RTX cost dumps during debug.  For GCC developers use only.
 
 mword-relocations
-Target Report Var(target_word_relocations) Init(TARGET_DEFAULT_WORD_RELOCATIONS)
+Target Var(target_word_relocations) Init(TARGET_DEFAULT_WORD_RELOCATIONS)
 Only generate absolute relocations on word sized values.
 
 mrestrict-it
-Target Report Var(arm_restrict_it) Init(2) Save
+Target Var(arm_restrict_it) Init(2) Save
 Generate IT blocks appropriate for ARMv8.
 
 mfix-cortex-m3-ldrd
-Target Report Var(fix_cm3_ldrd) Init(2)
+Target Var(fix_cm3_ldrd) Init(2)
 Avoid overlapping destination and address registers on LDRD instructions
 that may trigger Cortex-M3 errata.
 
 munaligned-access
-Target Report Var(unaligned_access) Init(2) Save
+Target Var(unaligned_access) Init(2) Save
 Enable unaligned word and halfword accesses to packed data.
 
 mneon-for-64bits
@@ -271,23 +271,23 @@ Target WarnRemoved
 This option is deprecated and has no effect.
 
 mslow-flash-data
-Target Report Var(target_slow_flash_data) Init(0)
+Target Var(target_slow_flash_data) Init(0)
 Assume loading data from flash is slower than fetching instructions.
 
 masm-syntax-unified
-Target Report Var(inline_asm_unified) Init(0) Save
+Target Var(inline_asm_unified) Init(0) Save
 Assume unified syntax for inline assembly code.
 
 mpure-code
-Target Report Var(target_pure_code) Init(0)
+Target Var(target_pure_code) Init(0)
 Do not allow constant data to be placed in code sections.
 
 mbe8
-Target Report RejectNegative Negative(mbe32) Mask(BE8)
+Target RejectNegative Negative(mbe32) Mask(BE8)
 When linking for big-endian targets, generate a BE8 format image.
 
 mbe32
-Target Report RejectNegative Negative(mbe8) InverseMask(BE8)
+Target RejectNegative Negative(mbe8) InverseMask(BE8)
 When linking for big-endian targets, generate a legacy BE32 format image.
 
 mbranch-cost=
@@ -295,9 +295,9 @@ Target RejectNegative Joined UInteger Var(arm_branch_cost) Init(-1)
 Cost to assume for a branch insn.
 
 mgeneral-regs-only
-Target Report RejectNegative Mask(GENERAL_REGS_ONLY) Save
+Target RejectNegative Mask(GENERAL_REGS_ONLY) Save
 Generate code which uses the core registers only (r0-r14).
 
 mfdpic
-Target Report Mask(FDPIC)
+Target Mask(FDPIC)
 Enable Function Descriptor PIC mode.
diff --git a/gcc/config/avr/avr.opt b/gcc/config/avr/avr.opt
index fac3114690f..5d849dabe8f 100644
--- a/gcc/config/avr/avr.opt
+++ b/gcc/config/avr/avr.opt
@@ -19,7 +19,7 @@
 ; <http://www.gnu.org/licenses/>.
 
 mcall-prologues
-Target Report Mask(CALL_PROLOGUES)
+Target Mask(CALL_PROLOGUES)
 Use subroutines for function prologues and epilogues.
 
 mmcu=
@@ -27,7 +27,7 @@ Target RejectNegative Joined Var(avr_mmcu) MissingArgError(missing device or arc
 -mmcu=MCU	Select the target MCU.
 
 mgas-isr-prologues
-Target Report Var(avr_gasisr_prologues) UInteger Init(0)
+Target Var(avr_gasisr_prologues) UInteger Init(0)
 Allow usage of __gcc_isr pseudo instructions in ISR prologues and epilogues.
 
 mn-flash=
@@ -35,100 +35,100 @@ Target RejectNegative Joined Var(avr_n_flash) UInteger Init(-1)
 Set the number of 64 KiB flash segments.
 
 mskip-bug
-Target Report Mask(SKIP_BUG)
+Target Mask(SKIP_BUG)
 Indicate presence of a processor erratum.
 
 mrmw
-Target Report Mask(RMW)
+Target Mask(RMW)
 Enable Read-Modify-Write (RMW) instructions support/use.
 
 mdeb
-Target Report Undocumented Mask(ALL_DEBUG)
+Target Undocumented Mask(ALL_DEBUG)
 
 mlog=
 Target RejectNegative Joined Undocumented Var(avr_log_details)
 
 mshort-calls
-Target Report RejectNegative Mask(SHORT_CALLS)
+Target RejectNegative Mask(SHORT_CALLS)
 Use RJMP / RCALL even though CALL / JMP are available.
 
 mint8
-Target Report Mask(INT8)
+Target Mask(INT8)
 Use an 8-bit 'int' type.
 
 mno-interrupts
-Target Report RejectNegative Mask(NO_INTERRUPTS)
+Target RejectNegative Mask(NO_INTERRUPTS)
 Change the stack pointer without disabling interrupts.
 
 mbranch-cost=
-Target Report Joined RejectNegative UInteger Var(avr_branch_cost) Init(0)
+Target Joined RejectNegative UInteger Var(avr_branch_cost) Init(0)
 Set the branch costs for conditional branch instructions.  Reasonable values are small, non-negative integers.  The default branch cost is 0.
 
 mmain-is-OS_task
-Target Report Mask(MAIN_IS_OS_TASK)
+Target Mask(MAIN_IS_OS_TASK)
 Treat main as if it had attribute OS_task.
 
 morder1
-Target Report Undocumented Mask(ORDER_1)
+Target Undocumented Mask(ORDER_1)
 
 morder2
-Target Report Undocumented Mask(ORDER_2)
+Target Undocumented Mask(ORDER_2)
 
 mtiny-stack
-Target Report Mask(TINY_STACK)
+Target Mask(TINY_STACK)
 Change only the low 8 bits of the stack pointer.
 
 mrelax
-Target Report
+Target
 Relax branches.
 
 mpmem-wrap-around
-Target Report
+Target
 Make the linker relaxation machine assume that a program counter wrap-around occurs.
 
 maccumulate-args
-Target Report Mask(ACCUMULATE_OUTGOING_ARGS)
+Target Mask(ACCUMULATE_OUTGOING_ARGS)
 Accumulate outgoing function arguments and acquire/release the needed stack space for outgoing function arguments in function prologue/epilogue.  Without this option, outgoing arguments are pushed before calling a function and popped afterwards.  This option can lead to reduced code size for functions that call many functions that get their arguments on the stack like, for example printf.
 
 mstrict-X
-Target Report Var(avr_strict_X) Init(0)
+Target Var(avr_strict_X) Init(0)
 When accessing RAM, use X as imposed by the hardware, i.e. just use pre-decrement, post-increment and indirect addressing with the X register.  Without this option, the compiler may assume that there is an addressing mode X+const similar to Y+const and Z+const and emit instructions to emulate such an addressing mode for X.
 
 ;; For rationale behind -msp8 see explanation in avr.h.
 msp8
-Target Report RejectNegative Var(avr_sp8) Init(0)
+Target RejectNegative Var(avr_sp8) Init(0)
 The device has no SPH special function register. This option will be overridden by the compiler driver with the correct setting if presence/absence of SPH can be deduced from -mmcu=MCU.
 
 Waddr-space-convert
-Warning C Report Var(avr_warn_addr_space_convert) Init(0)
+Warning C Var(avr_warn_addr_space_convert) Init(0)
 Warn if the address space of an address is changed.
 
 Wmisspelled-isr
-Warning C C++ Report Var(avr_warn_misspelled_isr) Init(1)
+Warning C C++ Var(avr_warn_misspelled_isr) Init(1)
 Warn if the ISR is misspelled, i.e. without __vector prefix. Enabled by default.
 
 mfract-convert-truncate
-Target Report Mask(FRACT_CONV_TRUNC)
+Target Mask(FRACT_CONV_TRUNC)
 Allow to use truncation instead of rounding towards zero for fractional fixed-point types.
 
 mabsdata
-Target Report Mask(ABSDATA)
+Target Mask(ABSDATA)
 Assume that all data in static storage can be accessed by LDS / STS.  This option is only useful for reduced Tiny devices.
 
 mdouble=
-Target Report Joined RejectNegative Var(avr_double) Init(0) Enum(avr_bits_e)
+Target Joined RejectNegative Var(avr_double) Init(0) Enum(avr_bits_e)
 -mdouble=<BITS>	Use <BITS> bits wide double type.
 
 mlong-double=
-Target Report Joined RejectNegative Var(avr_long_double) Init(0) Enum(avr_bits_e)
+Target Joined RejectNegative Var(avr_long_double) Init(0) Enum(avr_bits_e)
 -mlong-double=<BITS>	Use <BITS> bits wide long double type.
 
 nodevicelib
-Driver Target Report RejectNegative
+Driver Target RejectNegative
 Do not link against the device-specific library lib<MCU>.a.
 
 nodevicespecs
-Driver Target Report RejectNegative
+Driver Target RejectNegative
 Do not use the device-specific specs file device-specs/specs-<MCU>.
 
 Enum
diff --git a/gcc/config/bfin/bfin.opt b/gcc/config/bfin/bfin.opt
index afda508c22e..cf5ba80bc24 100644
--- a/gcc/config/bfin/bfin.opt
+++ b/gcc/config/bfin/bfin.opt
@@ -44,28 +44,28 @@ Target RejectNegative Joined
 Specify the name of the target CPU.
 
 momit-leaf-frame-pointer
-Target Report Mask(OMIT_LEAF_FRAME_POINTER)
+Target Mask(OMIT_LEAF_FRAME_POINTER)
 Omit frame pointer for leaf functions.
 
 mlow64k
-Target Report Mask(LOW_64K)
+Target Mask(LOW_64K)
 Program is entirely located in low 64k of memory.
 
 mcsync-anomaly
-Target Report Var(bfin_csync_anomaly) Init(-1)
+Target Var(bfin_csync_anomaly) Init(-1)
 Work around a hardware anomaly by adding a number of NOPs before a
 CSYNC or SSYNC instruction.
 
 mspecld-anomaly
-Target Report Var(bfin_specld_anomaly) Init(-1)
+Target Var(bfin_specld_anomaly) Init(-1)
 Avoid speculative loads to work around a hardware anomaly.
 
 mid-shared-library
-Target Report Mask(ID_SHARED_LIBRARY)
+Target Mask(ID_SHARED_LIBRARY)
 Enabled ID based shared library.
 
 mleaf-id-shared-library
-Target Report Mask(LEAF_ID_SHARED_LIBRARY)
+Target Mask(LEAF_ID_SHARED_LIBRARY)
 Generate code that won't be linked against any other ID shared libraries,
 but may be used as a shared library.
 
@@ -74,45 +74,45 @@ Target RejectNegative Joined UInteger Var(bfin_library_id)
 ID of shared library to build.
 
 msep-data
-Target Report Mask(SEP_DATA)
+Target Mask(SEP_DATA)
 Enable separate data segment.
 
 mlong-calls
-Target Report Mask(LONG_CALLS)
+Target Mask(LONG_CALLS)
 Avoid generating pc-relative calls; use indirection.
 
 mfast-fp
-Target Report Mask(FAST_FP)
+Target Mask(FAST_FP)
 Link with the fast floating-point library.
 
 mfdpic
-Target Report Mask(FDPIC)
+Target Mask(FDPIC)
 Enable Function Descriptor PIC mode.
 
 minline-plt
-Target Report Mask(INLINE_PLT)
+Target Mask(INLINE_PLT)
 Enable inlining of PLT in function calls.
 
 mstack-check-l1
-Target Report Mask(STACK_CHECK_L1)
+Target Mask(STACK_CHECK_L1)
 Do stack checking using bounds in L1 scratch memory.
 
 mmulticore
-Target Report Mask(MULTICORE)
+Target Mask(MULTICORE)
 Enable multicore support.
 
 mcorea
-Target Report Mask(COREA)
+Target Mask(COREA)
 Build for Core A.
 
 mcoreb
-Target Report Mask(COREB)
+Target Mask(COREB)
 Build for Core B.
 
 msdram
-Target Report Mask(SDRAM)
+Target Mask(SDRAM)
 Build for SDRAM.
 
 micplb
-Target Report Mask(ICPLB)
+Target Mask(ICPLB)
 Assume ICPLBs are enabled at runtime.
diff --git a/gcc/config/bpf/bpf.opt b/gcc/config/bpf/bpf.opt
index 6aa858408f1..1782718f2f3 100644
--- a/gcc/config/bpf/bpf.opt
+++ b/gcc/config/bpf/bpf.opt
@@ -111,17 +111,17 @@ Enum(bpf_kernel) String(5.2) Value(LINUX_V5_2)
 ; Use xBPF extensions.
 
 mxbpf
-Target Report Mask(XBPF)
+Target Mask(XBPF)
 Generate xBPF.
 
 ; Selecting big endian or little endian targets.
 
 mbig-endian
-Target RejectNegative Report Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Generate big-endian eBPF.
 
 mlittle-endian
-Target RejectNegative Report InverseMask(BIG_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN)
 Generate little-endian eBPF.
 
 mframe-limit=
diff --git a/gcc/config/c6x/c6x.opt b/gcc/config/c6x/c6x.opt
index 16867a6932d..d0042fa467f 100644
--- a/gcc/config/c6x/c6x.opt
+++ b/gcc/config/c6x/c6x.opt
@@ -26,11 +26,11 @@ SourceInclude
 config/c6x/c6x-opts.h
 
 mbig-endian
-Target Report RejectNegative Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Use big-endian byte order.
 
 mlittle-endian
-Target Report RejectNegative InverseMask(BIG_ENDIAN, LITTLE_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN, LITTLE_ENDIAN)
 Use little-endian byte order.
 
 msim
@@ -59,7 +59,7 @@ Target Mask(DSBT)
 Compile for the DSBT shared library ABI.
 
 mlong-calls
-Target Report Mask(LONG_CALLS)
+Target Mask(LONG_CALLS)
 Avoid generating pc-relative calls; use indirection.
 
 march=
diff --git a/gcc/config/cr16/cr16.opt b/gcc/config/cr16/cr16.opt
index f82c1d633fb..1d2a6a12131 100644
--- a/gcc/config/cr16/cr16.opt
+++ b/gcc/config/cr16/cr16.opt
@@ -23,11 +23,11 @@ Target
 Use simulator runtime.
 
 mbit-ops
-Target Report Mask(BIT_OPS)
+Target Mask(BIT_OPS)
 Generate SBIT, CBIT instructions.
 
 mmac
-Target Report Mask(MAC)
+Target Mask(MAC)
 Support multiply accumulate instructions.
 
 mdebug-addr
diff --git a/gcc/config/cris/cris.opt b/gcc/config/cris/cris.opt
index e574a0a4dbc..f1f66e76639 100644
--- a/gcc/config/cris/cris.opt
+++ b/gcc/config/cris/cris.opt
@@ -41,111 +41,111 @@
 ; driver-like program that gets a mapping of I/O registers (all
 ; on the same page, including the TLB registers).
 mmul-bug-workaround
-Target Report Mask(MUL_BUG)
+Target Mask(MUL_BUG)
 Work around bug in multiplication instruction.
 
 ; TARGET_ETRAX4_ADD: Instruction-set additions from Etrax 4 and up.
 ; (Just "lz".)
 metrax4
-Target Report Mask(ETRAX4_ADD)
+Target Mask(ETRAX4_ADD)
 Compile for ETRAX 4 (CRIS v3).
 
 ; See cris_handle_option.
 metrax100
-Target Report RejectNegative
+Target RejectNegative
 Compile for ETRAX 100 (CRIS v8).
 
 ; See cris_handle_option.
 mno-etrax100
-Target Report RejectNegative Undocumented
+Target RejectNegative Undocumented
 
 mpdebug
-Target Report Mask(PDEBUG)
+Target Mask(PDEBUG)
 Emit verbose debug information in assembly code.
 
 ; TARGET_CCINIT: Whether to use condition-codes generated by
 ; insns other than the immediately preceding compare/test insn.
 ; Used to check for errors in notice_update_cc.
 mcc-init
-Target Report Mask(CCINIT)
+Target Mask(CCINIT)
 Do not use condition codes from normal instructions.
 
 ; TARGET_SIDE_EFFECT_PREFIXES: Whether to use side-effect
 ; patterns.  Used to debug the [rx=ry+i] type patterns.
 mside-effects
-Target Report RejectNegative Mask(SIDE_EFFECT_PREFIXES) Undocumented
+Target RejectNegative Mask(SIDE_EFFECT_PREFIXES) Undocumented
 
 mno-side-effects
-Target Report RejectNegative InverseMask(SIDE_EFFECT_PREFIXES)
+Target RejectNegative InverseMask(SIDE_EFFECT_PREFIXES)
 Do not emit addressing modes with side-effect assignment.
 
 ; TARGET_STACK_ALIGN: Whether to *keep* (not force) alignment of
 ; stack at 16 (or 32, depending on TARGET_ALIGN_BY_32) bits.
 mstack-align
-Target Report RejectNegative Mask(STACK_ALIGN) Undocumented
+Target RejectNegative Mask(STACK_ALIGN) Undocumented
 
 mno-stack-align
-Target Report RejectNegative InverseMask(STACK_ALIGN)
+Target RejectNegative InverseMask(STACK_ALIGN)
 Do not tune stack alignment.
 
 ; TARGET_DATA_ALIGN: Whether to do alignment on individual
 ; modifiable objects.
 mdata-align
-Target Report RejectNegative Mask(DATA_ALIGN) Undocumented
+Target RejectNegative Mask(DATA_ALIGN) Undocumented
 
 mno-data-align
-Target Report RejectNegative InverseMask(DATA_ALIGN)
+Target RejectNegative InverseMask(DATA_ALIGN)
 Do not tune writable data alignment.
 
 ; TARGET_CONST_ALIGN: Whether to do alignment on individual
 ; non-modifiable objects.
 mconst-align
-Target Report RejectNegative Mask(CONST_ALIGN) Undocumented
+Target RejectNegative Mask(CONST_ALIGN) Undocumented
 
 mno-const-align
-Target Report RejectNegative InverseMask(CONST_ALIGN)
+Target RejectNegative InverseMask(CONST_ALIGN)
 Do not tune code and read-only data alignment.
 
 ; See cris_handle_option.
 m32-bit
-Target Report RejectNegative Undocumented
+Target RejectNegative Undocumented
 
 ; See cris_handle_option.
 m32bit
-Target Report RejectNegative
+Target RejectNegative
 Align code and data to 32 bits.
 
 ; See cris_handle_option.
 m16-bit
-Target Report RejectNegative Undocumented
+Target RejectNegative Undocumented
 
 ; See cris_handle_option.
 m16bit
-Target Report RejectNegative Undocumented
+Target RejectNegative Undocumented
 
 ; See cris_handle_option.
 m8-bit
-Target Report RejectNegative Undocumented
+Target RejectNegative Undocumented
 
 ; See cris_handle_option.
 m8bit
-Target Report RejectNegative
+Target RejectNegative
 Don't align items in code or data.
 
 ; TARGET_PROLOGUE_EPILOGUE: Whether or not to omit function
 ; prologue and epilogue.
 mprologue-epilogue
-Target Report RejectNegative Mask(PROLOGUE_EPILOGUE) Undocumented
+Target RejectNegative Mask(PROLOGUE_EPILOGUE) Undocumented
 
 mno-prologue-epilogue
-Target Report RejectNegative InverseMask(PROLOGUE_EPILOGUE)
+Target RejectNegative InverseMask(PROLOGUE_EPILOGUE)
 Do not emit function prologue or epilogue.
 
 ; We have to handle this m-option here since we can't wash it
 ; off in both CC1_SPEC and CC1PLUS_SPEC.
 
 mbest-lib-options
-Target Report RejectNegative
+Target RejectNegative
 Use the most feature-enabling options allowed by other options.
 
 ; FIXME: The following comment relates to gcc before cris.opt.
@@ -154,37 +154,37 @@ Use the most feature-enabling options allowed by other options.
 ; gcc.c to forget it, if there's a "later" -mbest-lib-options.
 ; Kludgy, but needed for some multilibbed files.
 moverride-best-lib-options
-Target Report RejectNegative
+Target RejectNegative
 Override -mbest-lib-options.
 
 mcpu=
-Target Report RejectNegative Joined Undocumented Var(cris_cpu_str)
+Target RejectNegative Joined Undocumented Var(cris_cpu_str)
 
 march=
-Target Report RejectNegative Joined Var(cris_cpu_str)
+Target RejectNegative Joined Var(cris_cpu_str)
 -march=ARCH	Generate code for the specified chip or CPU version.
 
 mtune=
-Target Report RejectNegative Joined Var(cris_tune_str)
+Target RejectNegative Joined Var(cris_tune_str)
 -mtune=ARCH	Tune alignment for the specified chip or CPU version.
 
 mmax-stackframe=
-Target Report RejectNegative Joined Var(cris_max_stackframe_str)
+Target RejectNegative Joined Var(cris_max_stackframe_str)
 -mmax-stackframe=SIZE	Warn when a stackframe is larger than the specified size.
 
 max-stackframe=
-Target Report RejectNegative Joined Undocumented Var(cris_max_stackframe_str)
+Target RejectNegative Joined Undocumented Var(cris_max_stackframe_str)
 
 mtrap-using-break8
-Target Report Var(cris_trap_using_break8) Init(2)
+Target Var(cris_trap_using_break8) Init(2)
 Emit traps as \"break 8\", default for CRIS v3 and up.  If disabled, calls to abort() are used.
 
 mtrap-unaligned-atomic
-Target Report Var(cris_trap_unaligned_atomic) Init(2)
+Target Var(cris_trap_unaligned_atomic) Init(2)
 Emit checks causing \"break 8\" instructions to execute when applying atomic builtins on misaligned memory.
 
 munaligned-atomic-may-use-library
-Target Report Var(cris_atomics_calling_libfunc) Init(2)
+Target Var(cris_atomics_calling_libfunc) Init(2)
 Handle atomic builtins that may be applied to unaligned data by calling library functions. Overrides -mtrap-unaligned-atomic.
 
 ; TARGET_SVINTO: Currently this just affects alignment.  FIXME:
diff --git a/gcc/config/cris/elf.opt b/gcc/config/cris/elf.opt
index 103c71278bb..f32b0c6bcf9 100644
--- a/gcc/config/cris/elf.opt
+++ b/gcc/config/cris/elf.opt
@@ -19,7 +19,7 @@
 ; <http://www.gnu.org/licenses/>.
 
 melf
-Target Report RejectNegative Undocumented
+Target RejectNegative Undocumented
 
 sim
 Driver JoinedOrMissing
diff --git a/gcc/config/csky/csky.opt b/gcc/config/csky/csky.opt
index 505a7642293..d5fbbdcd6c1 100644
--- a/gcc/config/csky/csky.opt
+++ b/gcc/config/csky/csky.opt
@@ -27,7 +27,7 @@ config/csky/csky_opts.h
 
 ; For backward compatibility only.
 march=ck803s
-Target Report Var(flag_arch_ck803s) Undocumented
+Target Var(flag_arch_ck803s) Undocumented
 
 march=
 Target RejectNegative ToLower Joined Enum(csky_arch) Var(csky_arch_option) Save
@@ -40,18 +40,18 @@ Specify the target processor.
 ;; Endianness options.
 
 mbig-endian
-Target RejectNegative Report Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Generate big-endian code.
 
 EB
-Target RejectNegative Report Alias(mbig-endian) Undocumented
+Target RejectNegative Alias(mbig-endian) Undocumented
 
 mlittle-endian
-Target RejectNegative Report InverseMask(BIG_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN)
 Generate little-endian code.
 
 EL
-Target RejectNegative Report Alias(mlittle-endian) Undocumented
+Target RejectNegative Alias(mlittle-endian) Undocumented
 
 ;; Floating point options.  These affect code generation but not
 ;; assembly.
@@ -90,11 +90,11 @@ Target RejectNegative Joined Enum(csky_fpu) Var(csky_fpu_index) Init(TARGET_FPU_
 Specify the target floating-point hardware/format.
 
 mdouble-float
-Target Report Var(TARGET_DOUBLE_FLOAT) Init(-1)
+Target Var(TARGET_DOUBLE_FLOAT) Init(-1)
 Generate C-SKY FPU double float instructions (default for hard float).
 
 mfdivdu
-Target Report Var(TARGET_FDIVDU) Init(-1)
+Target Var(TARGET_FDIVDU) Init(-1)
 Generate frecipd/fsqrtd/fdivd instructions (default for hard float).
 
 ;; Instruction set extensions.  Most of these don't affect code
@@ -102,95 +102,95 @@ Generate frecipd/fsqrtd/fdivd instructions (default for hard float).
 ;; There are builtin preprocessor defines for each of these.
 
 melrw
-Target Report Var(TARGET_ELRW) Init(-1)
+Target Var(TARGET_ELRW) Init(-1)
 Enable the extended LRW instruction (default for CK801).
 
 mistack
-Target Report Mask(ISTACK)
+Target Mask(ISTACK)
 Enable interrupt stack instructions.
 
 mmp
-Target Report RejectNegative Mask(MP)
+Target RejectNegative Mask(MP)
 Enable multiprocessor instructions.
 
 mcp
-Target Report RejectNegative Mask(CP)
+Target RejectNegative Mask(CP)
 Enable coprocessor instructions.
 
 mcache
-Target Report RejectNegative Mask(CACHE)
+Target RejectNegative Mask(CACHE)
 Enable cache prefetch instructions.
 
 msecurity
-Target Report RejectNegative Mask(SECURITY)
+Target RejectNegative Mask(SECURITY)
 Enable C-SKY SECURE instructions.
 
 mmac
-Target Report RejectNegative Alias(msecurity) Undocumented
+Target RejectNegative Alias(msecurity) Undocumented
 
 mtrust
-Target Report RejectNegative Mask(TRUST)
+Target RejectNegative Mask(TRUST)
 Enable C-SKY TRUST instructions.
 
 mdsp
-Target Report RejectNegative Var(TARGET_DSP)
+Target RejectNegative Var(TARGET_DSP)
 Enable C-SKY DSP instructions.
 
 medsp
-Target Report RejectNegative Mask(EDSP)
+Target RejectNegative Mask(EDSP)
 Enable C-SKY Enhanced DSP instructions.
 
 mvdsp
-Target Report RejectNegative Mask(VDSP)
+Target RejectNegative Mask(VDSP)
 Enable C-SKY Vector DSP instructions.
 
 ;; Code generation options not passed to the assembler.
 
 mdiv
-Target Report Var(TARGET_DIV) Init(-1)
+Target Var(TARGET_DIV) Init(-1)
 Generate divide instructions.
 
 msmart
-Target Report Var(TARGET_MINI_REGISTERS) Init(-1)
+Target Var(TARGET_MINI_REGISTERS) Init(-1)
 Generate code for Smart Mode.
 
 mhigh-registers
-Target Report Var(TARGET_HIGH_REGISTERS) Init(-1)
+Target Var(TARGET_HIGH_REGISTERS) Init(-1)
 Enable use of R16-R31 (default).
 
 manchor
-Target Report Var(TARGET_ANCHOR)
+Target Var(TARGET_ANCHOR)
 Generate code using global anchor symbol addresses.
 
 mpushpop
-Target Report Var(TARGET_PUSHPOP) Init(1)
+Target Var(TARGET_PUSHPOP) Init(1)
 Generate push/pop instructions (default).
 
 mmultiple-stld
-Target Report Var(TARGET_MULTIPLE_STLD) Init(-1)
+Target Var(TARGET_MULTIPLE_STLD) Init(-1)
 Generate stm/ldm instructions (default).
 
 mstm
-Target Report Alias(mmultiple-stld) Undocumented
+Target Alias(mmultiple-stld) Undocumented
 
 mconstpool
-Target Report Var(TARGET_CONSTANT_POOL) Init(-1)
+Target Var(TARGET_CONSTANT_POOL) Init(-1)
 Generate constant pools in the compiler instead of assembler.
 
 mstack-size
-Target Report Var(TARGET_STACK_SIZE) Init(0)
+Target Var(TARGET_STACK_SIZE) Init(0)
 Emit .stack_size directives.
 
 mccrt
-Target Report Var(TARGET_LIBCCRT) Init(0)
+Target Var(TARGET_LIBCCRT) Init(0)
 Generate code for C-SKY compiler runtime instead of libgcc.
 
 mbranch-cost=
-Target Report Joined RejectNegative UInteger Var(csky_branch_cost) Init(1)
+Target Joined RejectNegative UInteger Var(csky_branch_cost) Init(1)
 Set the branch costs to roughly the specified number of instructions.
 
 msched-prolog
-Target Report Var(flag_sched_prolog) Init(0)
+Target Var(flag_sched_prolog) Init(0)
 Permit scheduling of function prologue and epilogue sequences.
 
 msim
diff --git a/gcc/config/darwin.opt b/gcc/config/darwin.opt
index 5b75536378d..aa4dea2f8dd 100644
--- a/gcc/config/darwin.opt
+++ b/gcc/config/darwin.opt
@@ -30,7 +30,7 @@ dependency-file
 C ObjC C++ ObjC++ Separate Alias(MF) MissingArgError(missing filename after %qs)
 
 fapple-kext
-Target Report C++ Var(flag_apple_kext)
+Target C++ Var(flag_apple_kext)
 Generate code for darwin loadable kernel extensions.
 
 iframework
@@ -38,28 +38,28 @@ Target RejectNegative C ObjC C++ ObjC++ Joined Separate
 -iframework <dir>	Add <dir> to the end of the system framework include path.
 
 mconstant-cfstrings
-Target Report Var(darwin_constant_cfstrings) Init(1)
+Target Var(darwin_constant_cfstrings) Init(1)
 Generate compile-time CFString objects.
 
 Wnonportable-cfstrings
-Target Report Var(darwin_warn_nonportable_cfstrings) Init(1) Warning
+Target Var(darwin_warn_nonportable_cfstrings) Init(1) Warning
 Warn if constant CFString objects contain non-portable characters.
 
 ; Use new-style pic stubs if this is true, x86 only so far.
 matt-stubs
-Target Report Var(darwin_macho_att_stub) Init(1)
+Target Var(darwin_macho_att_stub) Init(1)
 Generate AT&T-style stubs for Mach-O.
 
 mdynamic-no-pic
-Target Common Report Mask(MACHO_DYNAMIC_NO_PIC)
+Target Common Mask(MACHO_DYNAMIC_NO_PIC)
 Generate code suitable for executables (NOT shared libs).
 
 mfix-and-continue
-Target Report Var(darwin_fix_and_continue)
+Target Var(darwin_fix_and_continue)
 Generate code suitable for fast turn around debugging.
 
 mkernel
-Target Report Var(flag_mkernel)
+Target Var(flag_mkernel)
 Generate code for the kernel or loadable kernel extensions.
 
 ; The Init here is for the convenience of GCC developers, so that cc1
@@ -67,24 +67,24 @@ Generate code for the kernel or loadable kernel extensions.
 ; driver will always pass a -mmacosx-version-min, so in normal use the
 ; Init is never used.
 mmacosx-version-min=
-Target RejectNegative Joined Report Var(darwin_macosx_version_min) Init(DEF_MIN_OSX_VERSION)
+Target RejectNegative Joined Var(darwin_macosx_version_min) Init(DEF_MIN_OSX_VERSION)
 The earliest macOS version on which this program will run.
 
 ; Really, only relevant to PowerPC which has a 4 byte bool by default.
 mone-byte-bool
-Target RejectNegative Report Var(darwin_one_byte_bool)
+Target RejectNegative Var(darwin_one_byte_bool)
 Set sizeof(bool) to 1.
 
 msymbol-stubs
-Target Report Var(darwin_symbol_stubs) Init(0)
+Target Var(darwin_symbol_stubs) Init(0)
 Force generation of external symbol indirection stubs.
 
 ; Some code-gen may be improved / adjusted if the linker is sufficiently modern.
 mtarget-linker=
-Target RejectNegative Joined Report Alias(mtarget-linker)
+Target RejectNegative Joined Alias(mtarget-linker)
 
 mtarget-linker
-Target RejectNegative Joined Separate Report Var(darwin_target_linker) Init(LD64_VERSION)
+Target RejectNegative Joined Separate Var(darwin_target_linker) Init(LD64_VERSION)
 -mtarget-linker <version>	Specify that ld64 <version> is the toolchain linker for the current invocation.
 
 ; Driver options.
diff --git a/gcc/config/fr30/fr30.opt b/gcc/config/fr30/fr30.opt
index 0a65cc454e3..5178b0c006e 100644
--- a/gcc/config/fr30/fr30.opt
+++ b/gcc/config/fr30/fr30.opt
@@ -19,7 +19,7 @@
 ; <http://www.gnu.org/licenses/>.
 
 msmall-model
-Target Report Mask(SMALL_MODEL)
+Target Mask(SMALL_MODEL)
 Assume small address space.
 
 mno-lsim
diff --git a/gcc/config/frv/frv.opt b/gcc/config/frv/frv.opt
index 4b4fe70e656..f75f2ea84c8 100644
--- a/gcc/config/frv/frv.opt
+++ b/gcc/config/frv/frv.opt
@@ -26,19 +26,19 @@ Variable
 frv_cpu_t frv_cpu_type = CPU_TYPE
 
 macc-4
-Target Report RejectNegative Mask(ACC_4)
+Target RejectNegative Mask(ACC_4)
 Use 4 media accumulators.
 
 macc-8
-Target Report RejectNegative InverseMask(ACC_4, ACC_8)
+Target RejectNegative InverseMask(ACC_4, ACC_8)
 Use 8 media accumulators.
 
 malign-labels
-Target Report Mask(ALIGN_LABELS)
+Target Mask(ALIGN_LABELS)
 Enable label alignment optimizations.
 
 malloc-cc
-Target Report RejectNegative Mask(ALLOC_CC)
+Target RejectNegative Mask(ALLOC_CC)
 Dynamically allocate cc registers.
 
 ; We used to default the branch cost to 2, but it was changed it to 1 to avoid
@@ -49,7 +49,7 @@ Target RejectNegative Joined UInteger Var(frv_branch_cost_int) Init(1)
 Set the cost of branches.
 
 mcond-exec
-Target Report Mask(COND_EXEC)
+Target Mask(COND_EXEC)
 Enable conditional execution other than moves/scc.
 
 mcond-exec-insns=
@@ -61,7 +61,7 @@ Target RejectNegative Joined UInteger Var(frv_condexec_temps) Init(4)
 Change the number of temporary registers that are available to conditionally-executed sequences.
 
 mcond-move
-Target Report Mask(COND_MOVE)
+Target Mask(COND_MOVE)
 Enable conditional moves.
 
 mcpu=
@@ -118,75 +118,75 @@ mdebug-stack
 Target Undocumented Var(TARGET_DEBUG_STACK)
 
 mdouble
-Target Report Mask(DOUBLE)
+Target Mask(DOUBLE)
 Use fp double instructions.
 
 mdword
-Target Report Mask(DWORD)
+Target Mask(DWORD)
 Change the ABI to allow double word insns.
 
 mfdpic
-Target Report Mask(FDPIC)
+Target Mask(FDPIC)
 Enable Function Descriptor PIC mode.
 
 mfixed-cc
-Target Report RejectNegative InverseMask(ALLOC_CC, FIXED_CC)
+Target RejectNegative InverseMask(ALLOC_CC, FIXED_CC)
 Just use icc0/fcc0.
 
 mfpr-32
-Target Report RejectNegative Mask(FPR_32)
+Target RejectNegative Mask(FPR_32)
 Only use 32 FPRs.
 
 mfpr-64
-Target Report RejectNegative InverseMask(FPR_32, FPR_64)
+Target RejectNegative InverseMask(FPR_32, FPR_64)
 Use 64 FPRs.
 
 mgpr-32
-Target Report RejectNegative Mask(GPR_32)
+Target RejectNegative Mask(GPR_32)
 Only use 32 GPRs.
 
 mgpr-64
-Target Report RejectNegative InverseMask(GPR_32, GPR_64)
+Target RejectNegative InverseMask(GPR_32, GPR_64)
 Use 64 GPRs.
 
 mgprel-ro
-Target Report Mask(GPREL_RO)
+Target Mask(GPREL_RO)
 Enable use of GPREL for read-only data in FDPIC.
 
 mhard-float
-Target Report RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT)
+Target RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT)
 Use hardware floating point.
 
 minline-plt
-Target Report Mask(INLINE_PLT)
+Target Mask(INLINE_PLT)
 Enable inlining of PLT in function calls.
 
 mlibrary-pic
-Target Report Mask(LIBPIC)
+Target Mask(LIBPIC)
 Enable PIC support for building libraries.
 
 mlinked-fp
-Target Report Mask(LINKED_FP)
+Target Mask(LINKED_FP)
 Follow the EABI linkage requirements.
 
 mlong-calls
-Target Report Mask(LONG_CALLS)
+Target Mask(LONG_CALLS)
 Disallow direct calls to global functions.
 
 mmedia
-Target Report Mask(MEDIA)
+Target Mask(MEDIA)
 Use media instructions.
 
 mmuladd
-Target Report Mask(MULADD)
+Target Mask(MULADD)
 Use multiply add/subtract instructions.
 
 mmulti-cond-exec
-Target Report Mask(MULTI_CE)
+Target Mask(MULTI_CE)
 Enable optimizing &&/|| in conditional execution.
 
 mnested-cond-exec
-Target Report Mask(NESTED_CE)
+Target Mask(NESTED_CE)
 Enable nested conditional execution optimizations.
 
 ; Not used by the compiler proper.
@@ -195,15 +195,15 @@ Target RejectNegative
 Do not mark ABI switches in e_flags.
 
 moptimize-membar
-Target Report Mask(OPTIMIZE_MEMBAR)
+Target Mask(OPTIMIZE_MEMBAR)
 Remove redundant membars.
 
 mpack
-Target Report Mask(PACK)
+Target Mask(PACK)
 Pack VLIW instructions.
 
 mscc
-Target Report Mask(SCC)
+Target Mask(SCC)
 Enable setting GPRs to the result of comparisons.
 
 msched-lookahead=
@@ -211,15 +211,15 @@ Target RejectNegative Joined UInteger Var(frv_sched_lookahead) Init(4)
 Change the amount of scheduler lookahead.
 
 msoft-float
-Target Report RejectNegative Mask(SOFT_FLOAT)
+Target RejectNegative Mask(SOFT_FLOAT)
 Use software floating point.
 
 mTLS
-Target Report RejectNegative Mask(BIG_TLS)
+Target RejectNegative Mask(BIG_TLS)
 Assume a large TLS segment.
 
 mtls
-Target Report RejectNegative InverseMask(BIG_TLS)
+Target RejectNegative InverseMask(BIG_TLS)
 Do not assume a large TLS segment.
 
 ; Not used by the compiler proper.
@@ -233,5 +233,5 @@ Target RejectNegative
 Link with the library-pic libraries.
 
 mvliw-branch
-Target Report Mask(VLIW_BRANCH)
+Target Mask(VLIW_BRANCH)
 Allow branches to be packed with other instructions.
diff --git a/gcc/config/ft32/ft32.opt b/gcc/config/ft32/ft32.opt
index cabe4b2a5bf..0283037277a 100644
--- a/gcc/config/ft32/ft32.opt
+++ b/gcc/config/ft32/ft32.opt
@@ -19,25 +19,25 @@
 ; <http://www.gnu.org/licenses/>.
 
 msim
-Target Report Mask(SIM)
+Target Mask(SIM)
 Target the software simulator.
 
 mlra
-Target Report Var(ft32_lra_flag) Init(0) Save
+Target Var(ft32_lra_flag) Init(0) Save
 Use LRA instead of reload.
 
 mnodiv
-Target Report Mask(NODIV)
+Target Mask(NODIV)
 Avoid use of the DIV and MOD instructions.
 
 mft32b
-Target Report Mask(FT32B)
+Target Mask(FT32B)
 Target the FT32B architecture.
 
 mcompress
-Target Report Mask(COMPRESS)
+Target Mask(COMPRESS)
 Enable FT32B code compression.
 
 mnopm
-Target Report Mask(NOPM)
+Target Mask(NOPM)
 Avoid placing any readable data in program memory.
diff --git a/gcc/config/gcn/gcn.opt b/gcc/config/gcn/gcn.opt
index b1ea56e020f..a0d791f1c33 100644
--- a/gcc/config/gcn/gcn.opt
+++ b/gcc/config/gcn/gcn.opt
@@ -43,31 +43,31 @@ Target RejectNegative Joined ToLower Enum(gpu_type) Var(gcn_tune) Init(PROCESSOR
 Specify the name of the target GPU.
 
 m32
-Target Report RejectNegative InverseMask(ABI64)
+Target RejectNegative InverseMask(ABI64)
 Generate code for a 32-bit ABI.
 
 m64
-Target Report RejectNegative Mask(ABI64)
+Target RejectNegative Mask(ABI64)
 Generate code for a 64-bit ABI.
 
 mgomp
-Target Report RejectNegative
+Target RejectNegative
 Enable OpenMP GPU offloading.
 
 bool flag_bypass_init_error = false
 
 mbypass-init-error
-Target Report RejectNegative Var(flag_bypass_init_error)
+Target RejectNegative Var(flag_bypass_init_error)
 
 bool flag_worker_partitioning = false
 
 macc-experimental-workers
-Target Report Var(flag_worker_partitioning) Init(0)
+Target Var(flag_worker_partitioning) Init(0)
 
 int stack_size_opt = -1
 
 mstack-size=
-Target Report RejectNegative Joined UInteger Var(stack_size_opt) Init(-1)
+Target RejectNegative Joined UInteger Var(stack_size_opt) Init(-1)
 -mstack-size=<number>	Set the private segment size per wave-front, in bytes.
 
 Wopenacc-dims
diff --git a/gcc/config/i386/cygming.opt b/gcc/config/i386/cygming.opt
index 73f14385837..f9d6d976654 100644
--- a/gcc/config/i386/cygming.opt
+++ b/gcc/config/i386/cygming.opt
@@ -27,7 +27,7 @@ Target RejectNegative
 Generate code for a DLL.
 
 mnop-fun-dllimport
-Target Report Var(TARGET_NOP_FUN_DLLIMPORT)
+Target Var(TARGET_NOP_FUN_DLLIMPORT)
 Ignore dllimport for functions.
 
 mthreads
@@ -51,14 +51,14 @@ Target Condition({defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS)})
 Compile code that relies on Cygwin DLL wrappers to support C++ operator new/delete replacement.
 
 fset-stack-executable
-Common Report Var(flag_setstackexecutable) Init(1) Optimization
+Common Var(flag_setstackexecutable) Init(1) Optimization
 For nested functions on stack executable permission is set.
 
 posix
 Driver
 
 fwritable-relocated-rdata
-Common Report Var(flag_writable_rel_rdata) Init(0)
+Common Var(flag_writable_rel_rdata) Init(0)
 Put relocated read-only data into .data section.
 
 ; Retain blank line above
diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
index e38baee81fc..be3a6cd50cd 100644
--- a/gcc/config/i386/i386.opt
+++ b/gcc/config/i386/i386.opt
@@ -194,35 +194,35 @@ enum ix86_veclibabi x_ix86_veclibabi_type
 
 ;; x86 options
 m128bit-long-double
-Target RejectNegative Report Mask(128BIT_LONG_DOUBLE) Save
+Target RejectNegative Mask(128BIT_LONG_DOUBLE) Save
 sizeof(long double) is 16.
 
 m80387
-Target Report Mask(80387) Save
+Target Mask(80387) Save
 Use hardware fp.
 
 m96bit-long-double
-Target RejectNegative Report InverseMask(128BIT_LONG_DOUBLE) Save
+Target RejectNegative InverseMask(128BIT_LONG_DOUBLE) Save
 sizeof(long double) is 12.
 
 mlong-double-80
-Target Report RejectNegative Negative(mlong-double-64) InverseMask(LONG_DOUBLE_64) Save
+Target RejectNegative Negative(mlong-double-64) InverseMask(LONG_DOUBLE_64) Save
 Use 80-bit long double.
 
 mlong-double-64
-Target Report RejectNegative Negative(mlong-double-128) Mask(LONG_DOUBLE_64) InverseMask(LONG_DOUBLE_128) Save
+Target RejectNegative Negative(mlong-double-128) Mask(LONG_DOUBLE_64) InverseMask(LONG_DOUBLE_128) Save
 Use 64-bit long double.
 
 mlong-double-128
-Target Report RejectNegative Negative(mlong-double-80) Mask(LONG_DOUBLE_128) InverseMask(LONG_DOUBLE_64) Save
+Target RejectNegative Negative(mlong-double-80) Mask(LONG_DOUBLE_128) InverseMask(LONG_DOUBLE_64) Save
 Use 128-bit long double.
 
 maccumulate-outgoing-args
-Target Report Mask(ACCUMULATE_OUTGOING_ARGS) Save
+Target Mask(ACCUMULATE_OUTGOING_ARGS) Save
 Reserve space for outgoing arguments in the function prologue.
 
 malign-double
-Target Report Mask(ALIGN_DOUBLE) Save
+Target Mask(ALIGN_DOUBLE) Save
 Align some doubles on dword boundary.
 
 malign-functions=
@@ -238,7 +238,7 @@ Target RejectNegative Joined UInteger
 Loop code aligned to this power of 2.
 
 malign-stringops
-Target RejectNegative Report InverseMask(NO_ALIGN_STRINGOPS, ALIGN_STRINGOPS) Save
+Target RejectNegative InverseMask(NO_ALIGN_STRINGOPS, ALIGN_STRINGOPS) Save
 Align destination of the string operations.
 
 malign-data=
@@ -325,15 +325,15 @@ mcpu=
 Target RejectNegative Joined Undocumented Alias(mtune=) Warn(%<-mcpu=%> is deprecated; use %<-mtune=%> or %<-march=%> instead)
 
 mfancy-math-387
-Target RejectNegative Report InverseMask(NO_FANCY_MATH_387, USE_FANCY_MATH_387) Save
+Target RejectNegative InverseMask(NO_FANCY_MATH_387, USE_FANCY_MATH_387) Save
 Generate sin, cos, sqrt for FPU.
 
 mforce-drap
-Target Report Var(ix86_force_drap)
+Target Var(ix86_force_drap)
 Always use Dynamic Realigned Argument Pointer (DRAP) to realign stack.
 
 mfp-ret-in-387
-Target Report Mask(FLOAT_RETURNS) Save
+Target Mask(FLOAT_RETURNS) Save
 Return values of functions in FPU registers.
 
 mfpmath=
@@ -370,50 +370,50 @@ Target RejectNegative Mask(80387) Save
 Use hardware fp.
 
 mieee-fp
-Target Report Mask(IEEE_FP) Save
+Target Mask(IEEE_FP) Save
 Use IEEE math for fp comparisons.
 
 minline-all-stringops
-Target Report Mask(INLINE_ALL_STRINGOPS) Save
+Target Mask(INLINE_ALL_STRINGOPS) Save
 Inline all known string operations.
 
 minline-stringops-dynamically
-Target Report Mask(INLINE_STRINGOPS_DYNAMICALLY) Save
+Target Mask(INLINE_STRINGOPS_DYNAMICALLY) Save
 Inline memset/memcpy string operations, but perform inline version only for small blocks.
 
 mintel-syntax
 Target Undocumented Alias(masm=, intel, att) Warn(%<-mintel-syntax%> and %<-mno-intel-syntax%> are deprecated; use %<-masm=intel%> and %<-masm=att%> instead)
 
 mms-bitfields
-Target Report Mask(MS_BITFIELD_LAYOUT) Save
+Target Mask(MS_BITFIELD_LAYOUT) Save
 Use native (MS) bitfield layout.
 
 mno-align-stringops
-Target RejectNegative Report Mask(NO_ALIGN_STRINGOPS) Undocumented Save
+Target RejectNegative Mask(NO_ALIGN_STRINGOPS) Undocumented Save
 
 mno-fancy-math-387
-Target RejectNegative Report Mask(NO_FANCY_MATH_387) Undocumented Save
+Target RejectNegative Mask(NO_FANCY_MATH_387) Undocumented Save
 
 mno-push-args
-Target RejectNegative Report Mask(NO_PUSH_ARGS) Undocumented Save
+Target RejectNegative Mask(NO_PUSH_ARGS) Undocumented Save
 
 mno-red-zone
-Target RejectNegative Report Mask(NO_RED_ZONE) Undocumented Save
+Target RejectNegative Mask(NO_RED_ZONE) Undocumented Save
 
 momit-leaf-frame-pointer
-Target Report Mask(OMIT_LEAF_FRAME_POINTER) Save
+Target Mask(OMIT_LEAF_FRAME_POINTER) Save
 Omit the frame pointer in leaf functions.
 
 mpc32
-Target RejectNegative Report
+Target RejectNegative
 Set 80387 floating-point precision to 32-bit.
 
 mpc64
-Target RejectNegative Report
+Target RejectNegative
 Set 80387 floating-point precision to 64-bit.
 
 mpc80
-Target RejectNegative Report
+Target RejectNegative
 Set 80387 floating-point precision to 80-bit.
 
 mpreferred-stack-boundary=
@@ -425,11 +425,11 @@ Target RejectNegative Joined UInteger Var(ix86_incoming_stack_boundary_arg)
 Assume incoming stack aligned to this power of 2.
 
 mpush-args
-Target Report InverseMask(NO_PUSH_ARGS, PUSH_ARGS) Save
+Target InverseMask(NO_PUSH_ARGS, PUSH_ARGS) Save
 Use push instructions to save outgoing arguments.
 
 mred-zone
-Target RejectNegative Report InverseMask(NO_RED_ZONE, RED_ZONE) Save
+Target RejectNegative InverseMask(NO_RED_ZONE, RED_ZONE) Save
 Use red-zone in the x86-64 code.
 
 mregparm=
@@ -437,7 +437,7 @@ Target RejectNegative Joined UInteger Var(ix86_regparm)
 Number of registers used to pass integer arguments.
 
 mrtd
-Target Report Mask(RTD) Save
+Target Mask(RTD) Save
 Alternate calling convention.
 
 msoft-float
@@ -449,11 +449,11 @@ Target RejectNegative Mask(SSEREGPARM) Save
 Use SSE register passing conventions for SF and DF mode.
 
 mstackrealign
-Target Report Var(ix86_force_align_arg_pointer)
+Target Var(ix86_force_align_arg_pointer)
 Realign stack in prologue.
 
 mstack-arg-probe
-Target Report Mask(STACK_PROBE) Save
+Target Mask(STACK_PROBE) Save
 Enable stack probing.
 
 mmemcpy-strategy=
@@ -511,7 +511,7 @@ EnumValue
 Enum(tls_dialect) String(gnu2) Value(TLS_DIALECT_GNU2)
 
 mtls-direct-seg-refs
-Target Report Mask(TLS_DIRECT_SEG_REFS)
+Target Mask(TLS_DIRECT_SEG_REFS)
 Use direct references against %gs when accessing tls data.
 
 mtune=
@@ -530,7 +530,7 @@ mdump-tune-features
 Target RejectNegative Var(ix86_dump_tunes)
 
 miamcu
-Target Report Mask(IAMCU)
+Target Mask(IAMCU)
 Generate code that conforms to Intel MCU psABI.
 
 mabi=
@@ -548,7 +548,7 @@ EnumValue
 Enum(calling_abi) String(ms) Value(MS_ABI)
 
 mcall-ms2sysv-xlogues
-Target Report Mask(CALL_MS2SYSV_XLOGUES) Save
+Target Mask(CALL_MS2SYSV_XLOGUES) Save
 Use libgcc stubs to save and restore registers clobbered by 64-bit Microsoft to System V ABI calls.
 
 mveclibabi=
@@ -566,28 +566,28 @@ EnumValue
 Enum(ix86_veclibabi) String(acml) Value(ix86_veclibabi_type_acml)
 
 mvect8-ret-in-mem
-Target Report Mask(VECT8_RETURNS) Save
+Target Mask(VECT8_RETURNS) Save
 Return 8-byte vectors in memory.
 
 mrecip
-Target Report Mask(RECIP) Save
+Target Mask(RECIP) Save
 Generate reciprocals instead of divss and sqrtss.
 
 mrecip=
-Target Report RejectNegative Joined Var(ix86_recip_name)
+Target RejectNegative Joined Var(ix86_recip_name)
 Control generation of reciprocal estimates.
 
 mcld
-Target Report Mask(CLD) Save
+Target Mask(CLD) Save
 Generate cld instruction in the function prologue.
 
 mvzeroupper
-Target Report Mask(VZEROUPPER) Save
+Target Mask(VZEROUPPER) Save
 Generate vzeroupper instruction before a transfer of control flow out of
 the function.
 
 mstv
-Target Report Mask(STV) Save
+Target Mask(STV) Save
 Disable Scalar to Vector optimization pass transforming 64-bit integer
 computations into a vector ones.
 
@@ -601,7 +601,7 @@ Target Alias(mprefer-vector-width=, 128, 256)
 Use 128-bit AVX instructions instead of 256-bit AVX instructions in the auto-vectorizer.
 
 mprefer-vector-width=
-Target Report RejectNegative Joined Var(prefer_vector_width_type) Enum(prefer_vector_width) Init(PVW_NONE) Save
+Target RejectNegative Joined Var(prefer_vector_width_type) Enum(prefer_vector_width) Init(PVW_NONE) Save
 Use given register vector width instructions instead of maximum register width in the auto-vectorizer.
 
 Enum
@@ -623,63 +623,63 @@ Enum(prefer_vector_width) String(512) Value(PVW_AVX512)
 ;; ISA support
 
 m32
-Target RejectNegative Negative(m64) Report InverseMask(ISA_64BIT) Var(ix86_isa_flags) Save
+Target RejectNegative Negative(m64) InverseMask(ISA_64BIT) Var(ix86_isa_flags) Save
 Generate 32bit i386 code.
 
 m64
-Target RejectNegative Negative(mx32) Report Mask(ABI_64) Var(ix86_isa_flags) Save
+Target RejectNegative Negative(mx32) Mask(ABI_64) Var(ix86_isa_flags) Save
 Generate 64bit x86-64 code.
 
 mx32
-Target RejectNegative Negative(m16) Report Mask(ABI_X32) Var(ix86_isa_flags) Save
+Target RejectNegative Negative(m16) Mask(ABI_X32) Var(ix86_isa_flags) Save
 Generate 32bit x86-64 code.
 
 m16
-Target RejectNegative Negative(m32) Report Mask(CODE16) InverseMask(ISA_64BIT) Var(ix86_isa_flags) Save
+Target RejectNegative Negative(m32) Mask(CODE16) InverseMask(ISA_64BIT) Var(ix86_isa_flags) Save
 Generate 16bit i386 code.
 
 mmmx
-Target Report Mask(ISA_MMX) Var(ix86_isa_flags) Save
+Target Mask(ISA_MMX) Var(ix86_isa_flags) Save
 Support MMX built-in functions.
 
 m3dnow
-Target Report Mask(ISA_3DNOW) Var(ix86_isa_flags) Save
+Target Mask(ISA_3DNOW) Var(ix86_isa_flags) Save
 Support 3DNow! built-in functions.
 
 m3dnowa
-Target Report Mask(ISA_3DNOW_A) Var(ix86_isa_flags) Save
+Target Mask(ISA_3DNOW_A) Var(ix86_isa_flags) Save
 Support Athlon 3Dnow! built-in functions.
 
 msse
-Target Report Mask(ISA_SSE) Var(ix86_isa_flags) Save
+Target Mask(ISA_SSE) Var(ix86_isa_flags) Save
 Support MMX and SSE built-in functions and code generation.
 
 msse2
-Target Report Mask(ISA_SSE2) Var(ix86_isa_flags) Save
+Target Mask(ISA_SSE2) Var(ix86_isa_flags) Save
 Support MMX, SSE and SSE2 built-in functions and code generation.
 
 msse3
-Target Report Mask(ISA_SSE3) Var(ix86_isa_flags) Save
+Target Mask(ISA_SSE3) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2 and SSE3 built-in functions and code generation.
 
 mssse3
-Target Report Mask(ISA_SSSE3) Var(ix86_isa_flags) Save
+Target Mask(ISA_SSSE3) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3 and SSSE3 built-in functions and code generation.
 
 msse4.1
-Target Report Mask(ISA_SSE4_1) Var(ix86_isa_flags) Save
+Target Mask(ISA_SSE4_1) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3 and SSE4.1 built-in functions and code generation.
 
 msse4.2
-Target Report Mask(ISA_SSE4_2) Var(ix86_isa_flags) Save
+Target Mask(ISA_SSE4_2) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1 and SSE4.2 built-in functions and code generation.
 
 msse4
-Target RejectNegative Report Mask(ISA_SSE4_2) Var(ix86_isa_flags) Save
+Target RejectNegative Mask(ISA_SSE4_2) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1 and SSE4.2 built-in functions and code generation.
 
 mno-sse4
-Target RejectNegative Report InverseMask(ISA_SSE4_1) Var(ix86_isa_flags) Save
+Target RejectNegative InverseMask(ISA_SSE4_1) Var(ix86_isa_flags) Save
 Do not support SSE4.1 and SSE4.2 built-in functions and code generation.
 
 msse5
@@ -687,262 +687,262 @@ Target Undocumented Alias(mavx) Warn(%<-msse5%> was removed)
 ;; Deprecated
 
 mavx
-Target Report Mask(ISA_AVX) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2 and AVX built-in functions and code generation.
 
 mavx2
-Target Report Mask(ISA_AVX2) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX2) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX and AVX2 built-in functions and code generation.
 
 mavx512f
-Target Report Mask(ISA_AVX512F) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512F) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F built-in functions and code generation.
 
 mavx512pf
-Target Report Mask(ISA_AVX512PF) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512PF) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512PF built-in functions and code generation.
 
 mavx512er
-Target Report Mask(ISA_AVX512ER) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512ER) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512ER built-in functions and code generation.
 
 mavx512cd
-Target Report Mask(ISA_AVX512CD) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512CD) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512CD built-in functions and code generation.
 
 mavx512dq
-Target Report Mask(ISA_AVX512DQ) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512DQ) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512DQ built-in functions and code generation.
 
 mavx512bw
-Target Report Mask(ISA_AVX512BW) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512BW) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512BW built-in functions and code generation.
 
 mavx512vl
-Target Report Mask(ISA_AVX512VL) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512VL) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512VL built-in functions and code generation.
 
 mavx512ifma
-Target Report Mask(ISA_AVX512IFMA) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512IFMA) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512IFMA built-in functions and code generation.
 
 mavx512vbmi
-Target Report Mask(ISA_AVX512VBMI) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512VBMI) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2 and AVX512F and AVX512VBMI built-in functions and code generation.
 
 mavx5124fmaps
-Target Report Mask(ISA2_AVX5124FMAPS) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AVX5124FMAPS) Var(ix86_isa_flags2) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, AVX512F and AVX5124FMAPS built-in functions and code generation.
 
 mavx5124vnniw
-Target Report Mask(ISA2_AVX5124VNNIW) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AVX5124VNNIW) Var(ix86_isa_flags2) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, AVX512F and AVX5124VNNIW built-in functions and code generation.
 
 mavx512vpopcntdq
-Target Report Mask(ISA_AVX512VPOPCNTDQ) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512VPOPCNTDQ) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, AVX512F and AVX512VPOPCNTDQ built-in functions and code generation.
 
 mavx512vbmi2
-Target Report Mask(ISA_AVX512VBMI2) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512VBMI2) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, AVX512F and AVX512VBMI2 built-in functions and code generation.
 
 mavx512vnni
-Target Report Mask(ISA_AVX512VNNI) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512VNNI) Var(ix86_isa_flags) Save
 Support AVX512VNNI built-in functions and code generation.
 
 mavx512bitalg
-Target Report Mask(ISA_AVX512BITALG) Var(ix86_isa_flags) Save
+Target Mask(ISA_AVX512BITALG) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, AVX512F and AVX512BITALG built-in functions and code generation.
 
 mavx512vp2intersect
-Target Report Mask(ISA2_AVX512VP2INTERSECT) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AVX512VP2INTERSECT) Var(ix86_isa_flags2) Save
 Support AVX512VP2INTERSECT built-in functions and code generation.
 
 mfma
-Target Report Mask(ISA_FMA) Var(ix86_isa_flags) Save
+Target Mask(ISA_FMA) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX and FMA built-in functions and code generation.
 
 msse4a
-Target Report Mask(ISA_SSE4A) Var(ix86_isa_flags) Save
+Target Mask(ISA_SSE4A) Var(ix86_isa_flags) Save
 Support MMX, SSE, SSE2, SSE3 and SSE4A built-in functions and code generation.
 
 mfma4
-Target Report Mask(ISA_FMA4) Var(ix86_isa_flags) Save
+Target Mask(ISA_FMA4) Var(ix86_isa_flags) Save
 Support FMA4 built-in functions and code generation.
 
 mxop
-Target Report Mask(ISA_XOP) Var(ix86_isa_flags) Save
+Target Mask(ISA_XOP) Var(ix86_isa_flags) Save
 Support XOP built-in functions and code generation.
 
 mlwp
-Target Report Mask(ISA_LWP) Var(ix86_isa_flags) Save
+Target Mask(ISA_LWP) Var(ix86_isa_flags) Save
 Support LWP built-in functions and code generation.
 
 mabm
-Target Report Mask(ISA_ABM) Var(ix86_isa_flags) Save
+Target Mask(ISA_ABM) Var(ix86_isa_flags) Save
 Support code generation of Advanced Bit Manipulation (ABM) instructions.
 
 mpopcnt
-Target Report Mask(ISA_POPCNT) Var(ix86_isa_flags) Save
+Target Mask(ISA_POPCNT) Var(ix86_isa_flags) Save
 Support code generation of popcnt instruction.
 
 mpconfig
-Target Report Mask(ISA2_PCONFIG) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_PCONFIG) Var(ix86_isa_flags2) Save
 Support PCONFIG built-in functions and code generation.
 
 mwbnoinvd
-Target Report Mask(ISA2_WBNOINVD) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_WBNOINVD) Var(ix86_isa_flags2) Save
 Support WBNOINVD built-in functions and code generation.
 
 mptwrite
-Target Report Mask(ISA2_PTWRITE) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_PTWRITE) Var(ix86_isa_flags2) Save
 Support PTWRITE built-in functions and code generation.
 
 muintr
-Target Report Mask(ISA2_UINTR) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_UINTR) Var(ix86_isa_flags2) Save
 Support UINTR built-in functions and code generation.
 
 msgx
-Target Report Mask(ISA2_SGX) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_SGX) Var(ix86_isa_flags2) Save
 Support SGX built-in functions and code generation.
 
 mrdpid
-Target Report Mask(ISA2_RDPID) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_RDPID) Var(ix86_isa_flags2) Save
 Support RDPID built-in functions and code generation.
 
 mgfni
-Target Report Mask(ISA_GFNI) Var(ix86_isa_flags) Save
+Target Mask(ISA_GFNI) Var(ix86_isa_flags) Save
 Support GFNI built-in functions and code generation.
 
 mvaes
-Target Report Mask(ISA2_VAES) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_VAES) Var(ix86_isa_flags2) Save
 Support VAES built-in functions and code generation.
 
 mvpclmulqdq
-Target Report Mask(ISA_VPCLMULQDQ) Var(ix86_isa_flags) Save
+Target Mask(ISA_VPCLMULQDQ) Var(ix86_isa_flags) Save
 Support VPCLMULQDQ built-in functions and code generation.
 
 mbmi
-Target Report Mask(ISA_BMI) Var(ix86_isa_flags) Save
+Target Mask(ISA_BMI) Var(ix86_isa_flags) Save
 Support BMI built-in functions and code generation.
 
 mbmi2
-Target Report Mask(ISA_BMI2) Var(ix86_isa_flags) Save
+Target Mask(ISA_BMI2) Var(ix86_isa_flags) Save
 Support BMI2 built-in functions and code generation.
 
 mlzcnt
-Target Report Mask(ISA_LZCNT) Var(ix86_isa_flags) Save
+Target Mask(ISA_LZCNT) Var(ix86_isa_flags) Save
 Support LZCNT built-in function and code generation.
 
 mhle
-Target Report Mask(ISA2_HLE) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_HLE) Var(ix86_isa_flags2) Save
 Support Hardware Lock Elision prefixes.
 
 mrdseed
-Target Report Mask(ISA_RDSEED) Var(ix86_isa_flags) Save
+Target Mask(ISA_RDSEED) Var(ix86_isa_flags) Save
 Support RDSEED instruction.
 
 mprfchw
-Target Report Mask(ISA_PRFCHW) Var(ix86_isa_flags) Save
+Target Mask(ISA_PRFCHW) Var(ix86_isa_flags) Save
 Support PREFETCHW instruction.
 
 madx
-Target Report Mask(ISA_ADX) Var(ix86_isa_flags) Save
+Target Mask(ISA_ADX) Var(ix86_isa_flags) Save
 Support flag-preserving add-carry instructions.
 
 mclflushopt
-Target Report Mask(ISA_CLFLUSHOPT) Var(ix86_isa_flags) Save
+Target Mask(ISA_CLFLUSHOPT) Var(ix86_isa_flags) Save
 Support CLFLUSHOPT instructions.
 
 mclwb
-Target Report Mask(ISA_CLWB) Var(ix86_isa_flags) Save
+Target Mask(ISA_CLWB) Var(ix86_isa_flags) Save
 Support CLWB instruction.
 
 mpcommit
 Target WarnRemoved
 
 mfxsr
-Target Report Mask(ISA_FXSR) Var(ix86_isa_flags) Save
+Target Mask(ISA_FXSR) Var(ix86_isa_flags) Save
 Support FXSAVE and FXRSTOR instructions.
 
 mxsave
-Target Report Mask(ISA_XSAVE) Var(ix86_isa_flags) Save
+Target Mask(ISA_XSAVE) Var(ix86_isa_flags) Save
 Support XSAVE and XRSTOR instructions.
 
 mxsaveopt
-Target Report Mask(ISA_XSAVEOPT) Var(ix86_isa_flags) Save
+Target Mask(ISA_XSAVEOPT) Var(ix86_isa_flags) Save
 Support XSAVEOPT instruction.
 
 mxsavec
-Target Report Mask(ISA_XSAVEC) Var(ix86_isa_flags) Save
+Target Mask(ISA_XSAVEC) Var(ix86_isa_flags) Save
 Support XSAVEC instructions.
 
 mxsaves
-Target Report Mask(ISA_XSAVES) Var(ix86_isa_flags) Save
+Target Mask(ISA_XSAVES) Var(ix86_isa_flags) Save
 Support XSAVES and XRSTORS instructions.
 
 mtbm
-Target Report Mask(ISA_TBM) Var(ix86_isa_flags) Save
+Target Mask(ISA_TBM) Var(ix86_isa_flags) Save
 Support TBM built-in functions and code generation.
 
 mcx16
-Target Report Mask(ISA2_CX16) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_CX16) Var(ix86_isa_flags2) Save
 Support code generation of cmpxchg16b instruction.
 
 msahf
-Target Report Mask(ISA_SAHF) Var(ix86_isa_flags) Save
+Target Mask(ISA_SAHF) Var(ix86_isa_flags) Save
 Support code generation of sahf instruction in 64bit x86-64 code.
 
 mmovbe
-Target Report Mask(ISA2_MOVBE) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_MOVBE) Var(ix86_isa_flags2) Save
 Support code generation of movbe instruction.
 
 mcrc32
-Target Report Mask(ISA_CRC32) Var(ix86_isa_flags) Save
+Target Mask(ISA_CRC32) Var(ix86_isa_flags) Save
 Support code generation of crc32 instruction.
 
 maes
-Target Report Mask(ISA_AES) Var(ix86_isa_flags) Save
+Target Mask(ISA_AES) Var(ix86_isa_flags) Save
 Support AES built-in functions and code generation.
 
 msha
-Target Report Mask(ISA_SHA) Var(ix86_isa_flags) Save
+Target Mask(ISA_SHA) Var(ix86_isa_flags) Save
 Support SHA1 and SHA256 built-in functions and code generation.
 
 mpclmul
-Target Report Mask(ISA_PCLMUL) Var(ix86_isa_flags) Save
+Target Mask(ISA_PCLMUL) Var(ix86_isa_flags) Save
 Support PCLMUL built-in functions and code generation.
 
 msse2avx
-Target Report Var(ix86_sse2avx)
+Target Var(ix86_sse2avx)
 Encode SSE instructions with VEX prefix.
 
 mfsgsbase
-Target Report Mask(ISA_FSGSBASE) Var(ix86_isa_flags) Save
+Target Mask(ISA_FSGSBASE) Var(ix86_isa_flags) Save
 Support FSGSBASE built-in functions and code generation.
 
 mrdrnd
-Target Report Mask(ISA_RDRND) Var(ix86_isa_flags) Save
+Target Mask(ISA_RDRND) Var(ix86_isa_flags) Save
 Support RDRND built-in functions and code generation.
 
 mf16c
-Target Report Mask(ISA_F16C) Var(ix86_isa_flags) Save
+Target Mask(ISA_F16C) Var(ix86_isa_flags) Save
 Support F16C built-in functions and code generation.
 
 mprefetchwt1
-Target Report Mask(ISA_PREFETCHWT1) Var(ix86_isa_flags) Save
+Target Mask(ISA_PREFETCHWT1) Var(ix86_isa_flags) Save
 Support PREFETCHWT1 built-in functions and code generation.
 
 mfentry
-Target Report Var(flag_fentry)
+Target Var(flag_fentry)
 Emit profiling counter call at function entry before prologue.
 
 mrecord-mcount
-Target Report Var(flag_record_mcount)
+Target Var(flag_record_mcount)
 Generate __mcount_loc section with all mcount or __fentry__ calls.
 
 mnop-mcount
-Target Report Var(flag_nop_mcount)
+Target Var(flag_nop_mcount)
 Generate mcount/__fentry__ calls as nops. To activate they need to be
 patched in.
 
@@ -955,23 +955,23 @@ Target RejectNegative Joined Var(fentry_section)
 Set name of section to record mrecord-mcount calls.
 
 mskip-rax-setup
-Target Report Var(flag_skip_rax_setup)
+Target Var(flag_skip_rax_setup)
 Skip setting up RAX register when passing variable arguments.
 
 m8bit-idiv
-Target Report Mask(USE_8BIT_IDIV) Save
+Target Mask(USE_8BIT_IDIV) Save
 Expand 32bit/64bit integer divide into 8bit unsigned integer divide with run-time check.
 
 mavx256-split-unaligned-load
-Target Report Mask(AVX256_SPLIT_UNALIGNED_LOAD) Save
+Target Mask(AVX256_SPLIT_UNALIGNED_LOAD) Save
 Split 32-byte AVX unaligned load.
 
 mavx256-split-unaligned-store
-Target Report Mask(AVX256_SPLIT_UNALIGNED_STORE) Save
+Target Mask(AVX256_SPLIT_UNALIGNED_STORE) Save
 Split 32-byte AVX unaligned store.
 
 mrtm
-Target Report Mask(ISA_RTM) Var(ix86_isa_flags) Save
+Target Mask(ISA_RTM) Var(ix86_isa_flags) Save
 Support RTM built-in functions and code generation.
 
 mmpx
@@ -979,15 +979,15 @@ Target WarnRemoved
 Removed in GCC 9.  This switch has no effect.
 
 mmwaitx
-Target Report Mask(ISA2_MWAITX) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_MWAITX) Var(ix86_isa_flags2) Save
 Support MWAITX and MONITORX built-in functions and code generation.
 
 mclzero
-Target Report Mask(ISA2_CLZERO) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_CLZERO) Var(ix86_isa_flags2) Save
 Support CLZERO built-in functions and code generation.
 
 mpku
-Target Report Mask(ISA_PKU) Var(ix86_isa_flags) Save
+Target Mask(ISA_PKU) Var(ix86_isa_flags) Save
 Support PKU built-in functions and code generation.
 
 mstack-protector-guard=
@@ -1026,34 +1026,34 @@ mmitigate-rop
 Target WarnRemoved
 
 mgeneral-regs-only
-Target Report RejectNegative Mask(GENERAL_REGS_ONLY) Var(ix86_target_flags) Save
+Target RejectNegative Mask(GENERAL_REGS_ONLY) Var(ix86_target_flags) Save
 Generate code which uses only the general registers.
 
 mshstk
-Target Report Mask(ISA_SHSTK) Var(ix86_isa_flags) Save
+Target Mask(ISA_SHSTK) Var(ix86_isa_flags) Save
 Enable shadow stack built-in functions from Control-flow Enforcement
 Technology (CET).
 
 mcet-switch
-Target Report Undocumented Var(flag_cet_switch) Init(0)
+Target Undocumented Var(flag_cet_switch) Init(0)
 Turn on CET instrumentation for switch statements that use a jump table and
 an indirect jump.
 
 mmanual-endbr
-Target Report Var(flag_manual_endbr) Init(0)
+Target Var(flag_manual_endbr) Init(0)
 Insert ENDBR instruction at function entry only via cf_check attribute
 for CET instrumentation.
 
 mforce-indirect-call
-Target Report Var(flag_force_indirect_call) Init(0)
+Target Var(flag_force_indirect_call) Init(0)
 Make all function calls indirect.
 
 mindirect-branch=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep)
 Convert indirect call and jump to call and return thunks.
 
 mfunction-return=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_function_return) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(ix86_function_return) Init(indirect_branch_keep)
 Convert function return to call and return thunk.
 
 Enum
@@ -1073,27 +1073,27 @@ EnumValue
 Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern)
 
 mindirect-branch-register
-Target Report Var(ix86_indirect_branch_register) Init(0)
+Target Var(ix86_indirect_branch_register) Init(0)
 Force indirect call and jump via register.
 
 mmovdiri
-Target Report Mask(ISA_MOVDIRI) Var(ix86_isa_flags) Save
+Target Mask(ISA_MOVDIRI) Var(ix86_isa_flags) Save
 Support MOVDIRI built-in functions and code generation.
 
 mmovdir64b
-Target Report Mask(ISA2_MOVDIR64B) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_MOVDIR64B) Var(ix86_isa_flags2) Save
 Support MOVDIR64B built-in functions and code generation.
 
 mwaitpkg
-Target Report Mask(ISA2_WAITPKG) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_WAITPKG) Var(ix86_isa_flags2) Save
 Support WAITPKG built-in functions and code generation.
 
 mcldemote
-Target Report Mask(ISA2_CLDEMOTE) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_CLDEMOTE) Var(ix86_isa_flags2) Save
 Support CLDEMOTE built-in functions and code generation.
 
 minstrument-return=
-Target Report RejectNegative Joined Enum(instrument_return) Var(ix86_instrument_return) Init(instrument_return_none)
+Target RejectNegative Joined Enum(instrument_return) Var(ix86_instrument_return) Init(instrument_return_none)
 Instrument function exit in instrumented functions with __fentry__.
 
 Enum
@@ -1110,55 +1110,55 @@ EnumValue
 Enum(instrument_return) String(nop5) Value(instrument_return_nop5)
 
 mrecord-return
-Target Report Var(ix86_flag_record_return) Init(0)
+Target Var(ix86_flag_record_return) Init(0)
 Generate a __return_loc section pointing to all return instrumentation code.
 
 mavx512bf16
-Target Report Mask(ISA2_AVX512BF16) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AVX512BF16) Var(ix86_isa_flags2) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, AVX512F and
 AVX512BF16 built-in functions and code generation.
 
 menqcmd
-Target Report Mask(ISA2_ENQCMD) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_ENQCMD) Var(ix86_isa_flags2) Save
 Support ENQCMD built-in functions and code generation.
 
 mserialize
-Target Report Mask(ISA2_SERIALIZE) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_SERIALIZE) Var(ix86_isa_flags2) Save
 Support SERIALIZE built-in functions and code generation.
 
 mtsxldtrk
-Target Report Mask(ISA2_TSXLDTRK) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_TSXLDTRK) Var(ix86_isa_flags2) Save
 Support TSXLDTRK built-in functions and code generation.
 
 mamx-tile
-Target Report Mask(ISA2_AMX_TILE) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AMX_TILE) Var(ix86_isa_flags2) Save
 Support AMX-TILE built-in functions and code generation.
 
 mamx-int8
-Target Report Mask(ISA2_AMX_INT8) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AMX_INT8) Var(ix86_isa_flags2) Save
 Support AMX-INT8 built-in functions and code generation.
 
 mamx-bf16
-Target Report Mask(ISA2_AMX_BF16) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AMX_BF16) Var(ix86_isa_flags2) Save
 Support AMX-BF16 built-in functions and code generation.
 
 mhreset
-Target Report Mask(ISA2_HRESET) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_HRESET) Var(ix86_isa_flags2) Save
 Support HRESET built-in functions and code generation.
 
 mkl
-Target Report Mask(ISA2_KL) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_KL) Var(ix86_isa_flags2) Save
 Support KL built-in functions and code generation.
 
 mwidekl
-Target Report Mask(ISA2_WIDEKL) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_WIDEKL) Var(ix86_isa_flags2) Save
 Support WIDEKL built-in functions and code generation.
 
 mavxvnni
-Target Report Mask(ISA2_AVXVNNI) Var(ix86_isa_flags2) Save
+Target Mask(ISA2_AVXVNNI) Var(ix86_isa_flags2) Save
 Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, and
 AVXVNNI built-in functions and code generation.
 
 mneeded
-Target Report Var(ix86_needed) Save
+Target Var(ix86_needed) Save
 Emit GNU_PROPERTY_X86_ISA_1_NEEDED GNU property.
diff --git a/gcc/config/ia64/ia64.opt b/gcc/config/ia64/ia64.opt
index 05b9d32d360..5646d29c137 100644
--- a/gcc/config/ia64/ia64.opt
+++ b/gcc/config/ia64/ia64.opt
@@ -24,23 +24,23 @@ Variable
 enum processor_type ia64_tune = PROCESSOR_ITANIUM2
 
 mbig-endian
-Target Report RejectNegative Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Generate big endian code.
 
 mlittle-endian
-Target Report RejectNegative InverseMask(BIG_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN)
 Generate little endian code.
 
 mgnu-as
-Target Report Mask(GNU_AS)
+Target Mask(GNU_AS)
 Generate code for GNU as.
 
 mgnu-ld
-Target Report Mask(GNU_LD)
+Target Mask(GNU_LD)
 Generate code for GNU ld.
 
 mvolatile-asm-stop
-Target Report Mask(VOL_ASM_STOP)
+Target Mask(VOL_ASM_STOP)
 Emit stop bits before and after volatile extended asms.
 
 mregister-names
@@ -48,65 +48,65 @@ Target Mask(REG_NAMES)
 Use in/loc/out register names.
 
 mno-sdata
-Target Report RejectNegative Mask(NO_SDATA)
+Target RejectNegative Mask(NO_SDATA)
 
 msdata
-Target Report RejectNegative InverseMask(NO_SDATA)
+Target RejectNegative InverseMask(NO_SDATA)
 Enable use of sdata/scommon/sbss.
 
 mno-pic
-Target Report RejectNegative Mask(NO_PIC)
+Target RejectNegative Mask(NO_PIC)
 Generate code without GP reg.
 
 mconstant-gp
-Target Report RejectNegative Mask(CONST_GP)
+Target RejectNegative Mask(CONST_GP)
 gp is constant (but save/restore gp on indirect calls).
 
 mauto-pic
-Target Report RejectNegative Mask(AUTO_PIC)
+Target RejectNegative Mask(AUTO_PIC)
 Generate self-relocatable code.
 
 minline-float-divide-min-latency
-Target Report RejectNegative Var(TARGET_INLINE_FLOAT_DIV, 1)
+Target RejectNegative Var(TARGET_INLINE_FLOAT_DIV, 1)
 Generate inline floating point division, optimize for latency.
 
 minline-float-divide-max-throughput
-Target Report RejectNegative Var(TARGET_INLINE_FLOAT_DIV, 2) Init(2)
+Target RejectNegative Var(TARGET_INLINE_FLOAT_DIV, 2) Init(2)
 Generate inline floating point division, optimize for throughput.
 
 mno-inline-float-divide
-Target Report RejectNegative Var(TARGET_INLINE_FLOAT_DIV, 0)
+Target RejectNegative Var(TARGET_INLINE_FLOAT_DIV, 0)
 
 minline-int-divide-min-latency
-Target Report RejectNegative Var(TARGET_INLINE_INT_DIV, 1)
+Target RejectNegative Var(TARGET_INLINE_INT_DIV, 1)
 Generate inline integer division, optimize for latency.
 
 minline-int-divide-max-throughput
-Target Report RejectNegative Var(TARGET_INLINE_INT_DIV, 2)
+Target RejectNegative Var(TARGET_INLINE_INT_DIV, 2)
 Generate inline integer division, optimize for throughput.
 
 mno-inline-int-divide
-Target Report RejectNegative Var(TARGET_INLINE_INT_DIV, 0)
+Target RejectNegative Var(TARGET_INLINE_INT_DIV, 0)
 Do not inline integer division.
 
 minline-sqrt-min-latency
-Target Report RejectNegative Var(TARGET_INLINE_SQRT, 1)
+Target RejectNegative Var(TARGET_INLINE_SQRT, 1)
 Generate inline square root, optimize for latency.
 
 minline-sqrt-max-throughput
-Target Report RejectNegative Var(TARGET_INLINE_SQRT, 2)
+Target RejectNegative Var(TARGET_INLINE_SQRT, 2)
 Generate inline square root, optimize for throughput.
 
 mno-inline-sqrt
-Target Report RejectNegative Var(TARGET_INLINE_SQRT, 0)
+Target RejectNegative Var(TARGET_INLINE_SQRT, 0)
 Do not inline square root.
 
 mdwarf2-asm
-Target Report Mask(DWARF2_ASM)
+Target Mask(DWARF2_ASM)
 Enable DWARF line debug info via GNU as.
 
 mearly-stop-bits
-Target Report Mask(EARLY_STOP_BITS)
+Target Mask(EARLY_STOP_BITS)
 Enable earlier placing stop bits for better scheduling.
 
 mfixed-range=
@@ -132,35 +132,35 @@ EnumValue
 Enum(ia64_tune) String(mckinley) Value(PROCESSOR_ITANIUM2)
 
 msched-br-data-spec
-Target Report Var(mflag_sched_br_data_spec) Init(0)
+Target Var(mflag_sched_br_data_spec) Init(0)
 Use data speculation before reload.
 
 msched-ar-data-spec
-Target Report Var(mflag_sched_ar_data_spec) Init(1)
+Target Var(mflag_sched_ar_data_spec) Init(1)
 Use data speculation after reload.
 
 msched-control-spec
-Target Report Var(mflag_sched_control_spec) Init(2)
+Target Var(mflag_sched_control_spec) Init(2)
 Use control speculation.
 
 msched-br-in-data-spec
-Target Report Var(mflag_sched_br_in_data_spec) Init(1)
+Target Var(mflag_sched_br_in_data_spec) Init(1)
 Use in block data speculation before reload.
 
 msched-ar-in-data-spec
-Target Report Var(mflag_sched_ar_in_data_spec) Init(1)
+Target Var(mflag_sched_ar_in_data_spec) Init(1)
 Use in block data speculation after reload.
 
 msched-in-control-spec
-Target Report Var(mflag_sched_in_control_spec) Init(1)
+Target Var(mflag_sched_in_control_spec) Init(1)
 Use in block control speculation.
 
 msched-spec-ldc
-Target Report Var(mflag_sched_spec_ldc) Init(1)
+Target Var(mflag_sched_spec_ldc) Init(1)
 Use simple data speculation check.
 
 msched-spec-control-ldc
-Target Report Var(mflag_sched_spec_control_ldc) Init(0)
+Target Var(mflag_sched_spec_control_ldc) Init(0)
 Use simple data speculation check for control speculation.
 
 msched-prefer-non-data-spec-insns
@@ -170,15 +170,15 @@ msched-prefer-non-control-spec-insns
 Target WarnRemoved
 
 msched-count-spec-in-critical-path
-Target Report Var(mflag_sched_count_spec_in_critical_path) Init(0)
+Target Var(mflag_sched_count_spec_in_critical_path) Init(0)
 Count speculative dependencies while calculating priority of instructions.
 
 msched-stop-bits-after-every-cycle
-Target Report Var(mflag_sched_stop_bits_after_every_cycle) Init(1)
+Target Var(mflag_sched_stop_bits_after_every_cycle) Init(1)
 Place a stop bit after every cycle when scheduling.
 
 msched-fp-mem-deps-zero-cost
-Target Report Var(mflag_sched_fp_mem_deps_zero_cost) Init(0)
+Target Var(mflag_sched_fp_mem_deps_zero_cost) Init(0)
 Assume that floating-point stores and loads are not likely to cause conflict when placed into one instruction group.
 
 msched-max-memory-insns=
@@ -186,11 +186,11 @@ Target RejectNegative Joined UInteger Var(ia64_max_memory_insns) Init(1)
 Soft limit on number of memory insns per instruction group, giving lower priority to subsequent memory insns attempting to schedule in the same insn group. Frequently useful to prevent cache bank conflicts.  Default value is 1.
 
 msched-max-memory-insns-hard-limit
-Target Report Var(mflag_sched_mem_insns_hard_limit) Init(0)
+Target Var(mflag_sched_mem_insns_hard_limit) Init(0)
 Disallow more than 'msched-max-memory-insns' in instruction group. Otherwise, limit is 'soft' (prefer non-memory operations when limit is reached).
 
 msel-sched-dont-check-control-spec
-Target Report Var(mflag_sel_sched_dont_check_control_spec) Init(0)
+Target Var(mflag_sel_sched_dont_check_control_spec) Init(0)
 Don't generate checks for control speculation in selective scheduling.
 
 ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/config/ia64/ilp32.opt b/gcc/config/ia64/ilp32.opt
index 2083a25219e..5c9a5a32066 100644
--- a/gcc/config/ia64/ilp32.opt
+++ b/gcc/config/ia64/ilp32.opt
@@ -1,7 +1,7 @@
 milp32
-Target Report RejectNegative Mask(ILP32)
+Target RejectNegative Mask(ILP32)
 Generate ILP32 code.
 
 mlp64
-Target Report RejectNegative InverseMask(ILP32)
+Target RejectNegative InverseMask(ILP32)
 Generate LP64 code.
diff --git a/gcc/config/linux-android.opt b/gcc/config/linux-android.opt
index 665387e71fc..2d607048938 100644
--- a/gcc/config/linux-android.opt
+++ b/gcc/config/linux-android.opt
@@ -19,7 +19,7 @@
 ; <http://www.gnu.org/licenses/>.
 
 mandroid
-Target Report Mask(ANDROID) Var(flag_android) Init(ANDROID_DEFAULT ? OPTION_MASK_ANDROID : 0)
+Target Mask(ANDROID) Var(flag_android) Init(ANDROID_DEFAULT ? OPTION_MASK_ANDROID : 0)
 Generate code for the Android platform.
 
 tno-android-cc
diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt
index bd4a6255d88..34b0a9ea749 100644
--- a/gcc/config/linux.opt
+++ b/gcc/config/linux.opt
@@ -20,17 +20,17 @@
 ; <http://www.gnu.org/licenses/>.
 
 mbionic
-Target Report RejectNegative Var(linux_libc,LIBC_BIONIC) Init(DEFAULT_LIBC) Negative(mglibc)
+Target RejectNegative Var(linux_libc,LIBC_BIONIC) Init(DEFAULT_LIBC) Negative(mglibc)
 Use Bionic C library.
 
 mglibc
-Target Report RejectNegative Var(linux_libc,LIBC_GLIBC) Negative(muclibc)
+Target RejectNegative Var(linux_libc,LIBC_GLIBC) Negative(muclibc)
 Use GNU C library.
 
 muclibc
-Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
+Target RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
 Use uClibc C library.
 
 mmusl
-Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
+Target RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
 Use musl C library.
diff --git a/gcc/config/lm32/lm32.opt b/gcc/config/lm32/lm32.opt
index c19a183b3b4..1260b48fbc1 100644
--- a/gcc/config/lm32/lm32.opt
+++ b/gcc/config/lm32/lm32.opt
@@ -20,21 +20,21 @@
 ;  <http://www.gnu.org/licenses/>.  
    
 mmultiply-enabled
-Target Report Mask(MULTIPLY_ENABLED)
+Target Mask(MULTIPLY_ENABLED)
 Enable multiply instructions.
 
 mdivide-enabled
-Target Report Mask(DIVIDE_ENABLED)
+Target Mask(DIVIDE_ENABLED)
 Enable divide and modulus instructions.
 
 mbarrel-shift-enabled
-Target Report Mask(BARREL_SHIFT_ENABLED)
+Target Mask(BARREL_SHIFT_ENABLED)
 Enable barrel shift instructions.
 
 msign-extend-enabled
-Target Report Mask(SIGN_EXTEND_ENABLED)
+Target Mask(SIGN_EXTEND_ENABLED)
 Enable sign extend instructions.
 
 muser-enabled
-Target Report Mask(USER_ENABLED)
+Target Mask(USER_ENABLED)
 Enable user-defined instructions.
diff --git a/gcc/config/m32r/m32r.opt b/gcc/config/m32r/m32r.opt
index 0ecafc9a88f..b9a33c6c310 100644
--- a/gcc/config/m32r/m32r.opt
+++ b/gcc/config/m32r/m32r.opt
@@ -30,11 +30,11 @@ Variable
 enum m32r_sdata m32r_sdata_selected = M32R_SDATA_DEFAULT
 
 m32rx
-Target Report RejectNegative Mask(M32RX)
+Target RejectNegative Mask(M32RX)
 Compile for the m32rx.
 
 m32r2
-Target Report RejectNegative Mask(M32R2)
+Target RejectNegative Mask(M32R2)
 Compile for the m32r2.
 
 m32r
@@ -42,15 +42,15 @@ Target RejectNegative
 Compile for the m32r.
 
 malign-loops
-Target Report Mask(ALIGN_LOOPS)
+Target Mask(ALIGN_LOOPS)
 Align all loops to 32 byte boundary.
 
 mbranch-cost=1
-Target Report RejectNegative Mask(BRANCH_COST)
+Target RejectNegative Mask(BRANCH_COST)
 Prefer branches over conditional execution.
 
 mbranch-cost=2
-Target Report RejectNegative InverseMask(BRANCH_COST)
+Target RejectNegative InverseMask(BRANCH_COST)
 Give branches their default cost.
 
 mdebug
@@ -66,11 +66,11 @@ Target RejectNegative Joined UInteger Var(m32r_cache_flush_trap) Init(CACHE_FLUS
 Specify cache flush trap number.
 
 missue-rate=1
-Target Report RejectNegative Mask(LOW_ISSUE_RATE)
+Target RejectNegative Mask(LOW_ISSUE_RATE)
 Only issue one instruction per cycle.
 
 missue-rate=2
-Target Report RejectNegative InverseMask(LOW_ISSUE_RATE)
+Target RejectNegative InverseMask(LOW_ISSUE_RATE)
 Allow two instructions to be issued per cycle.
 
 mmodel=
diff --git a/gcc/config/m68k/m68k.opt b/gcc/config/m68k/m68k.opt
index 3ff0545ddf9..14d09d420d5 100644
--- a/gcc/config/m68k/m68k.opt
+++ b/gcc/config/m68k/m68k.opt
@@ -95,7 +95,7 @@ Target RejectNegative Mask(HARD_FLOAT)
 Generate code that uses 68881 floating-point instructions.
 
 malign-int
-Target Report Mask(ALIGN_INT)
+Target Mask(ALIGN_INT)
 Align variables on a 32-bit boundary.
 
 march=
@@ -103,7 +103,7 @@ Target RejectNegative Joined Enum(m68k_isa) Var(m68k_arch_option)
 Specify the name of the target architecture.
 
 mbitfield
-Target Report Mask(BITFIELD)
+Target Mask(BITFIELD)
 Use the bit-field instructions.
 
 mc68000
@@ -127,7 +127,7 @@ Target RejectNegative Alias(mcpu=, 68332)
 Generate code for a cpu32.
 
 mdiv
-Target Report Mask(CF_HWDIV)
+Target Mask(CF_HWDIV)
 Use hardware division instructions on ColdFire.
 
 mfidoa
@@ -139,11 +139,11 @@ Target RejectNegative Mask(HARD_FLOAT)
 Generate code which uses hardware floating point instructions.
 
 mid-shared-library
-Target Report Mask(ID_SHARED_LIBRARY)
+Target Mask(ID_SHARED_LIBRARY)
 Enable ID based shared library.
 
 mlong-jump-table-offsets
-Target Report RejectNegative Mask(LONG_JUMP_TABLE_OFFSETS)
+Target RejectNegative Mask(LONG_JUMP_TABLE_OFFSETS)
 Use 32-bit offsets in jump tables rather than 16-bit offsets.
 
 mnobitfield
@@ -159,15 +159,15 @@ Target RejectNegative InverseMask(SHORT)
 Consider type 'int' to be 32 bits wide.
 
 mpcrel
-Target Report Mask(PCREL)
+Target Mask(PCREL)
 Generate pc-relative code.
 
 mrtd
-Target Report Mask(RTD)
+Target Mask(RTD)
 Use different calling convention using 'rtd'.
 
 msep-data
-Target Report Mask(SEP_DATA)
+Target Mask(SEP_DATA)
 Enable separate data segment.
 
 mshared-library-id=
@@ -175,7 +175,7 @@ Target RejectNegative Joined UInteger
 ID of shared library to build.
 
 mshort
-Target Report Mask(SHORT)
+Target Mask(SHORT)
 Consider type 'int' to be 16 bits wide.
 
 msoft-float
@@ -183,7 +183,7 @@ Target RejectNegative InverseMask(HARD_FLOAT)
 Generate code with library calls for floating point.
 
 mstrict-align
-Target Report Mask(STRICT_ALIGNMENT)
+Target Mask(STRICT_ALIGNMENT)
 Do not use unaligned memory references.
 
 mtune=
@@ -191,9 +191,9 @@ Target RejectNegative Joined Enum(uarch_type) Var(m68k_tune_option) Init(unk_arc
 Tune for the specified target CPU or architecture.
 
 mxgot
-Target Report Mask(XGOT)
+Target Mask(XGOT)
 Support more than 8192 GOT entries on ColdFire.
 
 mxtls
-Target Report Mask(XTLS)
+Target Mask(XTLS)
 Support TLS segment larger than 64K.
diff --git a/gcc/config/mcore/mcore.opt b/gcc/config/mcore/mcore.opt
index dc25e2b06c6..3b3e5565edf 100644
--- a/gcc/config/mcore/mcore.opt
+++ b/gcc/config/mcore/mcore.opt
@@ -19,35 +19,35 @@
 ; <http://www.gnu.org/licenses/>.
 
 m210
-Target RejectNegative Report InverseMask(M340)
+Target RejectNegative InverseMask(M340)
 Generate code for the M*Core M210.
 
 m340
-Target RejectNegative Report Mask(M340)
+Target RejectNegative Mask(M340)
 Generate code for the M*Core M340.
 
 m4byte-functions
-Target Report Mask(OVERALIGN_FUNC)
+Target Mask(OVERALIGN_FUNC)
 Force functions to be aligned to a 4 byte boundary.
 
 mbig-endian
-Target RejectNegative Report InverseMask(LITTLE_END)
+Target RejectNegative InverseMask(LITTLE_END)
 Generate big-endian code.
 
 mcallgraph-data
-Target Report Mask(CG_DATA)
+Target Mask(CG_DATA)
 Emit call graph information.
 
 mdiv
-Target Report Mask(DIV)
+Target Mask(DIV)
 Use the divide instruction.
 
 mhardlit
-Target Report Mask(HARDLIT)
+Target Mask(HARDLIT)
 Inline constants if it can be done in 2 insns or less.
 
 mlittle-endian
-Target RejectNegative Report Mask(LITTLE_END)
+Target RejectNegative Mask(LITTLE_END)
 Generate little-endian code.
 
 ; Not used by the compiler proper.
@@ -56,11 +56,11 @@ Target RejectNegative
 Assume that run-time support has been provided, so omit -lsim from the linker command line.
 
 mrelax-immediates
-Target Report Mask(RELAX_IMM)
+Target Mask(RELAX_IMM)
 Use arbitrary sized immediates in bit operations.
 
 mslow-bytes
-Target Report Mask(SLOW_BYTES)
+Target Mask(SLOW_BYTES)
 Prefer word accesses over byte accesses.
 
 ; Maximum size we are allowed to grow the stack in a single operation.
@@ -71,5 +71,5 @@ Target RejectNegative Joined UInteger Var(mcore_stack_increment) Init(STACK_UNIT
 Set the maximum amount for a single stack increment operation.
 
 mwide-bitfields
-Target Report Mask(W_FIELD)
+Target Mask(W_FIELD)
 Always treat bitfields as int-sized.
diff --git a/gcc/config/microblaze/microblaze.opt b/gcc/config/microblaze/microblaze.opt
index 725c2fab52a..8b3c2c12f3e 100644
--- a/gcc/config/microblaze/microblaze.opt
+++ b/gcc/config/microblaze/microblaze.opt
@@ -36,11 +36,11 @@ Zxl-mode-xmdstub
 Driver
 
 msoft-float
-Target Report RejectNegative Mask(SOFT_FLOAT)
+Target RejectNegative Mask(SOFT_FLOAT)
 Use software emulation for floating point (default).
 
 mhard-float
-Target Report RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT)
+Target RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT)
 Use hardware floating point instructions.
 
 msmall-divides
@@ -56,11 +56,11 @@ Target Mask(MEMCPY)
 Don't optimize block moves, use memcpy.
 
 mbig-endian
-Target Report RejectNegative InverseMask(LITTLE_ENDIAN)
+Target RejectNegative InverseMask(LITTLE_ENDIAN)
 Assume target CPU is configured as big endian.
 
 mlittle-endian
-Target Report RejectNegative Mask(LITTLE_ENDIAN)
+Target RejectNegative Mask(LITTLE_ENDIAN)
 Assume target CPU is configured as little endian.
 
 mxl-soft-mul
diff --git a/gcc/config/mips/mips.opt b/gcc/config/mips/mips.opt
index 1f192965bfa..d2bfa9cd06a 100644
--- a/gcc/config/mips/mips.opt
+++ b/gcc/config/mips/mips.opt
@@ -51,15 +51,15 @@ EnumValue
 Enum(mips_abi) String(eabi) Value(ABI_EABI)
 
 mabicalls
-Target Report Mask(ABICALLS)
+Target Mask(ABICALLS)
 Generate code that can be used in SVR4-style dynamic objects.
 
 mmad
-Target Report Var(TARGET_MAD)
+Target Var(TARGET_MAD)
 Use PMC-style 'mad' instructions.
 
 mimadd
-Target Report Mask(IMADD)
+Target Mask(IMADD)
 Use integer madd/msub instructions.
 
 march=
@@ -71,15 +71,15 @@ Target RejectNegative Joined UInteger Var(mips_branch_cost)
 -mbranch-cost=COST	Set the cost of branches to roughly COST instructions.
 
 mbranch-likely
-Target Report Mask(BRANCHLIKELY)
+Target Mask(BRANCHLIKELY)
 Use Branch Likely instructions, overriding the architecture default.
 
 mflip-mips16
-Target Report Var(TARGET_FLIP_MIPS16)
+Target Var(TARGET_FLIP_MIPS16)
 Switch on/off MIPS16 ASE on alternating functions for compiler testing.
 
 mcheck-zero-division
-Target Report Mask(CHECK_ZERO_DIV)
+Target Mask(CHECK_ZERO_DIV)
 Trap on integer divide by zero.
 
 mcode-readable=
@@ -100,27 +100,27 @@ EnumValue
 Enum(mips_code_readable_setting) String(no) Value(CODE_READABLE_NO)
 
 mdivide-breaks
-Target Report RejectNegative Mask(DIVIDE_BREAKS)
+Target RejectNegative Mask(DIVIDE_BREAKS)
 Use branch-and-break sequences to check for integer divide by zero.
 
 mdivide-traps
-Target Report RejectNegative InverseMask(DIVIDE_BREAKS, DIVIDE_TRAPS)
+Target RejectNegative InverseMask(DIVIDE_BREAKS, DIVIDE_TRAPS)
 Use trap instructions to check for integer divide by zero.
 
 mdmx
-Target Report RejectNegative Var(TARGET_MDMX)
+Target RejectNegative Var(TARGET_MDMX)
 Allow the use of MDMX instructions.
 
 mdouble-float
-Target Report RejectNegative InverseMask(SINGLE_FLOAT, DOUBLE_FLOAT)
+Target RejectNegative InverseMask(SINGLE_FLOAT, DOUBLE_FLOAT)
 Allow hardware floating-point instructions to cover both 32-bit and 64-bit operations.
 
 mdsp
-Target Report Var(TARGET_DSP)
+Target Var(TARGET_DSP)
 Use MIPS-DSP instructions.
 
 mdspr2
-Target Report Var(TARGET_DSPR2)
+Target Var(TARGET_DSPR2)
 Use MIPS-DSP REV 2 instructions.
 
 mdebug
@@ -130,83 +130,83 @@ mdebugd
 Target Var(TARGET_DEBUG_D_MODE) Undocumented
 
 meb
-Target Report RejectNegative Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Use big-endian byte order.
 
 mel
-Target Report RejectNegative InverseMask(BIG_ENDIAN, LITTLE_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN, LITTLE_ENDIAN)
 Use little-endian byte order.
 
 membedded-data
-Target Report Var(TARGET_EMBEDDED_DATA)
+Target Var(TARGET_EMBEDDED_DATA)
 Use ROM instead of RAM.
 
 meva
-Target Report Var(TARGET_EVA)
+Target Var(TARGET_EVA)
 Use Enhanced Virtual Addressing instructions.
 
 mexplicit-relocs
-Target Report Mask(EXPLICIT_RELOCS)
+Target Mask(EXPLICIT_RELOCS)
 Use NewABI-style %reloc() assembly operators.
 
 mextern-sdata
-Target Report Var(TARGET_EXTERN_SDATA) Init(1)
+Target Var(TARGET_EXTERN_SDATA) Init(1)
 Use -G for data that is not defined by the current object.
 
 mfix-24k
-Target Report Var(TARGET_FIX_24K)
+Target Var(TARGET_FIX_24K)
 Work around certain 24K errata.
 
 mfix-r4000
-Target Report Mask(FIX_R4000)
+Target Mask(FIX_R4000)
 Work around certain R4000 errata.
 
 mfix-r4400
-Target Report Mask(FIX_R4400)
+Target Mask(FIX_R4400)
 Work around certain R4400 errata.
 
 mfix-r5900
-Target Report Mask(FIX_R5900)
+Target Mask(FIX_R5900)
 Work around the R5900 short loop erratum.
 
 mfix-rm7000
-Target Report Var(TARGET_FIX_RM7000)
+Target Var(TARGET_FIX_RM7000)
 Work around certain RM7000 errata.
 
 mfix-r10000
-Target Report Mask(FIX_R10000)
+Target Mask(FIX_R10000)
 Work around certain R10000 errata.
 
 mfix-sb1
-Target Report Var(TARGET_FIX_SB1)
+Target Var(TARGET_FIX_SB1)
 Work around errata for early SB-1 revision 2 cores.
 
 mfix-vr4120
-Target Report Var(TARGET_FIX_VR4120)
+Target Var(TARGET_FIX_VR4120)
 Work around certain VR4120 errata.
 
 mfix-vr4130
-Target Report Var(TARGET_FIX_VR4130)
+Target Var(TARGET_FIX_VR4130)
 Work around VR4130 mflo/mfhi errata.
 
 mfix4300
-Target Report Var(TARGET_4300_MUL_FIX)
+Target Var(TARGET_4300_MUL_FIX)
 Work around an early 4300 hardware bug.
 
 mfp-exceptions
-Target Report Var(TARGET_FP_EXCEPTIONS) Init(1)
+Target Var(TARGET_FP_EXCEPTIONS) Init(1)
 FP exceptions are enabled.
 
 mfp32
-Target Report RejectNegative InverseMask(FLOAT64)
+Target RejectNegative InverseMask(FLOAT64)
 Use 32-bit floating-point registers.
 
 mfpxx
-Target Report RejectNegative Mask(FLOATXX)
+Target RejectNegative Mask(FLOATXX)
 Conform to the o32 FPXX ABI.
 
 mfp64
-Target Report RejectNegative Mask(FLOAT64)
+Target RejectNegative Mask(FLOAT64)
 Use 64-bit floating-point registers.
 
 mflush-func=
@@ -232,31 +232,31 @@ EnumValue
 Enum(mips_ieee_754_value) String(legacy) Value(MIPS_IEEE_754_LEGACY)
 
 mgp32
-Target Report RejectNegative InverseMask(64BIT)
+Target RejectNegative InverseMask(64BIT)
 Use 32-bit general registers.
 
 mgp64
-Target Report RejectNegative Mask(64BIT)
+Target RejectNegative Mask(64BIT)
 Use 64-bit general registers.
 
 mgpopt
-Target Report Var(TARGET_GPOPT) Init(1)
+Target Var(TARGET_GPOPT) Init(1)
 Use GP-relative addressing to access small data.
 
 mplt
-Target Report Var(TARGET_PLT)
+Target Var(TARGET_PLT)
 When generating -mabicalls code, allow executables to use PLTs and copy relocations.
 
 mhard-float
-Target Report RejectNegative InverseMask(SOFT_FLOAT_ABI, HARD_FLOAT_ABI)
+Target RejectNegative InverseMask(SOFT_FLOAT_ABI, HARD_FLOAT_ABI)
 Allow the use of hardware floating-point ABI and instructions.
 
 minterlink-compressed
-Target Report Var(TARGET_INTERLINK_COMPRESSED) Init(0)
+Target Var(TARGET_INTERLINK_COMPRESSED) Init(0)
 Generate code that is link-compatible with MIPS16 and microMIPS code.
 
 minterlink-mips16
-Target Report Var(TARGET_INTERLINK_COMPRESSED) Init(0)
+Target Var(TARGET_INTERLINK_COMPRESSED) Init(0)
 An alias for minterlink-compressed provided for backward-compatibility.
 
 mips
@@ -264,59 +264,59 @@ Target RejectNegative Joined ToLower Enum(mips_mips_opt_value) Var(mips_isa_opti
 -mipsN	Generate code for ISA level N.
 
 mips16
-Target Report RejectNegative Mask(MIPS16)
+Target RejectNegative Mask(MIPS16)
 Generate MIPS16 code.
 
 mips3d
-Target Report RejectNegative Var(TARGET_MIPS3D)
+Target RejectNegative Var(TARGET_MIPS3D)
 Use MIPS-3D instructions.
 
 mllsc
-Target Report Mask(LLSC)
+Target Mask(LLSC)
 Use ll, sc and sync instructions.
 
 mlocal-sdata
-Target Report Var(TARGET_LOCAL_SDATA) Init(1)
+Target Var(TARGET_LOCAL_SDATA) Init(1)
 Use -G for object-local data.
 
 mlong-calls
-Target Report Var(TARGET_LONG_CALLS)
+Target Var(TARGET_LONG_CALLS)
 Use indirect calls.
 
 mlong32
-Target Report RejectNegative InverseMask(LONG64, LONG32)
+Target RejectNegative InverseMask(LONG64, LONG32)
 Use a 32-bit long type.
 
 mlong64
-Target Report RejectNegative Mask(LONG64)
+Target RejectNegative Mask(LONG64)
 Use a 64-bit long type.
 
 mmcount-ra-address
-Target Report Var(TARGET_MCOUNT_RA_ADDRESS)
+Target Var(TARGET_MCOUNT_RA_ADDRESS)
 Pass the address of the ra save location to _mcount in $12.
 
 mmemcpy
-Target Report Mask(MEMCPY)
+Target Mask(MEMCPY)
 Don't optimize block moves.
 
 mmicromips
-Target Report Mask(MICROMIPS)
+Target Mask(MICROMIPS)
 Use microMIPS instructions.
 
 mmsa
-Target Report Mask(MSA)
+Target Mask(MSA)
 Use MIPS MSA Extension instructions.
 
 mmt
-Target Report Var(TARGET_MT)
+Target Var(TARGET_MT)
 Allow the use of MT instructions.
 
 mno-float
-Target Report RejectNegative Var(TARGET_NO_FLOAT) Condition(TARGET_SUPPORTS_NO_FLOAT)
+Target RejectNegative Var(TARGET_NO_FLOAT) Condition(TARGET_SUPPORTS_NO_FLOAT)
 Prevent the use of all floating-point operations.
 
 mmcu
-Target Report Var(TARGET_MCU)
+Target Var(TARGET_MCU)
 Use MCU instructions.
 
 mno-flush-func
@@ -324,19 +324,19 @@ Target RejectNegative
 Do not use a cache-flushing function before calling stack trampolines.
 
 mno-mdmx
-Target Report RejectNegative Var(TARGET_MDMX, 0)
+Target RejectNegative Var(TARGET_MDMX, 0)
 Do not use MDMX instructions.
 
 mno-mips16
-Target Report RejectNegative InverseMask(MIPS16)
+Target RejectNegative InverseMask(MIPS16)
 Generate normal-mode code.
 
 mno-mips3d
-Target Report RejectNegative Var(TARGET_MIPS3D, 0)
+Target RejectNegative Var(TARGET_MIPS3D, 0)
 Do not use MIPS-3D instructions.
 
 mpaired-single
-Target Report Mask(PAIRED_SINGLE_FLOAT)
+Target Mask(PAIRED_SINGLE_FLOAT)
 Use paired-single floating-point instructions.
 
 mr10k-cache-barrier=
@@ -357,47 +357,47 @@ EnumValue
 Enum(mips_r10k_cache_barrier_setting) String(none) Value(R10K_CACHE_BARRIER_NONE)
 
 mrelax-pic-calls
-Target Report Mask(RELAX_PIC_CALLS)
+Target Mask(RELAX_PIC_CALLS)
 Try to allow the linker to turn PIC calls into direct calls.
 
 mshared
-Target Report Var(TARGET_SHARED) Init(1)
+Target Var(TARGET_SHARED) Init(1)
 When generating -mabicalls code, make the code suitable for use in shared libraries.
 
 msingle-float
-Target Report RejectNegative Mask(SINGLE_FLOAT)
+Target RejectNegative Mask(SINGLE_FLOAT)
 Restrict the use of hardware floating-point instructions to 32-bit operations.
 
 msmartmips
-Target Report Mask(SMARTMIPS)
+Target Mask(SMARTMIPS)
 Use SmartMIPS instructions.
 
 msoft-float
-Target Report RejectNegative Mask(SOFT_FLOAT_ABI)
+Target RejectNegative Mask(SOFT_FLOAT_ABI)
 Prevent the use of all hardware floating-point instructions.
 
 msplit-addresses
-Target Report Mask(SPLIT_ADDRESSES)
+Target Mask(SPLIT_ADDRESSES)
 Optimize lui/addiu address loads.
 
 msym32
-Target Report Var(TARGET_SYM32)
+Target Var(TARGET_SYM32)
 Assume all symbols have 32-bit values.
 
 msynci
-Target Report Mask(SYNCI)
+Target Mask(SYNCI)
 Use synci instruction to invalidate i-cache.
 
 mlra
-Target Report Var(mips_lra_flag) Init(1) Save
+Target Var(mips_lra_flag) Init(1) Save
 Use LRA instead of reload.
 
 mlxc1-sxc1
-Target Report Var(mips_lxc1_sxc1) Init(1)
+Target Var(mips_lxc1_sxc1) Init(1)
 Use lwxc1/swxc1/ldxc1/sdxc1 instructions where applicable.
 
 mmadd4
-Target Report Var(mips_madd4) Init(1)
+Target Var(mips_madd4) Init(1)
 Use 4-operand madd.s/madd.d and related instructions where applicable.
 
 mtune=
@@ -405,50 +405,50 @@ Target RejectNegative Joined Var(mips_tune_option) ToLower Enum(mips_arch_opt_va
 -mtune=PROCESSOR	Optimize the output for PROCESSOR.
 
 muninit-const-in-rodata
-Target Report Var(TARGET_UNINIT_CONST_IN_RODATA)
+Target Var(TARGET_UNINIT_CONST_IN_RODATA)
 Put uninitialized constants in ROM (needs -membedded-data).
 
 mvirt
-Target Report Var(TARGET_VIRT)
+Target Var(TARGET_VIRT)
 Use Virtualization (VZ) instructions.
 
 mxpa
-Target Report Var(TARGET_XPA)
+Target Var(TARGET_XPA)
 Use eXtended Physical Address (XPA) instructions.
 
 mcrc
-Target Report Var(TARGET_CRC)
+Target Var(TARGET_CRC)
 Use Cyclic Redundancy Check (CRC) instructions.
 
 mginv
-Target Report Var(TARGET_GINV)
+Target Var(TARGET_GINV)
 Use Global INValidate (GINV) instructions.
 
 mvr4130-align
-Target Report Mask(VR4130_ALIGN)
+Target Mask(VR4130_ALIGN)
 Perform VR4130-specific alignment optimizations.
 
 mxgot
-Target Report Var(TARGET_XGOT)
+Target Var(TARGET_XGOT)
 Lift restrictions on GOT size.
 
 modd-spreg
-Target Report Mask(ODD_SPREG)
+Target Mask(ODD_SPREG)
 Enable use of odd-numbered single-precision registers.
 
 mframe-header-opt
-Target Report Var(flag_frame_header_optimization) Optimization
+Target Var(flag_frame_header_optimization) Optimization
 Optimize frame header.
 
 noasmopt
 Driver
 
 mload-store-pairs
-Target Report Var(TARGET_LOAD_STORE_PAIRS) Init(1)
+Target Var(TARGET_LOAD_STORE_PAIRS) Init(1)
 Enable load/store bonding.
 
 mcompact-branches=
-Target RejectNegative JoinedOrMissing Var(mips_cb) Report Enum(mips_cb_setting) Init(MIPS_CB_OPTIMAL)
+Target RejectNegative JoinedOrMissing Var(mips_cb) Enum(mips_cb_setting) Init(MIPS_CB_OPTIMAL)
 Specify the compact branch usage policy.
 
 Enum
@@ -465,13 +465,13 @@ EnumValue
 Enum(mips_cb_setting) String(always) Value(MIPS_CB_ALWAYS)
 
 mloongson-mmi
-Target Report Mask(LOONGSON_MMI)
+Target Mask(LOONGSON_MMI)
 Use Loongson MultiMedia extensions Instructions (MMI) instructions.
 
 mloongson-ext
-Target Report Mask(LOONGSON_EXT)
+Target Mask(LOONGSON_EXT)
 Use Loongson EXTension (EXT) instructions.
 
 mloongson-ext2
-Target Report Var(TARGET_LOONGSON_EXT2)
+Target Var(TARGET_LOONGSON_EXT2)
 Use Loongson EXTension R2 (EXT2) instructions.
diff --git a/gcc/config/mmix/mmix.opt b/gcc/config/mmix/mmix.opt
index c0d3be3894f..38e5c598d7a 100644
--- a/gcc/config/mmix/mmix.opt
+++ b/gcc/config/mmix/mmix.opt
@@ -20,48 +20,48 @@
 
 ; FIXME: Get rid of this one.
 mlibfuncs
-Target Report Mask(LIBFUNC)
+Target Mask(LIBFUNC)
 For intrinsics library: pass all parameters in registers.
 
 mabi=mmixware
-Target Report RejectNegative InverseMask(ABI_GNU)
+Target RejectNegative InverseMask(ABI_GNU)
 Use register stack for parameters and return value.
 
 mabi=gnu
-Target Report RejectNegative Mask(ABI_GNU)
+Target RejectNegative Mask(ABI_GNU)
 Use call-clobbered registers for parameters and return value.
 
 ; FIXME: Provide a way to *load* the epsilon register.
 mepsilon
-Target Report Mask(FCMP_EPSILON)
+Target Mask(FCMP_EPSILON)
 Use epsilon-respecting floating point compare instructions.
 
 mzero-extend
-Target Report Mask(ZERO_EXTEND)
+Target Mask(ZERO_EXTEND)
 Use zero-extending memory loads, not sign-extending ones.
 
 mknuthdiv
-Target Report Mask(KNUTH_DIVISION)
+Target Mask(KNUTH_DIVISION)
 Generate divide results with reminder having the same sign as the divisor (not the dividend).
 
 mtoplevel-symbols
-Target Report Mask(TOPLEVEL_SYMBOLS)
+Target Mask(TOPLEVEL_SYMBOLS)
 Prepend global symbols with \":\" (for use with PREFIX).
 
 mno-set-program-start
-Target Report RejectNegative
+Target RejectNegative
 Do not provide a default start-address 0x100 of the program.
 
 melf
-Target Report RejectNegative
+Target RejectNegative
 Link to emit program in ELF format (rather than mmo).
 
 mbranch-predict
-Target Report RejectNegative Mask(BRANCH_PREDICT)
+Target RejectNegative Mask(BRANCH_PREDICT)
 Use P-mnemonics for branches statically predicted as taken.
 
 mno-branch-predict
-Target Report RejectNegative InverseMask(BRANCH_PREDICT)
+Target RejectNegative InverseMask(BRANCH_PREDICT)
 Don't use P-mnemonics for branches.
 
 ; We use the term "base address" since that's what Knuth uses.  The base
@@ -75,25 +75,25 @@ Don't use P-mnemonics for branches.
 ; registers, and you'll not find out until link time whether you
 ; should have compiled with -mno-base-addresses.
 mbase-addresses
-Target Report RejectNegative Mask(BASE_ADDRESSES)
+Target RejectNegative Mask(BASE_ADDRESSES)
 Use addresses that allocate global registers.
 
 mno-base-addresses
-Target Report RejectNegative InverseMask(BASE_ADDRESSES)
+Target RejectNegative InverseMask(BASE_ADDRESSES)
 Do not use addresses that allocate global registers.
 
 msingle-exit
-Target Report RejectNegative InverseMask(USE_RETURN_INSN)
+Target RejectNegative InverseMask(USE_RETURN_INSN)
 Generate a single exit point for each function.
 
 mno-single-exit
-Target Report RejectNegative Mask(USE_RETURN_INSN)
+Target RejectNegative Mask(USE_RETURN_INSN)
 Do not generate a single exit point for each function.
 
 mset-program-start=
-Target Report RejectNegative Joined
+Target RejectNegative Joined
 Set start-address of the program.
 
 mset-data-start=
-Target Report RejectNegative Joined
+Target RejectNegative Joined
 Set start-address of data.
diff --git a/gcc/config/mn10300/mn10300.opt b/gcc/config/mn10300/mn10300.opt
index 13b45e1f7d7..b1b9c8b2ca4 100644
--- a/gcc/config/mn10300/mn10300.opt
+++ b/gcc/config/mn10300/mn10300.opt
@@ -34,7 +34,7 @@ Target
 Target the AM33/2.0 processor.
 
 mam34
-Target Report
+Target
 Target the AM34 processor.
 
 mtune=
@@ -42,7 +42,7 @@ Target RejectNegative Joined Var(mn10300_tune_string)
 Tune code for the given processor.
 
 mmult-bug
-Target Report Mask(MULT_BUG)
+Target Mask(MULT_BUG)
 Work around hardware multiply bug.
 
 ; Ignored by the compiler
@@ -55,13 +55,13 @@ Target RejectNegative
 Enable linker relaxations.
 
 mreturn-pointer-on-d0
-Target Report Mask(PTR_A0D0)
+Target Mask(PTR_A0D0)
 Return pointers in both a0 and d0.
 
 mliw
-Target Report Mask(ALLOW_LIW)
+Target Mask(ALLOW_LIW)
 Allow gcc to generate LIW instructions.
 
 msetlb
-Target Report Mask(ALLOW_SETLB)
+Target Mask(ALLOW_SETLB)
 Allow gcc to generate the SETLB and Lcc instructions.
diff --git a/gcc/config/moxie/moxie.opt b/gcc/config/moxie/moxie.opt
index e84edd3345b..7c77823e2c0 100644
--- a/gcc/config/moxie/moxie.opt
+++ b/gcc/config/moxie/moxie.opt
@@ -19,15 +19,15 @@
 ; <http://www.gnu.org/licenses/>.
 
 meb
-Target RejectNegative Report InverseMask(LITTLE_ENDIAN)
+Target RejectNegative InverseMask(LITTLE_ENDIAN)
 Generate big-endian code.
 
 mel
-Target RejectNegative Report Mask(LITTLE_ENDIAN)
+Target RejectNegative Mask(LITTLE_ENDIAN)
 Generate little-endian code.
 
 mmul.x
-Target Report Mask(HAS_MULX)
+Target Mask(HAS_MULX)
 Enable MUL.X and UMUL.X instructions.
 
 ; Ignored by the compiler
diff --git a/gcc/config/msp430/msp430.opt b/gcc/config/msp430/msp430.opt
index 692e7dccc9e..56dc996f9d9 100644
--- a/gcc/config/msp430/msp430.opt
+++ b/gcc/config/msp430/msp430.opt
@@ -3,7 +3,7 @@ Target
 Use simulator runtime.
 
 mtiny-printf
-Target Report Mask(TINY_PRINTF)
+Target Mask(TINY_PRINTF)
 Use a lightweight configuration of printf and puts to reduce code size. For single-threaded applications, not requiring reentrant I/O only. Requires Newlib Nano IO.
 
 masm-hex
@@ -11,19 +11,19 @@ Target Mask(ASM_HEX)
 Force assembly output to always use hex constants.
 
 mmcu=
-Target Report ToLower Joined RejectNegative Var(target_mcu)
+Target ToLower Joined RejectNegative Var(target_mcu)
 Specify the MCU to build for.
 
 mwarn-mcu
-Target Report Var(msp430_warn_mcu) Init(1)
+Target Var(msp430_warn_mcu) Init(1)
 Warn if an MCU name is unrecognized or conflicts with other options (default: on).
 
 mwarn-devices-csv
-Target Report Var(msp430_warn_devices_csv) Init(1)
+Target Var(msp430_warn_devices_csv) Init(1)
 Warn if devices.csv is not found or there are problem parsing it (default: on).
 
 mcpu=
-Target Report Joined RejectNegative Var(target_cpu) ToLower Enum(msp430_cpu_types) Init(MSP430_CPU_MSP430X_DEFAULT)
+Target Joined RejectNegative Var(target_cpu) ToLower Enum(msp430_cpu_types) Init(MSP430_CPU_MSP430X_DEFAULT)
 Specify the ISA to build for: msp430, msp430x, msp430xv2.
 
 Enum
@@ -48,29 +48,29 @@ EnumValue
 Enum(msp430_cpu_types) String(430xv2) Value(MSP430_CPU_MSP430XV2)
 
 mlarge
-Target Report Mask(LARGE) RejectNegative
+Target Mask(LARGE) RejectNegative
 Select large model - 20-bit addresses/pointers.
 
 msmall
-Target Report InverseMask(LARGE) RejectNegative
+Target InverseMask(LARGE) RejectNegative
 Select small model - 16-bit addresses/pointers (default).
 
 mrelax
-Target Report
+Target
 Optimize opcode sizes at link time.
 
 mOs
 Target Undocumented Mask(OPT_SPACE)
 
 minrt
-Target Report Mask(MINRT) RejectNegative
+Target Mask(MINRT) RejectNegative
 Use a minimum runtime (no static initializers or ctors) for memory-constrained devices.
 
 HeaderInclude
 config/msp430/msp430-opts.h
 
 mhwmult=
-Target Joined RejectNegative Report ToLower Var(msp430_hwmult_type) Enum(msp430_hwmult_types) Init(MSP430_HWMULT_AUTO)
+Target Joined RejectNegative ToLower Var(msp430_hwmult_type) Enum(msp430_hwmult_types) Init(MSP430_HWMULT_AUTO)
 Specify the type of hardware multiply to support.
 
 Enum
@@ -92,15 +92,15 @@ EnumValue
 Enum(msp430_hwmult_types) String(f5series) Value(MSP430_HWMULT_F5SERIES)
 
 mcode-region=
-Target Joined RejectNegative Report ToLower Var(msp430_code_region) Enum(msp430_regions) Init(MSP430_REGION_LOWER)
+Target Joined RejectNegative ToLower Var(msp430_code_region) Enum(msp430_regions) Init(MSP430_REGION_LOWER)
 Specify whether functions should be placed into the lower or upper memory regions, or if they should be shuffled between the regions (either) for best fit (default: lower).
 
 mdata-region=
-Target Joined RejectNegative Report ToLower Var(msp430_data_region) Enum(msp430_regions) Init(MSP430_REGION_LOWER)
+Target Joined RejectNegative ToLower Var(msp430_data_region) Enum(msp430_regions) Init(MSP430_REGION_LOWER)
 Specify whether variables should be placed into the lower or upper memory regions, or if they should be shuffled between the regions (either) for best fit (default: lower).
 
 muse-lower-region-prefix
-Target Mask(USE_LOWER_REGION_PREFIX) Report
+Target Mask(USE_LOWER_REGION_PREFIX)
 Add the .lower prefix to section names when compiling with -m{code,data}-region=lower (disabled by default).
 
 Enum
@@ -119,20 +119,20 @@ EnumValue
 Enum(msp430_regions) String(upper) Value(MSP430_REGION_UPPER)
 
 msilicon-errata=
-Target Joined RejectNegative Report ToLower
+Target Joined RejectNegative ToLower
 Passes on a request to the assembler to enable fixes for various silicon errata.
 
 msilicon-errata-warn=
-Target Joined RejectNegative Report ToLower
+Target Joined RejectNegative ToLower
 Passes on a request to the assembler to warn about various silicon errata.
 
 mdevices-csv-loc=
-Target Joined Var(msp430_devices_csv_loc) RejectNegative Report
+Target Joined Var(msp430_devices_csv_loc) RejectNegative
 The path to devices.csv.  The GCC driver can normally locate devices.csv itself
 and pass this option to the compiler, so the user shouldn't need to pass this.
 
 mmax-inline-shift=
-Target RejectNegative Joined UInteger IntegerRange(0,65) Var(msp430_max_inline_shift) Init(65) Report
+Target RejectNegative Joined UInteger IntegerRange(0,65) Var(msp430_max_inline_shift) Init(65)
 For shift operations by a constant amount, which require an individual instruction to shift by one
 position, set the maximum number of inline shift instructions (maximum value 64) to emit instead of using the corresponding __mspabi helper function.
 The default value is 4.
diff --git a/gcc/config/nds32/nds32.opt b/gcc/config/nds32/nds32.opt
index 053e810cb71..dcd05c989dc 100644
--- a/gcc/config/nds32/nds32.opt
+++ b/gcc/config/nds32/nds32.opt
@@ -67,11 +67,11 @@ Specify use soft floating point ABI which mean alias to -mabi=2fp+.
 ; ---------------------------------------------------------------
 
 mreduced-regs
-Target Report RejectNegative Negative(mfull-regs) Mask(REDUCED_REGS)
+Target RejectNegative Negative(mfull-regs) Mask(REDUCED_REGS)
 Use reduced-set registers for register allocation.
 
 mfull-regs
-Target Report RejectNegative Negative(mreduced-regs) InverseMask(REDUCED_REGS)
+Target RejectNegative Negative(mreduced-regs) InverseMask(REDUCED_REGS)
 Use full-set registers for register allocation.
 
 ; ---------------------------------------------------------------
@@ -115,43 +115,43 @@ EnumValue
 Enum(nds32_ict_model_type) String(large) Value(ICT_MODEL_LARGE)
 
 mcmov
-Target Report Mask(CMOV)
+Target Mask(CMOV)
 Generate conditional move instructions.
 
 mhw-abs
-Target Report Mask(HW_ABS)
+Target Mask(HW_ABS)
 Generate hardware abs instructions.
 
 mext-perf
-Target Report Mask(EXT_PERF)
+Target Mask(EXT_PERF)
 Generate performance extension instructions.
 
 mext-perf2
-Target Report Mask(EXT_PERF2)
+Target Mask(EXT_PERF2)
 Generate performance extension version 2 instructions.
 
 mext-string
-Target Report Mask(EXT_STRING)
+Target Mask(EXT_STRING)
 Generate string extension instructions.
 
 mext-dsp
-Target Report Mask(EXT_DSP)
+Target Mask(EXT_DSP)
 Generate DSP extension instructions.
 
 mv3push
-Target Report Mask(V3PUSH)
+Target Mask(V3PUSH)
 Generate v3 push25/pop25 instructions.
 
 m16-bit
-Target Report Mask(16_BIT)
+Target Mask(16_BIT)
 Generate 16-bit instructions.
 
 mrelax-hint
-Target Report Mask(RELAX_HINT)
+Target Mask(RELAX_HINT)
 Insert relax hint for linker to do relaxation.
 
 mvh
-Target Report Mask(VH) Condition(!TARGET_LINUX_ABI)
+Target Mask(VH) Condition(!TARGET_LINUX_ABI)
 Enable Virtual Hosting support.
 
 misr-vector-size=
@@ -421,27 +421,27 @@ EnumValue
 Enum(nds32_register_ports) String(2r1w) Value(REG_PORT_2R1W)
 
 mctor-dtor
-Target Report
+Target
 Enable constructor/destructor feature.
 
 mrelax
-Target Report
+Target
 Guide linker to relax instructions.
 
 mext-fpu-fma
-Target Report Mask(EXT_FPU_FMA)
+Target Mask(EXT_FPU_FMA)
 Generate floating-point multiply-accumulation instructions.
 
 mext-fpu-sp
-Target Report Mask(FPU_SINGLE)
+Target Mask(FPU_SINGLE)
 Generate single-precision floating-point instructions.
 
 mext-fpu-dp
-Target Report Mask(FPU_DOUBLE)
+Target Mask(FPU_DOUBLE)
 Generate double-precision floating-point instructions.
 
 mforce-no-ext-dsp
-Target Undocumented Report Mask(FORCE_NO_EXT_DSP)
+Target Undocumented Mask(FORCE_NO_EXT_DSP)
 Force disable hardware loop, even use -mext-dsp.
 
 msched-prolog-epilog
@@ -457,9 +457,9 @@ Target Var(flag_always_save_lp) Init(0)
 Always save $lp in the stack.
 
 munaligned-access
-Target Report Var(flag_unaligned_access) Init(0)
+Target Var(flag_unaligned_access) Init(0)
 Enable unaligned word and halfword accesses to packed data.
 
 minline-asm-r15
-Target Report Var(flag_inline_asm_r15) Init(0)
+Target Var(flag_inline_asm_r15) Init(0)
 Allow use r15 for inline ASM.
diff --git a/gcc/config/nios2/elf.opt b/gcc/config/nios2/elf.opt
index 1a0a13e8436..e8626e0167f 100644
--- a/gcc/config/nios2/elf.opt
+++ b/gcc/config/nios2/elf.opt
@@ -22,7 +22,7 @@
 ; toolchains.
 
 msmallc
-Target Report RejectNegative
+Target RejectNegative
 Link with a limited version of the C library.
 
 msys-lib=
@@ -34,5 +34,5 @@ Target RejectNegative Joined Var(nios2_sys_crt0_string)
 Name of the startfile.
 
 mhal
-Target Report RejectNegative
+Target RejectNegative
 Link with HAL BSP.
diff --git a/gcc/config/nios2/nios2.opt b/gcc/config/nios2/nios2.opt
index 4c6a62b787c..39d278a3df0 100644
--- a/gcc/config/nios2/nios2.opt
+++ b/gcc/config/nios2/nios2.opt
@@ -31,31 +31,31 @@ TargetSave
 int saved_custom_code_index[256]
 
 mhw-div
-Target Report Mask(HAS_DIV)
+Target Mask(HAS_DIV)
 Enable DIV, DIVU.
 
 mhw-mul
-Target Report Mask(HAS_MUL)
+Target Mask(HAS_MUL)
 Enable MUL instructions.
 
 mhw-mulx
-Target Report Mask(HAS_MULX)
+Target Mask(HAS_MULX)
 Enable MULX instructions, assume fast shifter.
 
 mfast-sw-div
-Target Report Mask(FAST_SW_DIV)
+Target Mask(FAST_SW_DIV)
 Use table based fast divide (default at -O3).
 
 mbypass-cache
-Target Report Mask(BYPASS_CACHE)
+Target Mask(BYPASS_CACHE)
 All memory accesses use I/O load/store instructions.
 
 mno-cache-volatile
-Target Report RejectNegative Mask(BYPASS_CACHE_VOLATILE)
+Target RejectNegative Mask(BYPASS_CACHE_VOLATILE)
 Volatile memory accesses use I/O load/store instructions.
 
 mcache-volatile
-Target Report RejectNegative Undocumented InverseMask(BYPASS_CACHE_VOLATILE)
+Target RejectNegative Undocumented InverseMask(BYPASS_CACHE_VOLATILE)
 Volatile memory accesses do not use I/O load/store instructions.
 
 mgpopt=
@@ -82,19 +82,19 @@ EnumValue
 Enum(nios2_gpopt_type) String(all) Value(gpopt_all)
 
 mgpopt
-Target Report RejectNegative Var(nios2_gpopt_option, gpopt_local)
+Target RejectNegative Var(nios2_gpopt_option, gpopt_local)
 Equivalent to -mgpopt=local.
 
 mno-gpopt
-Target Report RejectNegative Var(nios2_gpopt_option, gpopt_none)
+Target RejectNegative Var(nios2_gpopt_option, gpopt_none)
 Equivalent to -mgpopt=none.
 
 meb
-Target Report RejectNegative Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Use big-endian byte order.
 
 mel
-Target Report RejectNegative InverseMask(BIG_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN)
 Use little-endian byte order.
 
 mcustom-fpu-cfg=
@@ -102,467 +102,467 @@ Target RejectNegative Joined Var(nios2_custom_fpu_cfg_string)
 Floating point custom instruction configuration name.
 
 mno-custom-ftruncds
-Target Report RejectNegative Var(nios2_custom_ftruncds, -1)
+Target RejectNegative Var(nios2_custom_ftruncds, -1)
 Do not use the ftruncds custom instruction.
 
 mcustom-ftruncds=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_ftruncds) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_ftruncds) Init(-1)
 Integer id (N) of ftruncds custom instruction.
 
 mno-custom-fextsd
-Target Report RejectNegative Var(nios2_custom_fextsd, -1)
+Target RejectNegative Var(nios2_custom_fextsd, -1)
 Do not use the fextsd custom instruction.
 
 mcustom-fextsd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fextsd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fextsd) Init(-1)
 Integer id (N) of fextsd custom instruction.
 
 mno-custom-fixdu
-Target Report RejectNegative Var(nios2_custom_fixdu, -1)
+Target RejectNegative Var(nios2_custom_fixdu, -1)
 Do not use the fixdu custom instruction.
 
 mcustom-fixdu=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fixdu) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fixdu) Init(-1)
 Integer id (N) of fixdu custom instruction.
 
 mno-custom-fixdi
-Target Report RejectNegative Var(nios2_custom_fixdi, -1)
+Target RejectNegative Var(nios2_custom_fixdi, -1)
 Do not use the fixdi custom instruction.
 
 mcustom-fixdi=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fixdi) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fixdi) Init(-1)
 Integer id (N) of fixdi custom instruction.
 
 mno-custom-fixsu
-Target Report RejectNegative Var(nios2_custom_fixsu, -1)
+Target RejectNegative Var(nios2_custom_fixsu, -1)
 Do not use the fixsu custom instruction.
 
 mcustom-fixsu=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fixsu) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fixsu) Init(-1)
 Integer id (N) of fixsu custom instruction.
 
 mno-custom-fixsi
-Target Report RejectNegative Var(nios2_custom_fixsi, -1)
+Target RejectNegative Var(nios2_custom_fixsi, -1)
 Do not use the fixsi custom instruction.
 
 mcustom-fixsi=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fixsi) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fixsi) Init(-1)
 Integer id (N) of fixsi custom instruction.
 
 mno-custom-floatud
-Target Report RejectNegative Var(nios2_custom_floatud, -1)
+Target RejectNegative Var(nios2_custom_floatud, -1)
 Do not use the floatud custom instruction.
 
 mcustom-floatud=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_floatud) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_floatud) Init(-1)
 Integer id (N) of floatud custom instruction.
 
 mno-custom-floatid
-Target Report RejectNegative Var(nios2_custom_floatid, -1)
+Target RejectNegative Var(nios2_custom_floatid, -1)
 Do not use the floatid custom instruction.
 
 mcustom-floatid=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_floatid) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_floatid) Init(-1)
 Integer id (N) of floatid custom instruction.
 
 mno-custom-floatus
-Target Report RejectNegative Var(nios2_custom_floatus, -1)
+Target RejectNegative Var(nios2_custom_floatus, -1)
 Do not use the floatus custom instruction.
 
 mcustom-floatus=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_floatus) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_floatus) Init(-1)
 Integer id (N) of floatus custom instruction.
 
 mno-custom-floatis
-Target Report RejectNegative Var(nios2_custom_floatis, -1)
+Target RejectNegative Var(nios2_custom_floatis, -1)
 Do not use the floatis custom instruction.
 
 mcustom-floatis=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_floatis) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_floatis) Init(-1)
 Integer id (N) of floatis custom instruction.
 
 mno-custom-fcmpned
-Target Report RejectNegative Var(nios2_custom_fcmpned, -1)
+Target RejectNegative Var(nios2_custom_fcmpned, -1)
 Do not use the fcmpned custom instruction.
 
 mcustom-fcmpned=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpned) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpned) Init(-1)
 Integer id (N) of fcmpned custom instruction.
 
 mno-custom-fcmpeqd
-Target Report RejectNegative Var(nios2_custom_fcmpeqd, -1)
+Target RejectNegative Var(nios2_custom_fcmpeqd, -1)
 Do not use the fcmpeqd custom instruction.
 
 mcustom-fcmpeqd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpeqd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpeqd) Init(-1)
 Integer id (N) of fcmpeqd custom instruction.
 
 mno-custom-fcmpged
-Target Report RejectNegative Var(nios2_custom_fcmpged, -1)
+Target RejectNegative Var(nios2_custom_fcmpged, -1)
 Do not use the fcmpged custom instruction.
 
 mcustom-fcmpged=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpged) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpged) Init(-1)
 Integer id (N) of fcmpged custom instruction.
 
 mno-custom-fcmpgtd
-Target Report RejectNegative Var(nios2_custom_fcmpgtd, -1)
+Target RejectNegative Var(nios2_custom_fcmpgtd, -1)
 Do not use the fcmpgtd custom instruction.
 
 mcustom-fcmpgtd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpgtd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpgtd) Init(-1)
 Integer id (N) of fcmpgtd custom instruction.
 
 mno-custom-fcmpled
-Target Report RejectNegative Var(nios2_custom_fcmpled, -1)
+Target RejectNegative Var(nios2_custom_fcmpled, -1)
 Do not use the fcmpled custom instruction.
 
 mcustom-fcmpled=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpled) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpled) Init(-1)
 Integer id (N) of fcmpled custom instruction.
 
 mno-custom-fcmpltd
-Target Report RejectNegative Var(nios2_custom_fcmpltd, -1)
+Target RejectNegative Var(nios2_custom_fcmpltd, -1)
 Do not use the fcmpltd custom instruction.
 
 mcustom-fcmpltd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpltd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpltd) Init(-1)
 Integer id (N) of fcmpltd custom instruction.
 
 mno-custom-flogd
-Target Report RejectNegative Var(nios2_custom_flogd, -1)
+Target RejectNegative Var(nios2_custom_flogd, -1)
 Do not use the flogd custom instruction.
 
 mcustom-flogd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_flogd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_flogd) Init(-1)
 Integer id (N) of flogd custom instruction.
 
 mno-custom-fexpd
-Target Report RejectNegative Var(nios2_custom_fexpd, -1)
+Target RejectNegative Var(nios2_custom_fexpd, -1)
 Do not use the fexpd custom instruction.
 
 mcustom-fexpd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fexpd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fexpd) Init(-1)
 Integer id (N) of fexpd custom instruction.
 
 mno-custom-fatand
-Target Report RejectNegative Var(nios2_custom_fatand, -1)
+Target RejectNegative Var(nios2_custom_fatand, -1)
 Do not use the fatand custom instruction.
 
 mcustom-fatand=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fatand) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fatand) Init(-1)
 Integer id (N) of fatand custom instruction.
 
 mno-custom-ftand
-Target Report RejectNegative Var(nios2_custom_ftand, -1)
+Target RejectNegative Var(nios2_custom_ftand, -1)
 Do not use the ftand custom instruction.
 
 mcustom-ftand=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_ftand) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_ftand) Init(-1)
 Integer id (N) of ftand custom instruction.
 
 mno-custom-fsind
-Target Report RejectNegative Var(nios2_custom_fsind, -1)
+Target RejectNegative Var(nios2_custom_fsind, -1)
 Do not use the fsind custom instruction.
 
 mcustom-fsind=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fsind) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fsind) Init(-1)
 Integer id (N) of fsind custom instruction.
 
 mno-custom-fcosd
-Target Report RejectNegative Var(nios2_custom_fcosd, -1)
+Target RejectNegative Var(nios2_custom_fcosd, -1)
 Do not use the fcosd custom instruction.
 
 mcustom-fcosd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcosd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcosd) Init(-1)
 Integer id (N) of fcosd custom instruction.
 
 mno-custom-fsqrtd
-Target Report RejectNegative Var(nios2_custom_fsqrtd, -1)
+Target RejectNegative Var(nios2_custom_fsqrtd, -1)
 Do not use the fsqrtd custom instruction.
 
 mcustom-fsqrtd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fsqrtd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fsqrtd) Init(-1)
 Integer id (N) of fsqrtd custom instruction.
 
 mno-custom-fabsd
-Target Report RejectNegative Var(nios2_custom_fabsd, -1)
+Target RejectNegative Var(nios2_custom_fabsd, -1)
 Do not use the fabsd custom instruction.
 
 mcustom-fabsd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fabsd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fabsd) Init(-1)
 Integer id (N) of fabsd custom instruction.
 
 mno-custom-fnegd
-Target Report RejectNegative Var(nios2_custom_fnegd, -1)
+Target RejectNegative Var(nios2_custom_fnegd, -1)
 Do not use the fnegd custom instruction.
 
 mcustom-fnegd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fnegd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fnegd) Init(-1)
 Integer id (N) of fnegd custom instruction.
 
 mno-custom-fmaxd
-Target Report RejectNegative Var(nios2_custom_fmaxd, -1)
+Target RejectNegative Var(nios2_custom_fmaxd, -1)
 Do not use the fmaxd custom instruction.
 
 mcustom-fmaxd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fmaxd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fmaxd) Init(-1)
 Integer id (N) of fmaxd custom instruction.
 
 mno-custom-fmind
-Target Report RejectNegative Var(nios2_custom_fmind, -1)
+Target RejectNegative Var(nios2_custom_fmind, -1)
 Do not use the fmind custom instruction.
 
 mcustom-fmind=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fmind) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fmind) Init(-1)
 Integer id (N) of fmind custom instruction.
 
 mno-custom-fdivd
-Target Report RejectNegative Var(nios2_custom_fdivd, -1)
+Target RejectNegative Var(nios2_custom_fdivd, -1)
 Do not use the fdivd custom instruction.
 
 mcustom-fdivd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fdivd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fdivd) Init(-1)
 Integer id (N) of fdivd custom instruction.
 
 mno-custom-fmuld
-Target Report RejectNegative Var(nios2_custom_fmuld, -1)
+Target RejectNegative Var(nios2_custom_fmuld, -1)
 Do not use the fmuld custom instruction.
 
 mcustom-fmuld=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fmuld) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fmuld) Init(-1)
 Integer id (N) of fmuld custom instruction.
 
 mno-custom-fsubd
-Target Report RejectNegative Var(nios2_custom_fsubd, -1)
+Target RejectNegative Var(nios2_custom_fsubd, -1)
 Do not use the fsubd custom instruction.
 
 mcustom-fsubd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fsubd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fsubd) Init(-1)
 Integer id (N) of fsubd custom instruction.
 
 mno-custom-faddd
-Target Report RejectNegative Var(nios2_custom_faddd, -1)
+Target RejectNegative Var(nios2_custom_faddd, -1)
 Do not use the faddd custom instruction.
 
 mcustom-faddd=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_faddd) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_faddd) Init(-1)
 Integer id (N) of faddd custom instruction.
 
 mno-custom-fcmpnes
-Target Report RejectNegative Var(nios2_custom_fcmpnes, -1)
+Target RejectNegative Var(nios2_custom_fcmpnes, -1)
 Do not use the fcmpnes custom instruction.
 
 mcustom-fcmpnes=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpnes) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpnes) Init(-1)
 Integer id (N) of fcmpnes custom instruction.
 
 mno-custom-fcmpeqs
-Target Report RejectNegative Var(nios2_custom_fcmpeqs, -1)
+Target RejectNegative Var(nios2_custom_fcmpeqs, -1)
 Do not use the fcmpeqs custom instruction.
 
 mcustom-fcmpeqs=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpeqs) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpeqs) Init(-1)
 Integer id (N) of fcmpeqs custom instruction.
 
 mno-custom-fcmpges
-Target Report RejectNegative Var(nios2_custom_fcmpges, -1)
+Target RejectNegative Var(nios2_custom_fcmpges, -1)
 Do not use the fcmpges custom instruction.
 
 mcustom-fcmpges=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpges) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpges) Init(-1)
 Integer id (N) of fcmpges custom instruction.
 
 mno-custom-fcmpgts
-Target Report RejectNegative Var(nios2_custom_fcmpgts, -1)
+Target RejectNegative Var(nios2_custom_fcmpgts, -1)
 Do not use the fcmpgts custom instruction.
 
 mcustom-fcmpgts=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmpgts) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmpgts) Init(-1)
 Integer id (N) of fcmpgts custom instruction.
 
 mno-custom-fcmples
-Target Report RejectNegative Var(nios2_custom_fcmples, -1)
+Target RejectNegative Var(nios2_custom_fcmples, -1)
 Do not use the fcmples custom instruction.
 
 mcustom-fcmples=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmples) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmples) Init(-1)
 Integer id (N) of fcmples custom instruction.
 
 mno-custom-fcmplts
-Target Report RejectNegative Var(nios2_custom_fcmplts, -1)
+Target RejectNegative Var(nios2_custom_fcmplts, -1)
 Do not use the fcmplts custom instruction.
 
 mcustom-fcmplts=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcmplts) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcmplts) Init(-1)
 Integer id (N) of fcmplts custom instruction.
 
 mno-custom-flogs
-Target Report RejectNegative Var(nios2_custom_flogs, -1)
+Target RejectNegative Var(nios2_custom_flogs, -1)
 Do not use the flogs custom instruction.
 
 mcustom-flogs=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_flogs) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_flogs) Init(-1)
 Integer id (N) of flogs custom instruction.
 
 mno-custom-fexps
-Target Report RejectNegative Var(nios2_custom_fexps, -1)
+Target RejectNegative Var(nios2_custom_fexps, -1)
 Do not use the fexps custom instruction.
 
 mcustom-fexps=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fexps) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fexps) Init(-1)
 Integer id (N) of fexps custom instruction.
 
 mno-custom-fatans
-Target Report RejectNegative Var(nios2_custom_fatans, -1)
+Target RejectNegative Var(nios2_custom_fatans, -1)
 Do not use the fatans custom instruction.
 
 mcustom-fatans=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fatans) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fatans) Init(-1)
 Integer id (N) of fatans custom instruction.
 
 mno-custom-ftans
-Target Report RejectNegative Var(nios2_custom_ftans, -1)
+Target RejectNegative Var(nios2_custom_ftans, -1)
 Do not use the ftans custom instruction.
 
 mcustom-ftans=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_ftans) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_ftans) Init(-1)
 Integer id (N) of ftans custom instruction.
 
 mno-custom-fsins
-Target Report RejectNegative Var(nios2_custom_fsins, -1)
+Target RejectNegative Var(nios2_custom_fsins, -1)
 Do not use the fsins custom instruction.
 
 mcustom-fsins=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fsins) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fsins) Init(-1)
 Integer id (N) of fsins custom instruction.
 
 mno-custom-fcoss
-Target Report RejectNegative Var(nios2_custom_fcoss, -1)
+Target RejectNegative Var(nios2_custom_fcoss, -1)
 Do not use the fcoss custom instruction.
 
 mcustom-fcoss=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fcoss) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fcoss) Init(-1)
 Integer id (N) of fcoss custom instruction.
 
 mno-custom-fsqrts
-Target Report RejectNegative Var(nios2_custom_fsqrts, -1)
+Target RejectNegative Var(nios2_custom_fsqrts, -1)
 Do not use the fsqrts custom instruction.
 
 mcustom-fsqrts=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fsqrts) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fsqrts) Init(-1)
 Integer id (N) of fsqrts custom instruction.
 
 mno-custom-fabss
-Target Report RejectNegative Var(nios2_custom_fabss, -1)
+Target RejectNegative Var(nios2_custom_fabss, -1)
 Do not use the fabss custom instr.
 
 mcustom-fabss=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fabss) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fabss) Init(-1)
 Integer id (N) of fabss custom instruction.
 
 mno-custom-fnegs
-Target Report RejectNegative Var(nios2_custom_fnegs, -1)
+Target RejectNegative Var(nios2_custom_fnegs, -1)
 Do not use the fnegs custom instruction.
 
 mcustom-fnegs=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fnegs) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fnegs) Init(-1)
 Integer id (N) of fnegs custom instruction.
 
 mno-custom-fmaxs
-Target Report RejectNegative Var(nios2_custom_fmaxs, -1)
+Target RejectNegative Var(nios2_custom_fmaxs, -1)
 Do not use the fmaxs custom instruction.
 
 mcustom-fmaxs=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fmaxs) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fmaxs) Init(-1)
 Integer id (N) of fmaxs custom instruction.
 
 mno-custom-fmins
-Target Report RejectNegative Var(nios2_custom_fmins, -1)
+Target RejectNegative Var(nios2_custom_fmins, -1)
 Do not use the fmins custom instruction.
 
 mcustom-fmins=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fmins) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fmins) Init(-1)
 Integer id (N) of fmins custom instruction.
 
 mno-custom-fdivs
-Target Report RejectNegative Var(nios2_custom_fdivs, -1)
+Target RejectNegative Var(nios2_custom_fdivs, -1)
 Do not use the fdivs custom instruction.
 
 mcustom-fdivs=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fdivs) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fdivs) Init(-1)
 Integer id (N) of fdivs custom instruction.
 
 mno-custom-fmuls
-Target Report RejectNegative Var(nios2_custom_fmuls, -1)
+Target RejectNegative Var(nios2_custom_fmuls, -1)
 Do not use the fmuls custom instruction.
 
 mcustom-fmuls=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fmuls) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fmuls) Init(-1)
 Integer id (N) of fmuls custom instruction.
 
 mno-custom-fsubs
-Target Report RejectNegative Var(nios2_custom_fsubs, -1)
+Target RejectNegative Var(nios2_custom_fsubs, -1)
 Do not use the fsubs custom instruction.
 
 mcustom-fsubs=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fsubs) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fsubs) Init(-1)
 Integer id (N) of fsubs custom instruction.
 
 mno-custom-fadds
-Target Report RejectNegative Var(nios2_custom_fadds, -1)
+Target RejectNegative Var(nios2_custom_fadds, -1)
 Do not use the fadds custom instruction.
 
 mcustom-fadds=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fadds) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fadds) Init(-1)
 Integer id (N) of fadds custom instruction.
 
 mno-custom-frdy
-Target Report RejectNegative Var(nios2_custom_frdy, -1)
+Target RejectNegative Var(nios2_custom_frdy, -1)
 Do not use the frdy custom instruction.
 
 mcustom-frdy=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_frdy) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_frdy) Init(-1)
 Integer id (N) of frdy custom instruction.
 
 mno-custom-frdxhi
-Target Report RejectNegative Var(nios2_custom_frdxhi, -1)
+Target RejectNegative Var(nios2_custom_frdxhi, -1)
 Do not use the frdxhi custom instruction.
 
 mcustom-frdxhi=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_frdxhi) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_frdxhi) Init(-1)
 Integer id (N) of frdxhi custom instruction.
 
 mno-custom-frdxlo
-Target Report RejectNegative Var(nios2_custom_frdxlo, -1)
+Target RejectNegative Var(nios2_custom_frdxlo, -1)
 Do not use the frdxlo custom instruction.
 
 mcustom-frdxlo=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_frdxlo) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_frdxlo) Init(-1)
 Integer id (N) of frdxlo custom instruction.
 
 mno-custom-fwry
-Target Report RejectNegative Var(nios2_custom_fwry, -1)
+Target RejectNegative Var(nios2_custom_fwry, -1)
 Do not use the fwry custom instruction.
 
 mcustom-fwry=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fwry) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fwry) Init(-1)
 Integer id (N) of fwry custom instruction.
 
 mno-custom-fwrx
-Target Report RejectNegative Var(nios2_custom_fwrx, -1)
+Target RejectNegative Var(nios2_custom_fwrx, -1)
 Do not use the fwrx custom instruction.
 
 mcustom-fwrx=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_fwrx) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_fwrx) Init(-1)
 Integer id (N) of fwrx custom instruction.
 
 mno-custom-round
-Target Report RejectNegative Var(nios2_custom_round, -1)
+Target RejectNegative Var(nios2_custom_round, -1)
 Do not use the round custom instruction.
 
 mcustom-round=
-Target Report RejectNegative Joined UInteger Var(nios2_custom_round) Init(-1)
+Target RejectNegative Joined UInteger Var(nios2_custom_round) Init(-1)
 Integer id (N) of round custom instruction.
 
 march=
@@ -580,11 +580,11 @@ EnumValue
 Enum(nios2_arch_type) String(r2) Value(ARCH_R2)
 
 mbmx
-Target Report Mask(HAS_BMX)
+Target Mask(HAS_BMX)
 Enable generation of R2 BMX instructions.
 
 mcdx
-Target Report Mask(HAS_CDX)
+Target Mask(HAS_CDX)
 Enable generation of R2 CDX instructions.
 
 mgprel-sec=
diff --git a/gcc/config/nvptx/nvptx.opt b/gcc/config/nvptx/nvptx.opt
index 045e3548f2d..465f20e1b7b 100644
--- a/gcc/config/nvptx/nvptx.opt
+++ b/gcc/config/nvptx/nvptx.opt
@@ -20,35 +20,35 @@
 ; It's not clear whether this was ever build/tested/used, so this is no longer
 ; exposed to the user.
 ;m32
-;Target Report RejectNegative InverseMask(ABI64)
+;Target RejectNegative InverseMask(ABI64)
 ;Generate code for a 32-bit ABI.
 
 m64
-Target Report RejectNegative Mask(ABI64)
+Target RejectNegative Mask(ABI64)
 Generate code for a 64-bit ABI.
 
 mmainkernel
-Target Report RejectNegative
+Target RejectNegative
 Link in code for a __main kernel.
 
 moptimize
-Target Report Var(nvptx_optimize) Init(-1)
+Target Var(nvptx_optimize) Init(-1)
 Optimize partition neutering.
 
 msoft-stack
-Target Report Mask(SOFT_STACK)
+Target Mask(SOFT_STACK)
 Use custom stacks instead of local memory for automatic storage.
 
 msoft-stack-reserve-local=
-Target Report Joined RejectNegative UInteger Var(nvptx_softstack_size) Init(128)
+Target Joined RejectNegative UInteger Var(nvptx_softstack_size) Init(128)
 Specify size of .local memory used for stack when the exact amount is not known.
 
 muniform-simt
-Target Report Mask(UNIFORM_SIMT)
+Target Mask(UNIFORM_SIMT)
 Generate code that can keep local state uniform across all lanes.
 
 mgomp
-Target Report Mask(GOMP)
+Target Mask(GOMP)
 Generate code for OpenMP offloading: enables -msoft-stack and -muniform-simt.
 
 Enum
diff --git a/gcc/config/pa/pa.opt b/gcc/config/pa/pa.opt
index c286663ad1f..402a88bce36 100644
--- a/gcc/config/pa/pa.opt
+++ b/gcc/config/pa/pa.opt
@@ -42,23 +42,23 @@ Target Ignore
 Does nothing.  Preserved for backward compatibility.
 
 mcaller-copies
-Target Report Mask(CALLER_COPIES)
+Target Mask(CALLER_COPIES)
 Caller copies function arguments passed by hidden reference.
 
 mcoherent-ldcw
-Target Report Var(TARGET_COHERENT_LDCW) Init(1)
+Target Var(TARGET_COHERENT_LDCW) Init(1)
 Use ldcw/ldcd coherent cache-control hint.
 
 mdisable-fpregs
-Target Report Mask(DISABLE_FPREGS)
+Target Mask(DISABLE_FPREGS)
 Disable FP regs.
 
 mdisable-indexing
-Target Report Mask(DISABLE_INDEXING)
+Target Mask(DISABLE_INDEXING)
 Disable indexed addressing.
 
 mfast-indirect-calls
-Target Report Mask(FAST_INDIRECT_CALLS)
+Target Mask(FAST_INDIRECT_CALLS)
 Generate fast indirect calls.
 
 mfixed-range=
@@ -66,7 +66,7 @@ Target RejectNegative Joined Var(pa_deferred_options) Defer
 Specify range of registers to make fixed.
 
 mgas
-Target Report Mask(GAS)
+Target Mask(GAS)
 Assume code will be assembled by GAS.
 
 mjump-in-delay
@@ -79,11 +79,11 @@ Target RejectNegative
 Enable linker optimizations.
 
 mlong-calls
-Target Report Mask(LONG_CALLS)
+Target Mask(LONG_CALLS)
 Always generate long calls.
 
 mlong-load-store
-Target Report Mask(LONG_LOAD_STORE)
+Target Mask(LONG_LOAD_STORE)
 Emit long load/store sequences.
 
 mnosnake
@@ -91,11 +91,11 @@ Target RejectNegative
 Generate PA1.0 code.
 
 mno-space-regs
-Target RejectNegative Report Mask(NO_SPACE_REGS)
+Target RejectNegative Mask(NO_SPACE_REGS)
 Disable space regs.
 
 mordered
-Target Report Var(TARGET_ORDERED) Init(0)
+Target Var(TARGET_ORDERED) Init(0)
 Assume memory references are ordered and barriers are not needed.
 
 mpa-risc-1-0
@@ -111,7 +111,7 @@ Target RejectNegative Mask(PA_20)
 Generate PA2.0 code (requires binutils 2.10 or later).
 
 mportable-runtime
-Target Report Mask(PORTABLE_RUNTIME)
+Target Mask(PORTABLE_RUNTIME)
 Use portable calling conventions.
 
 mschedule=
@@ -140,7 +140,7 @@ EnumValue
 Enum(pa_schedule) String(7300) Value(PROCESSOR_7300)
 
 msoft-float
-Target Report Mask(SOFT_FLOAT)
+Target Mask(SOFT_FLOAT)
 Use software floating point.
 
 msnake
@@ -148,5 +148,5 @@ Target RejectNegative
 Generate PA1.1 code.
 
 mspace-regs
-Target RejectNegative Report InverseMask(NO_SPACE_REGS)
+Target RejectNegative InverseMask(NO_SPACE_REGS)
 Do not disable space regs.
diff --git a/gcc/config/pdp11/pdp11.opt b/gcc/config/pdp11/pdp11.opt
index 66095a57abe..17a452a9d67 100644
--- a/gcc/config/pdp11/pdp11.opt
+++ b/gcc/config/pdp11/pdp11.opt
@@ -23,49 +23,49 @@ Target RejectNegative
 Generate code for an 11/10.
 
 m40
-Target Report Mask(40)
+Target Mask(40)
 Generate code for an 11/40.
 
 m45
-Target Report Mask(45)
+Target Mask(45)
 Generate code for an 11/45.
 
 mac0
-Target Report Mask(AC0)
+Target Mask(AC0)
 Return floating-point results in ac0 (fr0 in Unix assembler syntax).
 
 mdec-asm
-Target RejectNegative Report Mask(DEC_ASM) Negative(mgnu-asm)
+Target RejectNegative Mask(DEC_ASM) Negative(mgnu-asm)
 Use the DEC assembler syntax.
 
 mgnu-asm
-Target RejectNegative Report Mask(GNU_ASM) Negative(munix-asm)
+Target RejectNegative Mask(GNU_ASM) Negative(munix-asm)
 Use the GNU assembler syntax.
 
 mfpu
-Target RejectNegative Report Mask(FPU)
+Target RejectNegative Mask(FPU)
 Use hardware floating point.
 
 mint16
-Target Report InverseMask(INT32, INT16)
+Target InverseMask(INT32, INT16)
 Use 16 bit int.
 
 mint32
-Target Report Mask(INT32)
+Target Mask(INT32)
 Use 32 bit int.
 
 msoft-float
-Target RejectNegative Report InverseMask(FPU, SOFT_FLOAT)
+Target RejectNegative InverseMask(FPU, SOFT_FLOAT)
 Do not use hardware floating point.
 
 msplit
-Target Report Mask(SPLIT)
+Target Mask(SPLIT)
 Target has split I&D.
 
 munix-asm
-Target RejectNegative Report Mask(UNIX_ASM) Negative(mdec-asm)
+Target RejectNegative Mask(UNIX_ASM) Negative(mdec-asm)
 Use UNIX assembler syntax.
 
 mlra
-Target Report Mask(LRA)
+Target Mask(LRA)
 Use LRA register allocator.
diff --git a/gcc/config/pru/pru.opt b/gcc/config/pru/pru.opt
index 5fe716d3d6a..f44a8f8021e 100644
--- a/gcc/config/pru/pru.opt
+++ b/gcc/config/pru/pru.opt
@@ -22,7 +22,7 @@ HeaderInclude
 config/pru/pru-opts.h
 
 minrt
-Target Report Mask(MINRT) RejectNegative
+Target Mask(MINRT) RejectNegative
 Use a minimum runtime (no static initializers or ctors) for memory-constrained
 devices.
 
@@ -31,7 +31,7 @@ Target RejectNegative Joined
 -mmcu=MCU	Select the target System-On-Chip variant that embeds this PRU.
 
 mno-relax
-Target Report RejectNegative
+Target RejectNegative
 Make GCC pass the --no-relax command-line option to the linker instead of
 the --relax option.
 
@@ -40,7 +40,7 @@ Target Mask(OPT_LOOP)
 Allow (or do not allow) gcc to use the LOOP instruction.
 
 mabi=
-Target RejectNegative Report Joined Enum(pru_abi_t) Var(pru_current_abi) Init(PRU_ABI_GNU) Save
+Target RejectNegative Joined Enum(pru_abi_t) Var(pru_current_abi) Init(PRU_ABI_GNU) Save
 Select target ABI variant.
 
 Enum
diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
index 9cf14bb1bae..25120e2d7f8 100644
--- a/gcc/config/riscv/riscv.opt
+++ b/gcc/config/riscv/riscv.opt
@@ -26,11 +26,11 @@ Target RejectNegative Joined UInteger Var(riscv_branch_cost)
 -mbranch-cost=N	Set the cost of branches to roughly N instructions.
 
 mplt
-Target Report Var(TARGET_PLT) Init(1)
+Target Var(TARGET_PLT) Init(1)
 When generating -fpic code, allow the use of PLTs. Ignored for fno-pic.
 
 mabi=
-Target Report RejectNegative Joined Enum(abi_type) Var(riscv_abi) Init(ABI_ILP32)
+Target RejectNegative Joined Enum(abi_type) Var(riscv_abi) Init(ABI_ILP32)
 Specify integer and floating-point calling convention.
 
 mpreferred-stack-boundary=
@@ -63,15 +63,15 @@ EnumValue
 Enum(abi_type) String(lp64d) Value(ABI_LP64D)
 
 mfdiv
-Target Report Mask(FDIV)
+Target Mask(FDIV)
 Use hardware floating-point divide and square root instructions.
 
 mdiv
-Target Report Mask(DIV)
+Target Mask(DIV)
 Use hardware instructions for integer division.
 
 march=
-Target Report RejectNegative Joined
+Target RejectNegative Joined
 -march=	Generate code for given RISC-V ISA (e.g. RV64IM).  ISA strings must be
 lower-case.
 
@@ -88,7 +88,7 @@ Target Joined Separate UInteger Var(g_switch_value) Init(8)
 -msmall-data-limit=N	Put global and static data smaller than <number> bytes into a special section (on some targets).
 
 msave-restore
-Target Report Mask(SAVE_RESTORE)
+Target Mask(SAVE_RESTORE)
 Use smaller but slower prologue and epilogue code.
 
 mshorten-memrefs
@@ -98,11 +98,11 @@ memory accesses to be generated as compressed instructions.  Currently targets
 32-bit integer load/stores.
 
 mcmodel=
-Target Report RejectNegative Joined Enum(code_model) Var(riscv_cmodel) Init(TARGET_DEFAULT_CMODEL)
+Target RejectNegative Joined Enum(code_model) Var(riscv_cmodel) Init(TARGET_DEFAULT_CMODEL)
 Specify the code model.
 
 mstrict-align
-Target Report Mask(STRICT_ALIGN) Save
+Target Mask(STRICT_ALIGN) Save
 Do not generate unaligned memory accesses.
 
 Enum
@@ -116,7 +116,7 @@ EnumValue
 Enum(code_model) String(medany) Value(CM_MEDANY)
 
 mexplicit-relocs
-Target Report Mask(EXPLICIT_RELOCS)
+Target Mask(EXPLICIT_RELOCS)
 Use %reloc() operators, rather than assembly macros, to load addresses.
 
 mrelax
@@ -139,7 +139,7 @@ Mask(RVC)
 Mask(RVE)
 
 mriscv-attribute
-Target Report Var(riscv_emit_attribute_p) Init(-1)
+Target Var(riscv_emit_attribute_p) Init(-1)
 Emit RISC-V ELF attribute.
 
 malign-data=
@@ -201,5 +201,5 @@ EnumValue
 Enum(isa_spec_class) String(20191213) Value(ISA_SPEC_CLASS_20191213)
 
 misa-spec=
-Target Report RejectNegative Joined Enum(isa_spec_class) Var(riscv_isa_spec) Init(TARGET_DEFAULT_ISA_SPEC)
+Target RejectNegative Joined Enum(isa_spec_class) Var(riscv_isa_spec) Init(TARGET_DEFAULT_ISA_SPEC)
 Set the version of RISC-V ISA spec.
diff --git a/gcc/config/rl78/rl78.opt b/gcc/config/rl78/rl78.opt
index 489697b541c..619e0fd7da8 100644
--- a/gcc/config/rl78/rl78.opt
+++ b/gcc/config/rl78/rl78.opt
@@ -23,11 +23,11 @@ HeaderInclude
 config/rl78/rl78-opts.h
 
 msim
-Target Report
+Target
 Use the simulator runtime.
 
 mmul=
-Target RejectNegative Joined Var(rl78_mul_type) Report Tolower Enum(rl78_mul_types) Init(MUL_UNINIT)
+Target RejectNegative Joined Var(rl78_mul_type) Tolower Enum(rl78_mul_types) Init(MUL_UNINIT)
 Selects the type of hardware multiplication and division to use (none/g13/g14).
 
 Enum
@@ -46,15 +46,15 @@ EnumValue
 Enum(rl78_mul_types) String(rl78) Value(MUL_G14)
 
 mallregs
-Target Mask(ALLREGS) Report Optimization
+Target Mask(ALLREGS) Optimization
 Use all registers, reserving none for interrupt handlers.
 
 mrelax
-Target Report Optimization
+Target Optimization
 Enable assembler and linker relaxation.  Enabled by default at -Os.
 
 mcpu=
-Target RejectNegative Joined Var(rl78_cpu_type) Report ToLower Enum(rl78_cpu_types) Init(CPU_UNINIT)
+Target RejectNegative Joined Var(rl78_cpu_type) ToLower Enum(rl78_cpu_types) Init(CPU_UNINIT)
 Selects the type of RL78 core being targeted (g10/g13/g14).  The default is the G14.  If set, also selects the hardware multiply support to be used.
 
 Enum
@@ -73,19 +73,19 @@ EnumValue
 Enum(rl78_cpu_types) String(rl78) Value(CPU_G14)
 
 mg10
-Target RejectNegative Report Alias(mcpu=, g10)
+Target RejectNegative Alias(mcpu=, g10)
 Alias for -mcpu=g10.
 
 mg13
-Target RejectNegative Report Alias(mcpu=, g13)
+Target RejectNegative Alias(mcpu=, g13)
 Alias for -mcpu=g13.
 
 mg14
-Target RejectNegative Report Alias(mcpu=, g14)
+Target RejectNegative Alias(mcpu=, g14)
 Alias for -mcpu=g14.
 
 mrl78
-Target RejectNegative Report Alias(mcpu=, g14)
+Target RejectNegative Alias(mcpu=, g14)
 Alias for -mcpu=g14.
 
 mes0
diff --git a/gcc/config/rs6000/aix64.opt b/gcc/config/rs6000/aix64.opt
index 48135ce5b17..51d166858f3 100644
--- a/gcc/config/rs6000/aix64.opt
+++ b/gcc/config/rs6000/aix64.opt
@@ -20,11 +20,11 @@
 ; <http://www.gnu.org/licenses/>.
 
 maix64
-Target Report RejectNegative Negative(maix32) Mask(64BIT) Var(rs6000_isa_flags)
+Target RejectNegative Negative(maix32) Mask(64BIT) Var(rs6000_isa_flags)
 Compile for 64-bit pointers.
 
 maix32
-Target Report RejectNegative Negative(maix64) InverseMask(64BIT) Var(rs6000_isa_flags)
+Target RejectNegative Negative(maix64) InverseMask(64BIT) Var(rs6000_isa_flags)
 Compile for 32-bit pointers.
 
 mcmodel=
@@ -45,7 +45,7 @@ EnumValue
 Enum(rs6000_cmodel) String(large) Value(CMODEL_LARGE)
 
 mpe
-Target Report RejectNegative Var(internal_nothing_1) Save
+Target RejectNegative Var(internal_nothing_1) Save
 Support message passing with the Parallel Environment.
 
 posix
diff --git a/gcc/config/rs6000/linux64.opt b/gcc/config/rs6000/linux64.opt
index a0d7864c3e3..cafeb1e24e2 100644
--- a/gcc/config/rs6000/linux64.opt
+++ b/gcc/config/rs6000/linux64.opt
@@ -20,7 +20,7 @@
 ; <http://www.gnu.org/licenses/>.
 
 mprofile-kernel
-Target Report Var(profile_kernel) Save
+Target Var(profile_kernel) Save
 Call mcount for profiling before a function prologue.
 
 mcmodel=
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 2888172cb27..6efeafd2486 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -117,31 +117,31 @@ mpowerpc
 Target RejectNegative Undocumented Ignore
 
 mpowerpc64
-Target Report Mask(POWERPC64) Var(rs6000_isa_flags)
+Target Mask(POWERPC64) Var(rs6000_isa_flags)
 Use PowerPC-64 instruction set.
 
 mpowerpc-gpopt
-Target Report Mask(PPC_GPOPT) Var(rs6000_isa_flags)
+Target Mask(PPC_GPOPT) Var(rs6000_isa_flags)
 Use PowerPC General Purpose group optional instructions.
 
 mpowerpc-gfxopt
-Target Report Mask(PPC_GFXOPT) Var(rs6000_isa_flags)
+Target Mask(PPC_GFXOPT) Var(rs6000_isa_flags)
 Use PowerPC Graphics group optional instructions.
 
 mmfcrf
-Target Report Mask(MFCRF) Var(rs6000_isa_flags)
+Target Mask(MFCRF) Var(rs6000_isa_flags)
 Use PowerPC V2.01 single field mfcr instruction.
 
 mpopcntb
-Target Report Mask(POPCNTB) Var(rs6000_isa_flags)
+Target Mask(POPCNTB) Var(rs6000_isa_flags)
 Use PowerPC V2.02 popcntb instruction.
 
 mfprnd
-Target Report Mask(FPRND) Var(rs6000_isa_flags)
+Target Mask(FPRND) Var(rs6000_isa_flags)
 Use PowerPC V2.02 floating point rounding instructions.
 
 mcmpb
-Target Report Mask(CMPB) Var(rs6000_isa_flags)
+Target Mask(CMPB) Var(rs6000_isa_flags)
 Use PowerPC V2.05 compare bytes instruction.
 
 ;; This option existed in the past, but now is always off.
@@ -152,27 +152,27 @@ mmfpgpr
 Target RejectNegative Undocumented WarnRemoved
 
 maltivec
-Target Report Mask(ALTIVEC) Var(rs6000_isa_flags)
+Target Mask(ALTIVEC) Var(rs6000_isa_flags)
 Use AltiVec instructions.
 
 mfold-gimple
-Target Report Var(rs6000_fold_gimple) Init(1)
+Target Var(rs6000_fold_gimple) Init(1)
 Enable early gimple folding of builtins.
 
 mhard-dfp
-Target Report Mask(DFP) Var(rs6000_isa_flags)
+Target Mask(DFP) Var(rs6000_isa_flags)
 Use decimal floating point instructions.
 
 mmulhw
-Target Report Mask(MULHW) Var(rs6000_isa_flags)
+Target Mask(MULHW) Var(rs6000_isa_flags)
 Use 4xx half-word multiply instructions.
 
 mdlmzb
-Target Report Mask(DLMZB) Var(rs6000_isa_flags)
+Target Mask(DLMZB) Var(rs6000_isa_flags)
 Use 4xx string-search dlmzb instruction.
 
 mmultiple
-Target Report Mask(MULTIPLE) Var(rs6000_isa_flags)
+Target Mask(MULTIPLE) Var(rs6000_isa_flags)
 Generate load/store multiple instructions.
 
 ;; This option existed in the past, but now is always off.
@@ -183,19 +183,19 @@ mstring
 Target RejectNegative Undocumented WarnRemoved
 
 msoft-float
-Target Report RejectNegative Mask(SOFT_FLOAT) Var(rs6000_isa_flags)
+Target RejectNegative Mask(SOFT_FLOAT) Var(rs6000_isa_flags)
 Do not use hardware floating point.
 
 mhard-float
-Target Report RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT) Var(rs6000_isa_flags)
+Target RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT) Var(rs6000_isa_flags)
 Use hardware floating point.
 
 mpopcntd
-Target Report Mask(POPCNTD) Var(rs6000_isa_flags)
+Target Mask(POPCNTD) Var(rs6000_isa_flags)
 Use PowerPC V2.06 popcntd instruction.
 
 mfriz
-Target Report Var(TARGET_FRIZ) Init(-1) Save
+Target Var(TARGET_FRIZ) Init(-1) Save
 Under -ffast-math, generate a FRIZ instruction for (double)(long long) conversions.
 
 mveclibabi=
@@ -203,11 +203,11 @@ Target RejectNegative Joined Var(rs6000_veclibabi_name)
 Vector library ABI to use.
 
 mvsx
-Target Report Mask(VSX) Var(rs6000_isa_flags)
+Target Mask(VSX) Var(rs6000_isa_flags)
 Use vector/scalar (VSX) instructions.
 
 mvsx-align-128
-Target Undocumented Report Var(TARGET_VSX_ALIGN_128) Save
+Target Undocumented Var(TARGET_VSX_ALIGN_128) Save
 ; If -mvsx, set alignment to 128 bits instead of 32/64
 
 mallow-movmisalign
@@ -215,74 +215,74 @@ Target Undocumented Var(TARGET_ALLOW_MOVMISALIGN) Init(-1) Save
 ; Allow the movmisalign in DF/DI vectors
 
 mefficient-unaligned-vsx
-Target Undocumented Report Mask(EFFICIENT_UNALIGNED_VSX) Var(rs6000_isa_flags)
+Target Undocumented Mask(EFFICIENT_UNALIGNED_VSX) Var(rs6000_isa_flags)
 ; Consider unaligned VSX vector and fp accesses to be efficient
 
 msched-groups
-Target Undocumented Report Var(TARGET_SCHED_GROUPS) Init(-1) Save
+Target Undocumented Var(TARGET_SCHED_GROUPS) Init(-1) Save
 ; Explicitly set rs6000_sched_groups
 
 malways-hint
-Target Undocumented Report Var(TARGET_ALWAYS_HINT) Init(-1) Save
+Target Undocumented Var(TARGET_ALWAYS_HINT) Init(-1) Save
 ; Explicitly set rs6000_always_hint
 
 malign-branch-targets
-Target Undocumented Report Var(TARGET_ALIGN_BRANCH_TARGETS) Init(-1) Save
+Target Undocumented Var(TARGET_ALIGN_BRANCH_TARGETS) Init(-1) Save
 ; Explicitly set rs6000_align_branch_targets
 
 mno-update
-Target Report RejectNegative Mask(NO_UPDATE) Var(rs6000_isa_flags)
+Target RejectNegative Mask(NO_UPDATE) Var(rs6000_isa_flags)
 Do not generate load/store with update instructions.
 
 mupdate
-Target Report RejectNegative InverseMask(NO_UPDATE, UPDATE) Var(rs6000_isa_flags)
+Target RejectNegative InverseMask(NO_UPDATE, UPDATE) Var(rs6000_isa_flags)
 Generate load/store with update instructions.
 
 msingle-pic-base
-Target Report Var(TARGET_SINGLE_PIC_BASE) Init(0)
+Target Var(TARGET_SINGLE_PIC_BASE) Init(0)
 Do not load the PIC register in function prologues.
 
 mavoid-indexed-addresses
-Target Report Var(TARGET_AVOID_XFORM) Init(-1) Save
+Target Var(TARGET_AVOID_XFORM) Init(-1) Save
 Avoid generation of indexed load/store instructions when possible.
 
 msched-epilog
 Target Undocumented Var(TARGET_SCHED_PROLOG) Init(1) Save
 
 msched-prolog
-Target Report Var(TARGET_SCHED_PROLOG) Save
+Target Var(TARGET_SCHED_PROLOG) Save
 Schedule the start and end of the procedure.
 
 maix-struct-return
-Target Report RejectNegative Var(aix_struct_return) Save
+Target RejectNegative Var(aix_struct_return) Save
 Return all structures in memory (AIX default).
 
 msvr4-struct-return
-Target Report RejectNegative Var(aix_struct_return,0) Save
+Target RejectNegative Var(aix_struct_return,0) Save
 Return small structures in registers (SVR4 default).
 
 mxl-compat
-Target Report Var(TARGET_XL_COMPAT) Save
+Target Var(TARGET_XL_COMPAT) Save
 Conform more closely to IBM XLC semantics.
 
 mrecip
-Target Report
+Target
 Generate software reciprocal divide and square root for better throughput.
 
 mrecip=
-Target Report RejectNegative Joined Var(rs6000_recip_name)
+Target RejectNegative Joined Var(rs6000_recip_name)
 Generate software reciprocal divide and square root for better throughput.
 
 mrecip-precision
-Target Report Mask(RECIP_PRECISION) Var(rs6000_isa_flags)
+Target Mask(RECIP_PRECISION) Var(rs6000_isa_flags)
 Assume that the reciprocal estimate instructions provide more accuracy.
 
 mno-fp-in-toc
-Target Report RejectNegative Var(TARGET_NO_FP_IN_TOC) Save
+Target RejectNegative Var(TARGET_NO_FP_IN_TOC) Save
 Do not place floating point constants in TOC.
 
 mfp-in-toc
-Target Report RejectNegative Var(TARGET_NO_FP_IN_TOC,0) Save
+Target RejectNegative Var(TARGET_NO_FP_IN_TOC,0) Save
 Place floating point constants in TOC.
 
 mno-sum-in-toc
@@ -301,15 +301,15 @@ Place symbol+offset constants in TOC.
 ;   This is at the cost of having 2 extra loads and one extra store per
 ;   function, and one less allocable register.
 mminimal-toc
-Target Report Mask(MINIMAL_TOC) Var(rs6000_isa_flags)
+Target Mask(MINIMAL_TOC) Var(rs6000_isa_flags)
 Use only one TOC entry per procedure.
 
 mfull-toc
-Target Report
+Target
 Put everything in the regular TOC.
 
 mvrsave
-Target Report Var(TARGET_ALTIVEC_VRSAVE) Save
+Target Var(TARGET_ALTIVEC_VRSAVE) Save
 Generate VRSAVE instructions when generating AltiVec code.
 
 mvrsave=no
@@ -321,11 +321,11 @@ Target RejectNegative Alias(mvrsave) Warn(%<-mvrsave=yes%> is deprecated; use %<
 Deprecated option.  Use -mvrsave instead.
 
 mblock-move-inline-limit=
-Target Report Var(rs6000_block_move_inline_limit) Init(0) RejectNegative Joined UInteger Save
+Target Var(rs6000_block_move_inline_limit) Init(0) RejectNegative Joined UInteger Save
 Max number of bytes to move inline.
 
 mblock-ops-unaligned-vsx
-Target Report Mask(BLOCK_OPS_UNALIGNED_VSX) Var(rs6000_isa_flags)
+Target Mask(BLOCK_OPS_UNALIGNED_VSX) Var(rs6000_isa_flags)
 Generate unaligned VSX load/store for inline expansion of memcpy/memmove.
 
 mblock-ops-vector-pair
@@ -333,19 +333,19 @@ Target Undocumented Mask(BLOCK_OPS_VECTOR_PAIR) Var(rs6000_isa_flags)
 Generate unaligned VSX vector pair load/store for inline expansion of memcpy/memmove.
 
 mblock-compare-inline-limit=
-Target Report Var(rs6000_block_compare_inline_limit) Init(63) RejectNegative Joined UInteger Save
+Target Var(rs6000_block_compare_inline_limit) Init(63) RejectNegative Joined UInteger Save
 Max number of bytes to compare without loops.
 
 mblock-compare-inline-loop-limit=
-Target Report Var(rs6000_block_compare_inline_loop_limit) Init(-1) RejectNegative Joined UInteger Save
+Target Var(rs6000_block_compare_inline_loop_limit) Init(-1) RejectNegative Joined UInteger Save
 Max number of bytes to compare with loops.
 
 mstring-compare-inline-limit=
-Target Report Var(rs6000_string_compare_inline_limit) Init(64) RejectNegative Joined UInteger Save
+Target Var(rs6000_string_compare_inline_limit) Init(64) RejectNegative Joined UInteger Save
 Max number of bytes to compare.
 
 misel
-Target Report Mask(ISEL) Var(rs6000_isa_flags)
+Target Mask(ISEL) Var(rs6000_isa_flags)
 Generate isel instructions.
 
 mdebug=
@@ -409,7 +409,7 @@ EnumValue
 Enum(rs6000_traceback_type) String(no) Value(traceback_none)
 
 mlongcall
-Target Report Var(rs6000_default_long_calls) Save
+Target Var(rs6000_default_long_calls) Save
 Avoid all range limits on call instructions.
 
 ; This option existed in the past, but now is always on.
@@ -456,11 +456,11 @@ Target RejectNegative Joined UInteger Var(rs6000_sched_restricted_insns_priority
 Specify scheduling priority for dispatch slot restricted insns.
 
 mpointers-to-nested-functions
-Target Report Var(TARGET_POINTERS_TO_NESTED_FUNCTIONS) Init(1) Save
+Target Var(TARGET_POINTERS_TO_NESTED_FUNCTIONS) Init(1) Save
 Use r11 to hold the static link in calls to functions via pointers.
 
 msave-toc-indirect
-Target Report Mask(SAVE_TOC_INDIRECT) Var(rs6000_isa_flags)
+Target Mask(SAVE_TOC_INDIRECT) Var(rs6000_isa_flags)
 Save the TOC in the prologue for indirect calls rather than inline.
 
 ; This option existed in the past, but now is always the same as -mvsx.
@@ -468,7 +468,7 @@ mvsx-timode
 Target RejectNegative Undocumented Ignore
 
 mpower8-fusion
-Target Report Mask(P8_FUSION) Var(rs6000_isa_flags)
+Target Mask(P8_FUSION) Var(rs6000_isa_flags)
 Fuse certain integer operations together for better performance on power8.
 
 mpower8-fusion-sign
@@ -476,30 +476,30 @@ Target Undocumented Mask(P8_FUSION_SIGN) Var(rs6000_isa_flags)
 Allow sign extension in fusion operations.
 
 mpower8-vector
-Target Report Mask(P8_VECTOR) Var(rs6000_isa_flags)
+Target Mask(P8_VECTOR) Var(rs6000_isa_flags)
 Use vector and scalar instructions added in ISA 2.07.
 
 mcrypto
-Target Report Mask(CRYPTO) Var(rs6000_isa_flags)
+Target Mask(CRYPTO) Var(rs6000_isa_flags)
 Use ISA 2.07 Category:Vector.AES and Category:Vector.SHA2 instructions.
 
 mdirect-move
 Target Undocumented Mask(DIRECT_MOVE) Var(rs6000_isa_flags) WarnRemoved
 
 mhtm
-Target Report Mask(HTM) Var(rs6000_isa_flags)
+Target Mask(HTM) Var(rs6000_isa_flags)
 Use ISA 2.07 transactional memory (HTM) instructions.
 
 mquad-memory
-Target Report Mask(QUAD_MEMORY) Var(rs6000_isa_flags)
+Target Mask(QUAD_MEMORY) Var(rs6000_isa_flags)
 Generate the quad word memory instructions (lq/stq).
 
 mquad-memory-atomic
-Target Report Mask(QUAD_MEMORY_ATOMIC) Var(rs6000_isa_flags)
+Target Mask(QUAD_MEMORY_ATOMIC) Var(rs6000_isa_flags)
 Generate the quad word memory atomic instructions (lqarx/stqcx).
 
 mcompat-align-parm
-Target Report Var(rs6000_compat_align_parm) Init(0) Save
+Target Var(rs6000_compat_align_parm) Init(0) Save
 Generate aggregate parameter passing code with at most 64-bit alignment.
 
 moptimize-swaps
@@ -511,11 +511,11 @@ Target Undocumented Var(unroll_only_small_loops) Init(0) Save
 ; Use conservative small loop unrolling.
 
 mpower9-misc
-Target Undocumented Report Mask(P9_MISC) Var(rs6000_isa_flags)
+Target Undocumented Mask(P9_MISC) Var(rs6000_isa_flags)
 Use certain scalar instructions added in ISA 3.0.
 
 mpower9-vector
-Target Undocumented Report Mask(P9_VECTOR) Var(rs6000_isa_flags)
+Target Undocumented Mask(P9_VECTOR) Var(rs6000_isa_flags)
 Use vector instructions added in ISA 3.0.
 
 mpower9-minmax
@@ -527,15 +527,15 @@ Target Undocumented Mask(TOC_FUSION) Var(rs6000_isa_flags)
 Fuse medium/large code model toc references with the memory instruction.
 
 mmodulo
-Target Undocumented Report Mask(MODULO) Var(rs6000_isa_flags)
+Target Undocumented Mask(MODULO) Var(rs6000_isa_flags)
 Generate the integer modulo instructions.
 
 mfloat128
-Target Report Mask(FLOAT128_KEYWORD) Var(rs6000_isa_flags)
+Target Mask(FLOAT128_KEYWORD) Var(rs6000_isa_flags)
 Enable IEEE 128-bit floating point via the __float128 keyword.
 
 mfloat128-hardware
-Target Report Mask(FLOAT128_HW) Var(rs6000_isa_flags)
+Target Mask(FLOAT128_HW) Var(rs6000_isa_flags)
 Enable using IEEE 128-bit floating point instructions.
 
 mfloat128-convert
@@ -579,15 +579,15 @@ mpower10
 Target Undocumented Mask(POWER10) Var(rs6000_isa_flags) WarnRemoved
 
 mprefixed
-Target Report Mask(PREFIXED) Var(rs6000_isa_flags)
+Target Mask(PREFIXED) Var(rs6000_isa_flags)
 Generate (do not generate) prefixed memory instructions.
 
 mpcrel
-Target Report Mask(PCREL) Var(rs6000_isa_flags)
+Target Mask(PCREL) Var(rs6000_isa_flags)
 Generate (do not generate) pc-relative memory addressing.
 
 mmma
-Target Report Mask(MMA) Var(rs6000_isa_flags)
+Target Mask(MMA) Var(rs6000_isa_flags)
 Generate (do not generate) MMA instructions.
 
 mrelative-jumptables
diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
index b49ba261f3c..85729f31981 100644
--- a/gcc/config/rs6000/sysv4.opt
+++ b/gcc/config/rs6000/sysv4.opt
@@ -28,7 +28,7 @@ Target RejectNegative Joined Var(rs6000_sdata_name)
 -msdata=[none,data,sysv,eabi]	Select method for sdata handling.
 
 mreadonly-in-sdata
-Target Report Var(rs6000_readonly_in_sdata) Init(1) Save
+Target Var(rs6000_readonly_in_sdata) Init(1) Save
 Allow readonly data in sdata.
 
 mtls-size=
@@ -48,16 +48,16 @@ EnumValue
 Enum(rs6000_tls_size) String(64) Value(64)
 
 mbit-align
-Target Report Var(TARGET_NO_BITFIELD_TYPE) Save
+Target Var(TARGET_NO_BITFIELD_TYPE) Save
 Align to the base type of the bit-field.
 
 mstrict-align
-Target Report Mask(STRICT_ALIGN) Var(rs6000_isa_flags)
+Target Mask(STRICT_ALIGN) Var(rs6000_isa_flags)
 Align to the base type of the bit-field.
 Don't assume that unaligned accesses are handled by the system.
 
 mrelocatable
-Target Report Mask(RELOCATABLE) Var(rs6000_isa_flags)
+Target Mask(RELOCATABLE) Var(rs6000_isa_flags)
 Produce code relocatable at runtime.
 
 mrelocatable-lib
@@ -65,19 +65,19 @@ Target
 Produce code relocatable at runtime.
 
 mlittle-endian
-Target Report RejectNegative Mask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
+Target RejectNegative Mask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
 Produce little endian code.
 
 mlittle
-Target Report RejectNegative Mask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
+Target RejectNegative Mask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
 Produce little endian code.
 
 mbig-endian
-Target Report RejectNegative InverseMask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
+Target RejectNegative InverseMask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
 Produce big endian code.
 
 mbig
-Target Report RejectNegative InverseMask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
+Target RejectNegative InverseMask(LITTLE_ENDIAN) Var(rs6000_isa_flags)
 Produce big endian code.
 
 ;; FIXME: This does nothing.  What should be done?
@@ -99,11 +99,11 @@ Target RejectNegative
 No description yet.
 
 meabi
-Target Report Mask(EABI) Var(rs6000_isa_flags)
+Target Mask(EABI) Var(rs6000_isa_flags)
 Use EABI.
 
 mbit-word
-Target Report Var(TARGET_NO_BITFIELD_WORD) Save
+Target Var(TARGET_NO_BITFIELD_WORD) Save
 Allow bit-fields to cross word boundaries.
 
 mregnames
@@ -141,11 +141,11 @@ Target RejectNegative
 No description yet.
 
 m64
-Target Report RejectNegative Negative(m32) Mask(64BIT) Var(rs6000_isa_flags)
+Target RejectNegative Negative(m32) Mask(64BIT) Var(rs6000_isa_flags)
 Generate 64-bit code.
 
 m32
-Target Report RejectNegative Negative(m64) InverseMask(64BIT) Var(rs6000_isa_flags)
+Target RejectNegative Negative(m64) InverseMask(64BIT) Var(rs6000_isa_flags)
 Generate 32-bit code.
 
 mnewlib
@@ -153,17 +153,17 @@ Target RejectNegative
 No description yet.
 
 msecure-plt
-Target Report RejectNegative Var(secure_plt, 1) Save
+Target RejectNegative Var(secure_plt, 1) Save
 Generate code to use a non-exec PLT and GOT.
 
 mbss-plt
-Target Report RejectNegative Var(secure_plt, 0) Save
+Target RejectNegative Var(secure_plt, 0) Save
 Generate code for old exec BSS PLT.
 
 mpltseq
-Target Report Var(rs6000_pltseq) Init(1) Save
+Target Var(rs6000_pltseq) Init(1) Save
 Use inline plt sequences to implement long calls and -fno-plt.
 
 mgnu-attribute
-Target Report Var(rs6000_gnu_attr) Init(1) Save
+Target Var(rs6000_gnu_attr) Init(1) Save
 Emit .gnu_attribute tags.
diff --git a/gcc/config/rx/elf.opt b/gcc/config/rx/elf.opt
index f130e799680..6145b4d3005 100644
--- a/gcc/config/rx/elf.opt
+++ b/gcc/config/rx/elf.opt
@@ -28,7 +28,7 @@ Use the simulator runtime.
 ;---------------------------------------------------
 
 mas100-syntax
-Target Mask(AS100_SYNTAX) Report
+Target Mask(AS100_SYNTAX)
 Generate assembler output that is compatible with the Renesas AS100 assembler.  This may restrict some of the compiler's capabilities.  The default is to generate GAS compatible syntax.
 
 ;---------------------------------------------------
diff --git a/gcc/config/rx/rx.opt b/gcc/config/rx/rx.opt
index d6426f47ec2..274e18727a4 100644
--- a/gcc/config/rx/rx.opt
+++ b/gcc/config/rx/rx.opt
@@ -25,11 +25,11 @@ config/rx/rx-opts.h
 ; The default is -fpu -m32bit-doubles.
 
 m64bit-doubles
-Target RejectNegative Mask(64BIT_DOUBLES) Report
+Target RejectNegative Mask(64BIT_DOUBLES)
 Store doubles in 64 bits.
 
 m32bit-doubles
-Target RejectNegative InverseMask(64BIT_DOUBLES) Report
+Target RejectNegative InverseMask(64BIT_DOUBLES)
 Stores doubles in 32 bits.  This is the default.
 
 nofpu
@@ -37,16 +37,16 @@ Target RejectNegative Alias(mnofpu)
 Disable the use of RX FPU instructions.
 
 mnofpu
-Target RejectNegative Mask(NO_USE_FPU) Report Undocumented
+Target RejectNegative Mask(NO_USE_FPU) Undocumented
 
 fpu
-Target RejectNegative InverseMask(NO_USE_FPU) Report
+Target RejectNegative InverseMask(NO_USE_FPU)
 Enable the use of RX FPU instructions.  This is the default.
 
 ;---------------------------------------------------
 
 mcpu=
-Target RejectNegative Joined Var(rx_cpu_type) Report ToLower Enum(rx_cpu_types) Init(RX600)
+Target RejectNegative Joined Var(rx_cpu_type) ToLower Enum(rx_cpu_types) Init(RX600)
 Specify the target RX cpu type.
 
 Enum
@@ -67,11 +67,11 @@ Enum(rx_cpu_types) String(rx100) Value(RX100)
 ;---------------------------------------------------
 
 mbig-endian-data
-Target RejectNegative Mask(BIG_ENDIAN_DATA) Report
+Target RejectNegative Mask(BIG_ENDIAN_DATA)
 Data is stored in big-endian format.
 
 mlittle-endian-data
-Target RejectNegative InverseMask(BIG_ENDIAN_DATA) Report
+Target RejectNegative InverseMask(BIG_ENDIAN_DATA)
 Data is stored in little-endian format.  (Default).
 
 ;---------------------------------------------------
@@ -113,33 +113,33 @@ Enables Position-Independent-Data (PID) mode.
 ;---------------------------------------------------
 
 mwarn-multiple-fast-interrupts
-Target Report Var(rx_warn_multiple_fast_interrupts) Init(1) Warning
+Target Var(rx_warn_multiple_fast_interrupts) Init(1) Warning
 Warn when multiple, different, fast interrupt handlers are in the compilation unit.
 
 ;---------------------------------------------------
 
 mgcc-abi
-Target RejectNegative Report Mask(GCC_ABI)
+Target RejectNegative Mask(GCC_ABI)
 Enable the use of the old, broken, ABI where all stacked function arguments are aligned to 32-bits.
 
 mrx-abi
-Target RejectNegative Report InverseMask(GCC_ABI)
+Target RejectNegative InverseMask(GCC_ABI)
 Enable the use the standard RX ABI where all stacked function arguments are naturally aligned.  This is the default.
 
 ;---------------------------------------------------
 
 mlra
-Target Report Mask(ENABLE_LRA)
+Target Mask(ENABLE_LRA)
 Enable the use of the LRA register allocator.
 
 ;---------------------------------------------------
 
 mallow-string-insns
-Target Report Var(rx_allow_string_insns) Init(1)
+Target Var(rx_allow_string_insns) Init(1)
 Enables or disables the use of the SMOVF, SMOVB, SMOVU, SUNTIL, SWHILE and RMPA instructions.  Enabled by default.
 
 ;---------------------------------------------------
 
 mjsr
-Target Report Mask(JSR)
+Target Mask(JSR)
 Always use JSR, never BSR, for calls.
diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
index 0afcea3c3fe..4bee31282db 100644
--- a/gcc/config/s390/s390.opt
+++ b/gcc/config/s390/s390.opt
@@ -44,11 +44,11 @@ Variable
 long s390_cost_pointer
 
 m31
-Target Report RejectNegative Negative(m64) InverseMask(64BIT)
+Target RejectNegative Negative(m64) InverseMask(64BIT)
 31 bit ABI.
 
 m64
-Target Report RejectNegative Negative(m31) Mask(64BIT)
+Target RejectNegative Negative(m31) Mask(64BIT)
 64 bit ABI.
 
 march=
@@ -119,27 +119,27 @@ EnumValue
 Enum(processor_type) String(native) Value(PROCESSOR_NATIVE) DriverOnly
 
 mbackchain
-Target Report Mask(BACKCHAIN) Save
+Target Mask(BACKCHAIN) Save
 Maintain backchain pointer.
 
 mdebug
-Target Report Mask(DEBUG_ARG) Save
+Target Mask(DEBUG_ARG) Save
 Additional debug prints.
 
 mesa
-Target Report RejectNegative Negative(mzarch) InverseMask(ZARCH)
+Target RejectNegative Negative(mzarch) InverseMask(ZARCH)
 ESA/390 architecture.
 
 mhard-dfp
-Target Report Mask(HARD_DFP) Save
+Target Mask(HARD_DFP) Save
 Enable decimal floating point hardware support.
 
 mhard-float
-Target Report RejectNegative Negative(msoft-float) InverseMask(SOFT_FLOAT, HARD_FLOAT) Save
+Target RejectNegative Negative(msoft-float) InverseMask(SOFT_FLOAT, HARD_FLOAT) Save
 Enable hardware floating point.
 
 mhotpatch=
-Target RejectNegative Report Joined Var(s390_deferred_options) Defer
+Target RejectNegative Joined Var(s390_deferred_options) Defer
 Takes two non-negative integer numbers separated by a comma.
 Prepend the function label with the number of two-byte Nop
 instructions indicated by the first.  Append Nop instructions
@@ -149,31 +149,31 @@ label.  Nop instructions of the largest possible size are used
 size.  Using 0 for both values disables hotpatching.
 
 mlong-double-128
-Target Report RejectNegative Negative(mlong-double-64) Mask(LONG_DOUBLE_128)
+Target RejectNegative Negative(mlong-double-64) Mask(LONG_DOUBLE_128)
 Use 128-bit long double.
 
 mlong-double-64
-Target Report RejectNegative Negative(mlong-double-128) InverseMask(LONG_DOUBLE_128)
+Target RejectNegative Negative(mlong-double-128) InverseMask(LONG_DOUBLE_128)
 Use 64-bit long double.
 
 mhtm
-Target Report Mask(OPT_HTM) Save
+Target Mask(OPT_HTM) Save
 Use hardware transactional execution instructions.
 
 mvx
-Target Report Mask(OPT_VX) Save
+Target Mask(OPT_VX) Save
 Use hardware vector facility instructions and enable the vector ABI.
 
 mpacked-stack
-Target Report Mask(PACKED_STACK) Save
+Target Mask(PACKED_STACK) Save
 Use packed stack layout.
 
 msmall-exec
-Target Report Mask(SMALL_EXEC) Save
+Target Mask(SMALL_EXEC) Save
 Use bras for executable < 64k.
 
 msoft-float
-Target Report RejectNegative Negative(mhard-float) Mask(SOFT_FLOAT) Save
+Target RejectNegative Negative(mhard-float) Mask(SOFT_FLOAT) Save
 Disable hardware floating point.
 
 mstack-guard=
@@ -197,11 +197,11 @@ Target RejectNegative Joined Enum(processor_type) Var(s390_tune) Init(PROCESSOR_
 Schedule code for given CPU.
 
 mmvcle
-Target Report Mask(MVCLE) Save
+Target Mask(MVCLE) Save
 Use the mvcle instruction for block moves.
 
 mzvector
-Target Report Mask(ZVECTOR) Save
+Target Mask(ZVECTOR) Save
 Enable the z vector language extension providing the context-sensitive
 vector macro and enable the Altivec-style builtins in vecintrin.h.
 
@@ -214,31 +214,31 @@ Target RejectNegative Joined UInteger Var(s390_warn_framesize) Save
 Warn if a single function's framesize exceeds the given framesize.
 
 mzarch
-Target Report RejectNegative Negative(mesa) Mask(ZARCH)
+Target RejectNegative Negative(mesa) Mask(ZARCH)
 z/Architecture.
 
 mbranch-cost=
-Target Report Joined RejectNegative UInteger Var(s390_branch_cost) Init(1) Save
+Target Joined RejectNegative UInteger Var(s390_branch_cost) Init(1) Save
 Set the branch costs for conditional branch instructions.  Reasonable
 values are small, non-negative integers.  The default branch cost is
 1.
 
 mlra
-Target Report Var(s390_lra_flag) Init(1) Save
+Target Var(s390_lra_flag) Init(1) Save
 Use LRA instead of reload.
 
 mpic-data-is-text-relative
-Target Report Var(s390_pic_data_is_text_relative) Init(TARGET_DEFAULT_PIC_DATA_IS_TEXT_RELATIVE)
+Target Var(s390_pic_data_is_text_relative) Init(TARGET_DEFAULT_PIC_DATA_IS_TEXT_RELATIVE)
 Assume data segments are relative to text segment.
 
 
 mindirect-branch=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(s390_indirect_branch) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(s390_indirect_branch) Init(indirect_branch_keep)
 Wrap all indirect branches into execute in order to disable branch
 prediction.
 
 mindirect-branch-jump=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(s390_indirect_branch_jump) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(s390_indirect_branch_jump) Init(indirect_branch_keep)
 Wrap indirect table jumps and computed gotos into execute in order to
 disable branch prediction.  Using thunk or thunk-extern with this
 option requires the thunks to be considered signal handlers to order to
@@ -246,22 +246,22 @@ generate correct CFI.  For environments where unwinding (e.g. for
 exceptions) is required please use thunk-inline instead.
 
 mindirect-branch-call=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(s390_indirect_branch_call) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(s390_indirect_branch_call) Init(indirect_branch_keep)
 Wrap all indirect calls into execute in order to disable branch prediction.
 
 mfunction-return=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(s390_function_return) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(s390_function_return) Init(indirect_branch_keep)
 Wrap all indirect return branches into execute in order to disable branch
 prediction.
 
 mfunction-return-mem=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(s390_function_return_mem) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(s390_function_return_mem) Init(indirect_branch_keep)
 Wrap indirect return branches into execute in order to disable branch
 prediction. This affects only branches where the return address is
 going to be restored from memory.
 
 mfunction-return-reg=
-Target Report RejectNegative Joined Enum(indirect_branch) Var(s390_function_return_reg) Init(indirect_branch_keep)
+Target RejectNegative Joined Enum(indirect_branch) Var(s390_function_return_reg) Init(indirect_branch_keep)
 Wrap indirect return branches into execute in order to disable branch
 prediction. This affects only branches where the return address
 doesn't need to be restored from memory.
@@ -283,7 +283,7 @@ EnumValue
 Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern)
 
 mindirect-branch-table
-Target Report Var(s390_indirect_branch_table) Init(TARGET_DEFAULT_INDIRECT_BRANCH_TABLE)
+Target Var(s390_indirect_branch_table) Init(TARGET_DEFAULT_INDIRECT_BRANCH_TABLE)
 Generate sections .s390_indirect_jump, .s390_indirect_call,
 .s390_return_reg, and .s390_return_mem to contain the indirect branch
 locations which have been patched as part of using one of the
@@ -292,21 +292,21 @@ consist of an array of 32 bit elements. Each entry holds the offset
 from the entry to the patched location.
 
 mfentry
-Target Report Var(flag_fentry)
+Target Var(flag_fentry)
 Emit profiling counter call at function entry before prologue. The compiled
 code will require a 64-bit CPU and glibc 2.29 or newer to run.
 
 mrecord-mcount
-Target Report Var(flag_record_mcount)
+Target Var(flag_record_mcount)
 Generate __mcount_loc section with all _mcount and __fentry__ calls.
 
 mnop-mcount
-Target Report Var(flag_nop_mcount)
+Target Var(flag_nop_mcount)
 Generate mcount/__fentry__ calls as nops. To activate they need to be
 patched in.
 
 mvx-long-double-fma
-Target Report Undocumented Var(flag_vx_long_double_fma)
+Target Undocumented Var(flag_vx_long_double_fma)
 Emit fused multiply-add instructions for long doubles in vector registers
 (wfmaxb, wfmsxb, wfnmaxb, wfnmsxb).  Reassociation pass does not handle
 fused multiply-adds, therefore code generated by the middle-end is prone to
diff --git a/gcc/config/s390/tpf.opt b/gcc/config/s390/tpf.opt
index 9876a55c57f..6132803586f 100644
--- a/gcc/config/s390/tpf.opt
+++ b/gcc/config/s390/tpf.opt
@@ -19,29 +19,29 @@
 ; <http://www.gnu.org/licenses/>.
 
 mtpf-trace
-Target Report Mask(TPF_PROFILING)
+Target Mask(TPF_PROFILING)
 Enable TPF-OS tracing code.
 
 mtpf-trace-hook-prologue-check=
-Target RejectNegative Report Joined UInteger Var(s390_tpf_trace_hook_prologue_check) Init(TPF_TRACE_PROLOGUE_CHECK)
+Target RejectNegative Joined UInteger Var(s390_tpf_trace_hook_prologue_check) Init(TPF_TRACE_PROLOGUE_CHECK)
 Set the trace check address for prologue tpf hook
 
 mtpf-trace-hook-prologue-target=
-Target RejectNegative Report Joined UInteger Var(s390_tpf_trace_hook_prologue_target) Init(TPF_TRACE_PROLOGUE_TARGET)
+Target RejectNegative Joined UInteger Var(s390_tpf_trace_hook_prologue_target) Init(TPF_TRACE_PROLOGUE_TARGET)
 Set the trace jump address for prologue tpf hook
 
 mtpf-trace-hook-epilogue-check=
-Target RejectNegative Report Joined UInteger Var(s390_tpf_trace_hook_epilogue_check) Init(TPF_TRACE_EPILOGUE_CHECK)
+Target RejectNegative Joined UInteger Var(s390_tpf_trace_hook_epilogue_check) Init(TPF_TRACE_EPILOGUE_CHECK)
 Set the trace check address for epilogue tpf hook
 
 mtpf-trace-hook-epilogue-target=
-Target RejectNegative Report Joined UInteger Var(s390_tpf_trace_hook_epilogue_target) Init(TPF_TRACE_EPILOGUE_TARGET)
+Target RejectNegative Joined UInteger Var(s390_tpf_trace_hook_epilogue_target) Init(TPF_TRACE_EPILOGUE_TARGET)
 Set the trace jump address for epilogue tpf hook
 
 mtpf-trace-skip
-Target Report Var(s390_tpf_trace_skip) Init(0)
+Target Var(s390_tpf_trace_skip) Init(0)
 Set the prologue and epilogue hook addresses to TPF_TRACE_PROLOGUE_SKIP_TARGET and TPF_TRACE_EPILOGUE_SKIP_TARGET. Equivalent to using -mtpf-trace-hook-prologue-target=TPF_TRACE_PROLOGUE_SKIP_TARGET and -mtpf-trace-hook-epilogue-target=TPF_TRACE_EPILOGUE_SKIP_TARGET
 
 mmain
-Target Report
+Target
 Specify main object for TPF-OS.
diff --git a/gcc/config/sh/sh.opt b/gcc/config/sh/sh.opt
index 908603b92e1..fb6d82907b8 100644
--- a/gcc/config/sh/sh.opt
+++ b/gcc/config/sh/sh.opt
@@ -175,19 +175,19 @@ Target RejectNegative Condition(SUPPORT_SH4AL)
 Generate SH4al-dsp code.
 
 maccumulate-outgoing-args
-Target Report Var(TARGET_ACCUMULATE_OUTGOING_ARGS) Init(1)
+Target Var(TARGET_ACCUMULATE_OUTGOING_ARGS) Init(1)
 Reserve space for outgoing arguments in the function prologue.
 
 mb
-Target Report RejectNegative InverseMask(LITTLE_ENDIAN)
+Target RejectNegative InverseMask(LITTLE_ENDIAN)
 Generate code in big endian mode.
 
 mbigtable
-Target Report RejectNegative Mask(BIGTABLE)
+Target RejectNegative Mask(BIGTABLE)
 Generate 32-bit offsets in switch tables.
 
 mbitops
-Target Report RejectNegative Mask(BITOPS)
+Target RejectNegative Mask(BITOPS)
 Generate bit instructions.
 
 mbranch-cost=
@@ -195,15 +195,15 @@ Target RejectNegative Joined UInteger Var(sh_branch_cost) Init(-1)
 Cost to assume for a branch insn.
 
 mzdcbranch
-Target Report Var(TARGET_ZDCBRANCH)
+Target Var(TARGET_ZDCBRANCH)
 Assume that zero displacement conditional branches are fast.
 
 mcbranch-force-delay-slot
-Target Report RejectNegative Var(TARGET_CBRANCH_FORCE_DELAY_SLOT) Init(0)
+Target RejectNegative Var(TARGET_CBRANCH_FORCE_DELAY_SLOT) Init(0)
 Force the usage of delay slots for conditional branches.
 
 mdalign
-Target Report RejectNegative Mask(ALIGN_DOUBLE)
+Target RejectNegative Mask(ALIGN_DOUBLE)
 Align doubles at 64-bit boundaries.
 
 mdiv=
@@ -215,7 +215,7 @@ Target RejectNegative Joined Var(sh_divsi3_libfunc) Init("")
 Specify name for 32 bit signed division function.
 
 mfdpic
-Target Report Var(TARGET_FDPIC) Init(0)
+Target Var(TARGET_FDPIC) Init(0)
 Generate ELF FDPIC code.
 
 mfmovd
@@ -227,7 +227,7 @@ Target RejectNegative Joined Var(sh_fixed_range_str)
 Specify range of registers to make fixed.
 
 mhitachi
-Target Report RejectNegative Mask(HITACHI)
+Target RejectNegative Mask(HITACHI)
 Follow Renesas (formerly Hitachi) / SuperH calling conventions.
 
 mieee
@@ -235,33 +235,33 @@ Target Var(TARGET_IEEE)
 Increase the IEEE compliance for floating-point comparisons.
 
 minline-ic_invalidate
-Target Report Var(TARGET_INLINE_IC_INVALIDATE)
+Target Var(TARGET_INLINE_IC_INVALIDATE)
 Inline code to invalidate instruction cache entries after setting up nested function trampolines.
 
 misize
-Target Report RejectNegative Mask(DUMPISIZE)
+Target RejectNegative Mask(DUMPISIZE)
 Annotate assembler instructions with estimated addresses.
 
 ml
-Target Report RejectNegative Mask(LITTLE_ENDIAN)
+Target RejectNegative Mask(LITTLE_ENDIAN)
 Generate code in little endian mode.
 
 mnomacsave
-Target Report RejectNegative Mask(NOMACSAVE)
+Target RejectNegative Mask(NOMACSAVE)
 Mark MAC register as call-clobbered.
 
 ;; ??? This option is not useful, but is retained in case there are people
 ;; who are still relying on it.  It may be deleted in the future.
 mpadstruct
-Target Report RejectNegative Mask(PADSTRUCT)
+Target RejectNegative Mask(PADSTRUCT)
 Make structs a multiple of 4 bytes (warning: ABI altered).
 
 mprefergot
-Target Report RejectNegative Mask(PREFERGOT)
+Target RejectNegative Mask(PREFERGOT)
 Emit function-calls using global offset table when generating PIC.
 
 mrelax
-Target Report RejectNegative Mask(RELAX)
+Target RejectNegative Mask(RELAX)
 Shorten address references during linking.
 
 mrenesas
@@ -269,11 +269,11 @@ Target Mask(HITACHI)
 Follow Renesas (formerly Hitachi) / SuperH calling conventions.
 
 matomic-model=
-Target Report RejectNegative Joined Var(sh_atomic_model_str)
+Target RejectNegative Joined Var(sh_atomic_model_str)
 Specify the model for atomic operations.
 
 mtas
-Target Report RejectNegative Var(TARGET_ENABLE_TAS)
+Target RejectNegative Var(TARGET_ENABLE_TAS)
 Use tas.b instruction for __atomic_test_and_set.
 
 multcost=
@@ -299,5 +299,5 @@ Target Var(TARGET_FSRRA)
 Enable the use of the fsrra instruction.
 
 mlra
-Target Report Var(sh_lra_flag) Init(0) Save
+Target Var(sh_lra_flag) Init(0) Save
 Use LRA instead of reload (transitional).
diff --git a/gcc/config/sol2.opt b/gcc/config/sol2.opt
index a432ab5f2d4..99cb263e94c 100644
--- a/gcc/config/sol2.opt
+++ b/gcc/config/sol2.opt
@@ -28,11 +28,11 @@ Ym,
 Driver Joined
 
 mclear-hwcap
-Target Report
+Target
 Clear hardware capabilities when linking.
 
 mimpure-text
-Target Report
+Target
 Pass -z text to linker.
 
 pthread
diff --git a/gcc/config/sparc/long-double-switch.opt b/gcc/config/sparc/long-double-switch.opt
index 8139ae661f9..76e25de3f38 100644
--- a/gcc/config/sparc/long-double-switch.opt
+++ b/gcc/config/sparc/long-double-switch.opt
@@ -19,9 +19,9 @@
 ; <http://www.gnu.org/licenses/>.
 
 mlong-double-128
-Target Report RejectNegative Mask(LONG_DOUBLE_128)
+Target RejectNegative Mask(LONG_DOUBLE_128)
 Use 128-bit long double.
 
 mlong-double-64
-Target Report RejectNegative InverseMask(LONG_DOUBLE_128)
+Target RejectNegative InverseMask(LONG_DOUBLE_128)
 Use 64-bit long double.
diff --git a/gcc/config/sparc/sparc.opt b/gcc/config/sparc/sparc.opt
index b3d688b392f..7731e7ecabf 100644
--- a/gcc/config/sparc/sparc.opt
+++ b/gcc/config/sparc/sparc.opt
@@ -26,7 +26,7 @@ TargetVariable
 unsigned int sparc_debug
 
 mfpu
-Target Report Mask(FPU)
+Target Mask(FPU)
 Use hardware FP.
 
 mhard-float
@@ -38,95 +38,95 @@ Target RejectNegative InverseMask(FPU)
 Do not use hardware FP.
 
 mflat
-Target Report Mask(FLAT)
+Target Mask(FLAT)
 Use flat register window model.
 
 munaligned-doubles
-Target Report Mask(UNALIGNED_DOUBLES)
+Target Mask(UNALIGNED_DOUBLES)
 Assume possible double misalignment.
 
 mapp-regs
-Target Report Mask(APP_REGS)
+Target Mask(APP_REGS)
 Use ABI reserved registers.
 
 mhard-quad-float
-Target Report RejectNegative Mask(HARD_QUAD)
+Target RejectNegative Mask(HARD_QUAD)
 Use hardware quad FP instructions.
 
 msoft-quad-float
-Target Report RejectNegative InverseMask(HARD_QUAD)
+Target RejectNegative InverseMask(HARD_QUAD)
 Do not use hardware quad fp instructions.
 
 mlra
-Target Report Mask(LRA)
+Target Mask(LRA)
 Enable Local Register Allocation.
 
 mv8plus
-Target Report Mask(V8PLUS)
+Target Mask(V8PLUS)
 Compile for V8+ ABI.
 
 mvis
-Target Report Mask(VIS)
+Target Mask(VIS)
 Use UltraSPARC Visual Instruction Set version 1.0 extensions.
 
 mvis2
-Target Report Mask(VIS2)
+Target Mask(VIS2)
 Use UltraSPARC Visual Instruction Set version 2.0 extensions.
 
 mvis3
-Target Report Mask(VIS3)
+Target Mask(VIS3)
 Use UltraSPARC Visual Instruction Set version 3.0 extensions.
 
 mvis4
-Target Report Mask(VIS4)
+Target Mask(VIS4)
 Use UltraSPARC Visual Instruction Set version 4.0 extensions.
 
 mvis4b
-Target Report Mask(VIS4B)
+Target Mask(VIS4B)
 Use additional VIS instructions introduced in OSA2017.
 
 mcbcond
-Target Report Mask(CBCOND)
+Target Mask(CBCOND)
 Use UltraSPARC Compare-and-Branch extensions.
 
 mfmaf
-Target Report Mask(FMAF)
+Target Mask(FMAF)
 Use UltraSPARC Fused Multiply-Add extensions.
 
 mfsmuld
-Target Report Mask(FSMULD)
+Target Mask(FSMULD)
 Use Floating-point Multiply Single to Double (FsMULd) instruction.
 
 mpopc
-Target Report Mask(POPC)
+Target Mask(POPC)
 Use UltraSPARC Population-Count instruction.
 
 msubxc
-Target Report Mask(SUBXC)
+Target Mask(SUBXC)
 Use UltraSPARC Subtract-Extended-with-Carry instruction.
 
 mptr64
-Target Report RejectNegative Mask(PTR64)
+Target RejectNegative Mask(PTR64)
 Pointers are 64-bit.
 
 mptr32
-Target Report RejectNegative InverseMask(PTR64)
+Target RejectNegative InverseMask(PTR64)
 Pointers are 32-bit.
 
 m64
-Target Report RejectNegative Mask(64BIT)
+Target RejectNegative Mask(64BIT)
 Use 64-bit ABI.
 
 m32
-Target Report RejectNegative InverseMask(64BIT)
+Target RejectNegative InverseMask(64BIT)
 Use 32-bit ABI.
 
 mstack-bias
-Target Report Mask(STACK_BIAS)
+Target Mask(STACK_BIAS)
 Use stack bias.
 
 mfaster-structs
-Target Report Mask(FASTER_STRUCTS)
+Target Mask(FASTER_STRUCTS)
 Use structs on stronger alignment for double-word copies.
 
 mrelax
@@ -134,7 +134,7 @@ Target
 Optimize tail call instructions in assembler and linker.
 
 muser-mode
-Target Report InverseMask(SV_MODE)
+Target InverseMask(SV_MODE)
 Do not generate code that can only run in supervisor mode (default).
 
 mcpu=
@@ -247,24 +247,24 @@ Target RejectNegative Joined Undocumented Var(sparc_debug_string)
 Enable debug output.
 
 mstd-struct-return
-Target Report Var(sparc_std_struct_return)
+Target Var(sparc_std_struct_return)
 Enable strict 32-bit psABI struct return checking.
 
 mfix-at697f
-Target Report RejectNegative Var(sparc_fix_at697f)
+Target RejectNegative Var(sparc_fix_at697f)
 Enable workaround for single erratum of AT697F processor
 (corresponding to erratum #13 of AT697E processor).
 
 mfix-ut699
-Target Report RejectNegative Var(sparc_fix_ut699)
+Target RejectNegative Var(sparc_fix_ut699)
 Enable workarounds for the errata of the UT699 processor.
 
 mfix-ut700
-Target Report RejectNegative Var(sparc_fix_ut700)
+Target RejectNegative Var(sparc_fix_ut700)
 Enable workarounds for the errata of the UT699E/UT700 processor.
 
 mfix-gr712rc
-Target Report RejectNegative Var(sparc_fix_gr712rc)
+Target RejectNegative Var(sparc_fix_gr712rc)
 Enable workarounds for the errata of the GR712RC processor.
 
 ;; Enable workaround for back-to-back store errata
diff --git a/gcc/config/tilegx/tilegx.opt b/gcc/config/tilegx/tilegx.opt
index bcbadb985fe..883e09a37ea 100644
--- a/gcc/config/tilegx/tilegx.opt
+++ b/gcc/config/tilegx/tilegx.opt
@@ -33,19 +33,19 @@ EnumValue
 Enum(tilegx_cpu) String(tilegx) Value(0)
 
 m32
-Target Report RejectNegative Negative(m64) Mask(32BIT)
+Target RejectNegative Negative(m64) Mask(32BIT)
 Compile with 32 bit longs and pointers.
 
 m64
-Target Report RejectNegative Negative(m32) InverseMask(32BIT, 64BIT)
+Target RejectNegative Negative(m32) InverseMask(32BIT, 64BIT)
 Compile with 64 bit longs and pointers.
 
 mbig-endian
-Target Report RejectNegative Mask(BIG_ENDIAN)
+Target RejectNegative Mask(BIG_ENDIAN)
 Use big-endian byte order.
 
 mlittle-endian
-Target Report RejectNegative InverseMask(BIG_ENDIAN)
+Target RejectNegative InverseMask(BIG_ENDIAN)
 Use little-endian byte order.
 
 mcmodel=
diff --git a/gcc/config/tilepro/tilepro.opt b/gcc/config/tilepro/tilepro.opt
index d97eb043074..e4ed3a04ac0 100644
--- a/gcc/config/tilepro/tilepro.opt
+++ b/gcc/config/tilepro/tilepro.opt
@@ -19,7 +19,7 @@
 ; <http://www.gnu.org/licenses/>.
 
 m32
-Target Report RejectNegative
+Target RejectNegative
 Compile with 32 bit longs and pointers, which is the only supported
 behavior and thus the flag is ignored.
 
diff --git a/gcc/config/v850/v850.opt b/gcc/config/v850/v850.opt
index 723b5a34fca..69d62f34d0b 100644
--- a/gcc/config/v850/v850.opt
+++ b/gcc/config/v850/v850.opt
@@ -25,34 +25,34 @@ Variable
 int small_memory_max[(int)SMALL_MEMORY_max] = { 0, 0, 0 }
 
 mapp-regs
-Target Report Mask(APP_REGS)
+Target Mask(APP_REGS)
 Use registers r2 and r5.
 
 mbig-switch
-Target Report Mask(BIG_SWITCH)
+Target Mask(BIG_SWITCH)
 Use 4 byte entries in switch tables.
 
 mdebug
-Target Report Mask(DEBUG)
+Target Mask(DEBUG)
 Enable backend debugging.
 
 mdisable-callt
-Target Report Mask(DISABLE_CALLT)
+Target Mask(DISABLE_CALLT)
 Do not use the callt instruction (default).
 
 mep
-Target Report Mask(EP)
+Target Mask(EP)
 Reuse r30 on a per function basis.
 
 mghs
 Target RejectNegative InverseMask(GCC_ABI) MaskExists
 
 mlong-calls
-Target Report Mask(LONG_CALLS)
+Target Mask(LONG_CALLS)
 Prohibit PC relative function calls.
 
 mprolog-function
-Target Report Mask(PROLOG_FUNCTION)
+Target Mask(PROLOG_FUNCTION)
 Use stubs for function prologues.
 
 msda=
@@ -63,7 +63,7 @@ msda-
 Target RejectNegative Joined Undocumented Alias(msda=)
 
 msmall-sld
-Target Report Mask(SMALL_SLD)
+Target Mask(SMALL_SLD)
 Enable the use of the short load instructions.
 
 mspace
@@ -78,22 +78,22 @@ mtda-
 Target RejectNegative Joined Undocumented Alias(mtda=)
 
 mno-strict-align
-Target Report Mask(NO_STRICT_ALIGN)
+Target Mask(NO_STRICT_ALIGN)
 Do not enforce strict alignment.
 
 mjump-tables-in-data-section
-Target Report Mask(JUMP_TABLES_IN_DATA_SECTION)
+Target Mask(JUMP_TABLES_IN_DATA_SECTION)
 Put jump tables for switch statements into the .data section rather than the .code section.
 
 mUS-bit-set
-Target Report Mask(US_BIT_SET)
+Target Mask(US_BIT_SET)
 
 mv850
-Target Report RejectNegative Mask(V850)
+Target RejectNegative Mask(V850)
 Compile for the v850 processor.
 
 mv850e
-Target Report RejectNegative Mask(V850E)
+Target RejectNegative Mask(V850E)
 Compile for the v850e processor.
 
 mv850e1
@@ -105,22 +105,22 @@ Target RejectNegative Mask(V850E1)
 Compile for the v850es variant of the v850e1.
 
 mv850e2
-Target Report RejectNegative Mask(V850E2)
+Target RejectNegative Mask(V850E2)
 Compile for the v850e2 processor.
 
 mv850e2v3
-Target Report RejectNegative Mask(V850E2V3)
+Target RejectNegative Mask(V850E2V3)
 Compile for the v850e2v3 processor.
 
 mv850e3v5
-Target Report RejectNegative Mask(V850E3V5)
+Target RejectNegative Mask(V850E3V5)
 Compile for the v850e3v5 processor.
 
 mv850e2v4
 Target RejectNegative Mask(V850E3V5) MaskExists
 
 mloop
-Target Report Mask(LOOP)
+Target Mask(LOOP)
 Enable v850e3v5 loop instructions.
 
 mzda=
@@ -131,29 +131,29 @@ mzda-
 Target RejectNegative Joined Undocumented Alias(mzda=)
 
 mrelax
-Target Report Mask(RELAX)
+Target Mask(RELAX)
 Enable relaxing in the assembler.
 
 mlong-jumps
-Target Report Mask(BIG_SWITCH) MaskExists
+Target Mask(BIG_SWITCH) MaskExists
 Prohibit PC relative jumps.
 
 msoft-float
-Target Report RejectNegative Mask(SOFT_FLOAT)
+Target RejectNegative Mask(SOFT_FLOAT)
 Inhibit the use of hardware floating point instructions.
 
 mhard-float
-Target Report RejectNegative InverseMask(SOFT_FLOAT) MaskExists
+Target RejectNegative InverseMask(SOFT_FLOAT) MaskExists
 Allow the use of hardware floating point instructions for V850E2V3 and up.
 
 mrh850-abi
-Target RejectNegative Report InverseMask(GCC_ABI) MaskExists
+Target RejectNegative InverseMask(GCC_ABI) MaskExists
 Enable support for the RH850 ABI.  This is the default.
 
 mgcc-abi
-Target RejectNegative Report Mask(GCC_ABI)
+Target RejectNegative Mask(GCC_ABI)
 Enable support for the old GCC ABI.
 
 m8byte-align
-Target Report Mask(8BYTE_ALIGN)
+Target Mask(8BYTE_ALIGN)
 Support alignments of up to 64-bits.
diff --git a/gcc/config/visium/visium.opt b/gcc/config/visium/visium.opt
index 9c2bf6d3836..efb792ad9ed 100644
--- a/gcc/config/visium/visium.opt
+++ b/gcc/config/visium/visium.opt
@@ -29,7 +29,7 @@ Target RejectNegative
 Link with libc.a and libsim.a.
 
 mfpu
-Target Report Mask(FPU)
+Target Mask(FPU)
 Use hardware FP (default).
 
 mhard-float
@@ -61,11 +61,11 @@ EnumValue
 Enum(visium_processor_type) String(gr6) Value(PROCESSOR_GR6)
 
 msv-mode
-Target RejectNegative Report Mask(SV_MODE)
+Target RejectNegative Mask(SV_MODE)
 Generate code for the supervisor mode (default).
 
 muser-mode
-Target RejectNegative Report InverseMask(SV_MODE)
+Target RejectNegative InverseMask(SV_MODE)
 Generate code for the user mode.
 
 menable-trampolines
diff --git a/gcc/config/vms/vms.opt b/gcc/config/vms/vms.opt
index 2dda12e334d..827e95f1353 100644
--- a/gcc/config/vms/vms.opt
+++ b/gcc/config/vms/vms.opt
@@ -23,7 +23,7 @@ map
 Target RejectNegative
 
 mmalloc64
-Target Report Var(flag_vms_malloc64) Init(1)
+Target Var(flag_vms_malloc64) Init(1)
 Malloc data into P2 space.
 
 mdebug-main=
@@ -31,11 +31,11 @@ Target RejectNegative Joined Var(vms_debug_main)
 Set name of main routine for the debugger.
 
 mvms-return-codes
-Target Report Var(flag_vms_return_codes)
+Target Var(flag_vms_return_codes)
 Use VMS exit codes instead of posix ones.
 
 mpointer-size=
-Target Joined Report RejectNegative Enum(vms_pointer_size) Var(flag_vms_pointer_size) Init(VMS_POINTER_SIZE_NONE)
+Target Joined RejectNegative Enum(vms_pointer_size) Var(flag_vms_pointer_size) Init(VMS_POINTER_SIZE_NONE)
 -mpointer-size=[no,32,short,64,long]	Set the default pointer size.
 
 Enum
diff --git a/gcc/config/vxworks.opt b/gcc/config/vxworks.opt
index 65295f18bbc..9e0aaf2803f 100644
--- a/gcc/config/vxworks.opt
+++ b/gcc/config/vxworks.opt
@@ -32,7 +32,7 @@ Xbind-now
 Driver Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL)
 
 mrtp
-Target Report RejectNegative Mask(VXWORKS_RTP) Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL)
+Target RejectNegative Mask(VXWORKS_RTP) Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL)
 Assume the VxWorks RTP environment.
 
 ; VxWorks AE has two modes: kernel mode and vThreads mode.  In
diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
index 0c4aa921eff..4887f5a4ff6 100644
--- a/gcc/config/xtensa/xtensa.opt
+++ b/gcc/config/xtensa/xtensa.opt
@@ -19,11 +19,11 @@
 ; <http://www.gnu.org/licenses/>.
 
 mconst16
-Target Report Mask(CONST16)
+Target Mask(CONST16)
 Use CONST16 instruction to load constants.
 
 mforce-no-pic
-Target Report Mask(FORCE_NO_PIC)
+Target Mask(FORCE_NO_PIC)
 Disable position-independent code (PIC) for use in OS kernel code.
 
 mlongcalls
@@ -39,20 +39,20 @@ Target
 Intersperse literal pools with code in the text section.
 
 mauto-litpools
-Target Report Mask(AUTO_LITPOOLS)
+Target Mask(AUTO_LITPOOLS)
 Relax literals in assembler and place them automatically in the text section.
 
 mserialize-volatile
-Target Report Mask(SERIALIZE_VOLATILE)
+Target Mask(SERIALIZE_VOLATILE)
 -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions.
 
 TargetVariable
 int xtensa_windowed_abi = -1
 
 mabi=call0
-Target Report RejectNegative Var(xtensa_windowed_abi, 0)
+Target RejectNegative Var(xtensa_windowed_abi, 0)
 Use call0 ABI.
 
 mabi=windowed
-Target Report RejectNegative Var(xtensa_windowed_abi, 1)
+Target RejectNegative Var(xtensa_windowed_abi, 1)
 Use windowed registers ABI.
diff --git a/gcc/lto/lang.opt b/gcc/lto/lang.opt
index 0d2fbb97c4f..2ef76f187ae 100644
--- a/gcc/lto/lang.opt
+++ b/gcc/lto/lang.opt
@@ -49,12 +49,12 @@ EnumValue
 Enum(lto_linker_output) String(exec) Value(LTO_LINKER_OUTPUT_EXEC)
 
 flinker-output=
-LTO Report Driver Joined RejectNegative Enum(lto_linker_output) Var(flag_lto_linker_output) Init(LTO_LINKER_OUTPUT_UNKNOWN)
+LTO Driver Joined RejectNegative Enum(lto_linker_output) Var(flag_lto_linker_output) Init(LTO_LINKER_OUTPUT_UNKNOWN)
 Set linker output type (used internally during LTO optimization).
 
 
 fltrans
-LTO Report Var(flag_ltrans)
+LTO Var(flag_ltrans)
 Run the link-time optimizer in local transformation (LTRANS) mode.
 
 fltrans-output-list=
@@ -62,7 +62,7 @@ LTO Joined Var(ltrans_output_list)
 Specify a file to which a list of files output by LTRANS is written.
 
 fwpa
-LTO Driver Report
+LTO Driver
 Run the link-time optimizer in whole program analysis (WPA) mode.
 
 fwpa=
-- 
2.29.2

Re: [PATCH 1/2] Remove Report keyword for options

[Jeff Law]

On 12/15/20 1:01 AM, Martin Liška wrote:
> There's a small clean up that removes Report as it's not used
> any longer by -fverbose-asm.
>
> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>
> Ready to be installed?
> Thanks,
> Martin
>
> 0001-Remove-Report-keyword-for-options.patch
>
> From 13c7f39e59862a639823d0f47bbe1f4d9aacd736 Mon Sep 17 00:00:00 2001
> From: Martin Liska <mliska@suse.cz>
> Date: Fri, 11 Dec 2020 17:06:49 +0100
> Subject: [PATCH 1/2] Remove Report keyword for options
>
> Since g:7caa49706316e650fb67719e1a1bf3a35054b685 the option is ignored
> as we print used command line for -fverbose-asm output.
>
> gcc/ChangeLog:
>
> 	* doc/options.texi: Remove Report keyword.
> 	* opt-functions.awk: Print error when Report keyword
> 	is used.
> 	* optc-gen.awk: Do not handle Report keyword.
> 	* opts.h (struct cl_option): Remove cl_report bitfield flag.
Arguably not a bugfix.  But I think this is reasonable, even during stage3.

OK by me, but give Richi and Jakub a couple days if they object due to
it not being a bugfix.

jeff

Re: [PATCH 1/2] Remove Report keyword for options

[Martin Liška]

On 12/15/20 8:42 PM, Jeff Law wrote:
> Arguably not a bugfix.  But I think this is reasonable, even during stage3.

Thank you.

> 
> OK by me, but give Richi and Jakub a couple days if they object due to
> it not being a bugfix.

To be honest it's only removal of a dead code. Hope it's fine to install the patch now.
I'm planning to work some changes related to options and I would appreciate the clean up
to be installed now. That said, I'm going to push the changes.

Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING

On 12/4/20 2:30 PM, Martin Liška wrote:
> On 12/4/20 10:03 AM, Richard Biener wrote:
>> Otherwise 0001- looks good to me.
> 
> Pushed that to master.
> 
>> As said I'd like to see opinions
>> from others on the
>> driver / backend communication for 0002.
> 
> To be honest, we moved back to the original implementation which used
> a temporary file. There hasn't been any opinion for last 8 months :(
> 
> Martin

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^2

On 1/6/21 3:21 PM, Martin Liška wrote:
> PING
> 
> On 12/4/20 2:30 PM, Martin Liška wrote:
>> On 12/4/20 10:03 AM, Richard Biener wrote:
>>> Otherwise 0001- looks good to me.
>>
>> Pushed that to master.
>>
>>> As said I'd like to see opinions
>>> from others on the
>>> driver / backend communication for 0002.
>>
>> To be honest, we moved back to the original implementation which used
>> a temporary file. There hasn't been any opinion for last 8 months :(
>>
>> Martin
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^3

On 1/14/21 10:03 AM, Martin Liška wrote:
> PING^2
> 
> On 1/6/21 3:21 PM, Martin Liška wrote:
>> PING
>>
>> On 12/4/20 2:30 PM, Martin Liška wrote:
>>> On 12/4/20 10:03 AM, Richard Biener wrote:
>>>> Otherwise 0001- looks good to me.
>>>
>>> Pushed that to master.
>>>
>>>> As said I'd like to see opinions
>>>> from others on the
>>>> driver / backend communication for 0002.
>>>
>>> To be honest, we moved back to the original implementation which used
>>> a temporary file. There hasn't been any opinion for last 8 months :(
>>>
>>> Martin
>>
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^4

On 1/22/21 2:33 PM, Martin Liška wrote:
> PING^3
> 
> On 1/14/21 10:03 AM, Martin Liška wrote:
>> PING^2
>>
>> On 1/6/21 3:21 PM, Martin Liška wrote:
>>> PING
>>>
>>> On 12/4/20 2:30 PM, Martin Liška wrote:
>>>> On 12/4/20 10:03 AM, Richard Biener wrote:
>>>>> Otherwise 0001- looks good to me.
>>>>
>>>> Pushed that to master.
>>>>
>>>>> As said I'd like to see opinions
>>>>> from others on the
>>>>> driver / backend communication for 0002.
>>>>
>>>> To be honest, we moved back to the original implementation which used
>>>> a temporary file. There hasn't been any opinion for last 8 months :(
>>>>
>>>> Martin
>>>
>>
> 

[PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

Hello.

Based on discussion with Richi, I'm re-sending the patch. Note that the patch
has been waiting for a review for almost one year and I would like to see
it in GCC 11.1.

Thank you,
Martin

[-- Attachment #2: 0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch --]
[-- Type: text/x-patch, Size: 12697 bytes --]

From 4cb8475a40464d5b7805ececb280bb2463d3caa4 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 5 Feb 2021 10:28:57 +0100
Subject: [PATCH] Change semantics of -frecord-gcc-switches and add
 -frecord-gcc-switches-format.

gcc/ChangeLog:

	* common.opt: Document new options -frecord-gcc-switches-format
	and -frecord-gcc-switches-file.
	* doc/invoke.texi: Document the new options.
	* dwarf2out.c (dwarf2out_early_finish): Respect
	flag_record_gcc_switches_format.
	* flag-types.h (enum record_gcc_switches_format): New.
	* gcc.c (save_driver_cmdline): Save command line to a temporary
	file.
	(driver::main): Call set_commandline.
	(driver::set_commandline): New.
	* gcc.h (set_commandline): New.
	* opts.c (get_driver_command_line): New.
	* opts.h (get_driver_command_line): New.
	* toplev.c (init_asm_output): Use new function get_producer_string.
	(process_options): Respect flag_record_gcc_switches_format
	option.

Co-Authored-By: Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>
---
 gcc/common.opt      | 19 ++++++++++++++++++-
 gcc/doc/invoke.texi | 23 ++++++++++++++++++++++-
 gcc/dwarf2out.c     | 17 ++++++++++++-----
 gcc/flag-types.h    |  7 +++++++
 gcc/gcc.c           | 37 ++++++++++++++++++++++++++++++++++++-
 gcc/gcc.h           |  1 +
 gcc/opts.c          | 31 +++++++++++++++++++++++++++++++
 gcc/opts.h          |  2 ++
 gcc/toplev.c        | 27 ++++++++++++++++++++-------
 9 files changed, 149 insertions(+), 15 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index a8a2b67a99d..088d552cf31 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2326,9 +2326,26 @@ Common Joined RejectNegative Var(common_deferred_options) Defer
 ; records information in the assembler output file as comments, so
 ; they never reach the object file.
 frecord-gcc-switches
-Common Var(flag_record_gcc_switches)
+Common Driver Var(flag_record_gcc_switches)
 Record gcc command line switches in the object file.
 
+Enum
+Name(record_gcc_switches_format) Type(enum record_gcc_switches_format)
+
+EnumValue
+Enum(record_gcc_switches_format) String(processed) Value(RECORD_GCC_SWITCHES_PROCESSED)
+
+EnumValue
+Enum(record_gcc_switches_format) String(driver) Value(RECORD_GCC_SWITCHES_DRIVER)
+
+frecord-gcc-switches-format=
+Common Joined RejectNegative Var(flag_record_gcc_switches_format) Enum(record_gcc_switches_format) Init(RECORD_GCC_SWITCHES_PROCESSED)
+-frecord-gcc-switches-format=[processed|driver]	Format of recorded gcc command line switches.
+
+frecord-gcc-switches-file=
+Common Joined RejectNegative Var(flag_record_gcc_switches_file) Undocumented
+Path to file that contains driver command line options.
+
 freg-struct-return
 Common Var(flag_pcc_struct_return,0) Optimization
 Return small aggregates in registers.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 3751bc3ac7c..acdf9ed2dba 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -654,7 +654,7 @@ Objective-C and Objective-C++ Dialects}.
 -finhibit-size-directive  -fcommon  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC  -fpie  -fPIE  -fno-plt @gol
 -fno-jump-tables -fno-bit-tests @gol
--frecord-gcc-switches @gol
+-frecord-gcc-switches -frecord-gcc-switches-format @gol
 -freg-struct-return  -fshort-enums  -fshort-wchar @gol
 -fverbose-asm  -fpack-struct[=@var{n}]  @gol
 -fleading-underscore  -ftls-model=@var{model} @gol
@@ -16359,6 +16359,27 @@ comments, so it never reaches the object file.
 See also @option{-grecord-gcc-switches} for another
 way of storing compiler options into the object file.
 
+@item -frecord-gcc-switches-format=@var{format}
+@opindex frecord-gcc-switches-format
+This switch controls the output format of options that record
+the command line.  The affected options are @option{-frecord-gcc-switches},
+@option{-grecord-gcc-switches} and @option{-fverbose-asm}.
+
+The @var{format} argument should be one of the following:
+
+@table @samp
+
+@item processed
+
+Options are printed after processing by the compiler driver.
+It is the default option value.
+
+@item driver
+
+Options are printed as provided to the compiler driver.
+
+@end table
+
 @item -fpic
 @opindex fpic
 @cindex global offset table
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 0a61d148c8a..2de79446b5e 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -32149,13 +32149,20 @@ dwarf2out_early_finish (const char *filename)
      header compilation, so always fill it with empty string initially
      and overwrite only here.  */
   dw_attr_node *producer = get_AT (comp_unit_die (), DW_AT_producer);
+  producer_string = concat (lang_hooks.name, " ", version_string, NULL);
 
   if (dwarf_record_gcc_switches)
-    producer_string = gen_producer_string (lang_hooks.name,
-					   save_decoded_options,
-					   save_decoded_options_count);
-  else
-    producer_string = concat (lang_hooks.name, " ", version_string, NULL);
+    {
+      char *producer_string_old = producer_string;
+      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	producer_string = concat (producer_string, " ",
+				  get_driver_command_line (), NULL);
+      else
+	producer_string = gen_producer_string (lang_hooks.name,
+					       save_decoded_options,
+					       save_decoded_options_count);
+      free (producer_string_old);
+    }
 
   producer->dw_attr_val.v.val_str->refcount--;
   producer->dw_attr_val.v.val_str = find_AT_string (producer_string);
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index a038c8fb738..8ab413f5e1d 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -427,6 +427,13 @@ enum openacc_kernels
   OPENACC_KERNELS_PARLOOPS
 };
 
+/* Record GCC options type.  */
+enum record_gcc_switches_format
+{
+  RECORD_GCC_SWITCHES_PROCESSED = 0,
+  RECORD_GCC_SWITCHES_DRIVER
+};
+
 #endif
 
 #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 76f1d422f9a..7cac56416c8 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,12 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv provided to the driver.  Necessary to keep for when
+   -frecord-gcc-switches-format=driver is given.  */
+
+static unsigned int driver_gcc_argc;
+static const char **driver_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -433,6 +439,7 @@ static const char *greater_than_spec_func (int, const char **);
 static const char *debug_level_greater_than_spec_func (int, const char **);
 static const char *dwarf_version_greater_than_spec_func (int, const char **);
 static const char *find_fortran_preinclude_file (int, const char **);
+static const char *save_driver_cmdline (int, const char **);
 static char *convert_white_space (char *);
 static char *quote_spec (char *);
 static char *quote_spec_arg (char *);
@@ -1277,7 +1284,9 @@ static const char *cc1_options =
  %{coverage:-fprofile-arcs -ftest-coverage}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
-     %{pthread:-fprofile-update=prefer-atomic}}}";
+     %{pthread:-fprofile-update=prefer-atomic}}}\
+ %{frecord-gcc-switches-format=driver:-frecord-gcc-switches-file=%:save-driver-cmdline(%g.cmdline)\
+   %<-frecord-gcc-switches-format=driver}";
 
 static const char *asm_options =
 "%{-target-help:%:print-asm-header()} "
@@ -1769,6 +1778,7 @@ static const struct spec_function static_spec_functions[] =
   { "debug-level-gt",		debug_level_greater_than_spec_func },
   { "dwarf-version-gt",		dwarf_version_greater_than_spec_func },
   { "fortran-preinclude-file",	find_fortran_preinclude_file},
+  { "save-driver-cmdline",	save_driver_cmdline},
 #ifdef EXTRA_SPEC_FUNCTIONS
   EXTRA_SPEC_FUNCTIONS
 #endif
@@ -8007,6 +8017,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -8050,6 +8061,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep the command line for -frecord-gcc-switches-format=driver.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  driver_gcc_argc = argc;
+  driver_gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
@@ -10817,6 +10837,21 @@ find_fortran_preinclude_file (int argc, const char **argv)
   return result;
 }
 
+/* Save driver options to a temporary file.  */
+
+static const char *
+save_driver_cmdline (int argc ATTRIBUTE_UNUSED,
+		     const char **argv)
+{
+  FILE *f = fopen (argv[0], "w");
+  for (unsigned int i = 0; i < driver_gcc_argc; i++)
+    fprintf (f, i == 0 ? "%s" : " %s", driver_gcc_argv[i]);
+  fclose (f);
+
+  return argv[0];
+}
+
+
 /* If any character in ORIG fits QUOTE_P (_, P), reallocate the string
    so as to precede every one of them with a backslash.  Return the
    original string or the reallocated one.  */
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 244edbc26c6..809fe14429c 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/opts.c b/gcc/opts.c
index 1f1cf8388f7..eedd3928e16 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -3303,6 +3303,7 @@ gen_command_line_string (cl_decoded_option *options,
       case OPT_SPECIAL_input_file:
       case OPT_grecord_gcc_switches:
       case OPT_frecord_gcc_switches:
+      case OPT_frecord_gcc_switches_format_:
       case OPT__output_pch_:
       case OPT_fdiagnostics_show_location_:
       case OPT_fdiagnostics_show_option:
@@ -3388,6 +3389,36 @@ gen_producer_string (const char *language_string, cl_decoded_option *options,
 		 gen_command_line_string (options, options_count), NULL);
 }
 
+/* Return value of env variable GCC_DRIVER_COMMAND_LINE if exists.
+   Otherwise return empty string.  */
+
+const char *
+get_driver_command_line ()
+{
+  static char *cmdline = NULL;
+
+  if (cmdline != NULL)
+    return cmdline;
+
+  FILE *f = fopen (flag_record_gcc_switches_file, "r");
+  if (f == NULL)
+    fatal_error (UNKNOWN_LOCATION, "cannot open %s: %m", flag_record_gcc_switches_file);
+
+  fseek(f, 0, SEEK_END);
+  unsigned int size = ftell (f);
+  fseek(f, 0, SEEK_SET);
+
+  cmdline = XNEWVEC (char, size + 1);
+
+  unsigned int read;
+  char *ptr = cmdline;
+  while ((read = fread (ptr, 4096, 1, f)))
+    ptr += read;
+
+  cmdline[size] = '\0';
+  return cmdline;
+}
+
 #if CHECKING_P
 
 namespace selftest {
diff --git a/gcc/opts.h b/gcc/opts.h
index a6ed2e3953e..aadb35b4eef 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -486,6 +486,8 @@ extern char *gen_producer_string (const char *language_string,
 				  cl_decoded_option *options,
 				  unsigned int options_count);
 
+extern const char *get_driver_command_line ();
+
 /* Set OPTION in OPTS to VALUE if the option is not set in OPTS_SET.  */
 
 #define SET_OPTION_IF_UNSET(OPTS, OPTS_SET, OPTION, VALUE) \
diff --git a/gcc/toplev.c b/gcc/toplev.c
index a8947a735ff..c6d1355dc57 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -731,11 +731,21 @@ init_asm_output (const char *name)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
 	    {
-	      const char *str
-		= gen_producer_string (lang_hooks.name,
-				       save_decoded_options,
-				       save_decoded_options_count);
-	      targetm.asm_out.record_gcc_switches (str);
+	      if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+		{
+		  const char *str = concat (version_string, " ",
+					    get_driver_command_line (), NULL);
+		  targetm.asm_out.record_gcc_switches (str);
+		  free (CONST_CAST (char *, str));
+		}
+	      else
+		{
+		  const char *str
+		    = gen_producer_string (lang_hooks.name,
+					   save_decoded_options,
+					   save_decoded_options_count);
+		  targetm.asm_out.record_gcc_switches (str);
+		}
 	    }
 	  else
 	    inform (UNKNOWN_LOCATION,
@@ -1384,8 +1394,11 @@ process_options (void)
       if (!quiet_flag)
 	{
 	  fputs ("options passed: ", stderr);
-	  fputs (gen_command_line_string (save_decoded_options,
-					  save_decoded_options_count), stderr);
+	  if (flag_record_gcc_switches_format == RECORD_GCC_SWITCHES_DRIVER)
+	    fputs (get_driver_command_line (), stderr);
+	  else
+	    fputs (gen_command_line_string (save_decoded_options,
+					    save_decoded_options_count), stderr);
 	  fputc ('\n', stderr);
 	}
     }
-- 
2.30.0

Re: [PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Qing Zhao]

Hello,

What’s the status of this patch now? Is there any major technical issue with the patch?

Our company has been waiting for this patch for almost one year, we need it for our important application.

Could this one be approved and committed to gcc11?

Thanks.

Qing

> On Feb 5, 2021, at 3:34 AM, Martin Liška <mliska@suse.cz> wrote:
> 
> Hello.
> 
> Based on discussion with Richi, I'm re-sending the patch. Note that the patch
> has been waiting for a review for almost one year and I would like to see
> it in GCC 11.1.
> 
> Thank you,
> Martin
> <0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch>

Re: [PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 2/16/21 10:17 PM, Qing Zhao wrote:
> Hello,
> 
> What’s the status of this patch now? Is there any major technical issue with the patch?
> 
> Our company has been waiting for this patch for almost one year, we need it for our important application.

Hello.

You are right, we've been waiting for quite some time.

> 
> Could this one be approved and committed to gcc11?

@richi: ?

Thanks,
Martin

> 
> Thanks.
> 
> Qing
> 
>> On Feb 5, 2021, at 3:34 AM, Martin Liška <mliska@suse.cz> wrote:
>>
>> Hello.
>>
>> Based on discussion with Richi, I'm re-sending the patch. Note that the patch
>> has been waiting for a review for almost one year and I would like to see
>> it in GCC 11.1.
>>
>> Thank you,
>> Martin
>> <0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch>
> 

Re: [PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING

On 2/18/21 10:18 AM, Martin Liška wrote:
> On 2/16/21 10:17 PM, Qing Zhao wrote:
>> Hello,
>>
>> What’s the status of this patch now? Is there any major technical issue with the patch?
>>
>> Our company has been waiting for this patch for almost one year, we need it for our important application.
> 
> Hello.
> 
> You are right, we've been waiting for quite some time.
> 
>>
>> Could this one be approved and committed to gcc11?
> 
> @richi: ?
> 
> Thanks,
> Martin
> 
>>
>> Thanks.
>>
>> Qing
>>
>>> On Feb 5, 2021, at 3:34 AM, Martin Liška <mliska@suse.cz> wrote:
>>>
>>> Hello.
>>>
>>> Based on discussion with Richi, I'm re-sending the patch. Note that the patch
>>> has been waiting for a review for almost one year and I would like to see
>>> it in GCC 11.1.
>>>
>>> Thank you,
>>> Martin
>>> <0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch>
>>
> 

Re: [PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

PING^2

On 3/1/21 1:07 PM, Martin Liška wrote:
> PING
> 
> On 2/18/21 10:18 AM, Martin Liška wrote:
>> On 2/16/21 10:17 PM, Qing Zhao wrote:
>>> Hello,
>>>
>>> What’s the status of this patch now? Is there any major technical issue with the patch?
>>>
>>> Our company has been waiting for this patch for almost one year, we need it for our important application.
>>
>> Hello.
>>
>> You are right, we've been waiting for quite some time.
>>
>>>
>>> Could this one be approved and committed to gcc11?
>>
>> @richi: ?
>>
>> Thanks,
>> Martin
>>
>>>
>>> Thanks.
>>>
>>> Qing
>>>
>>>> On Feb 5, 2021, at 3:34 AM, Martin Liška <mliska@suse.cz> wrote:
>>>>
>>>> Hello.
>>>>
>>>> Based on discussion with Richi, I'm re-sending the patch. Note that the patch
>>>> has been waiting for a review for almost one year and I would like to see
>>>> it in GCC 11.1.
>>>>
>>>> Thank you,
>>>> Martin
>>>> <0001-Change-semantics-of-frecord-gcc-switches-and-add-fre.patch>
>>>
>>
> 

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Alexandre Oliva]

Hello, Martin,

Our testing detected unexpected -dumpbase-ext options making to the
producer string.

I tracked it down to something weird that happened in this patch:

On Dec  4, 2020, Martin Liška <mliska@suse.cz> wrote:

> +++ b/gcc/dwarf2out.c
> -      case OPT_dumpbase:
> -      case OPT_dumpbase_ext:
> -      case OPT_dumpdir:

> +++ b/gcc/opts.c
> +      case OPT_dumpbase:
> +      case OPT_dumpdir:

Assuming you didn't really mean to drop the option, the following patch
restores it to the exclusion list in the refactored gen_producer_string.

Regstrapped on x86_64-linux-gnu, installing as obvious.


drop -dumpbase-ext from producer string

From: Alexandre Oliva <oliva@adacore.com>

The -dumpbase and -dumpdir options are excluded from the producer
string output in debug information, but -dumpbase-ext was not.  This
patch excludes it as well.


for  gcc/ChangeLog

	* opts.c (gen_command_line_string): Exclude -dumpbase-ext.
---
 gcc/opts.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/gcc/opts.c b/gcc/opts.c
index 527f0dde70685..437389b3de8e7 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -3284,6 +3284,7 @@ gen_command_line_string (cl_decoded_option *options,
       case OPT_o:
       case OPT_d:
       case OPT_dumpbase:
+      case OPT_dumpbase_ext:
       case OPT_dumpdir:
       case OPT_quiet:
       case OPT_version:


-- 
Alexandre Oliva, happy hacker  https://FSFLA.org/blogs/lxo/
   Free Software Activist         GNU Toolchain Engineer
        Vim, Vi, Voltei pro Emacs -- GNUlius Caesar

Re: [stage1][PATCH] Change semantics of -frecord-gcc-switches and add -frecord-gcc-switches-format.

[Martin Liška]

On 1/15/21 8:14 PM, Alexandre Oliva wrote:
> Hello, Martin,
> 
> Our testing detected unexpected -dumpbase-ext options making to the
> producer string.
> 
> I tracked it down to something weird that happened in this patch:
> 
> On Dec  4, 2020, Martin Liška <mliska@suse.cz> wrote:
> 
>> +++ b/gcc/dwarf2out.c
>> -      case OPT_dumpbase:
>> -      case OPT_dumpbase_ext:
>> -      case OPT_dumpdir:
> 
>> +++ b/gcc/opts.c
>> +      case OPT_dumpbase:
>> +      case OPT_dumpdir:
> 
> Assuming you didn't really mean to drop the option, the following patch
> restores it to the exclusion list in the refactored gen_producer_string.

Hello.

Thank you for the fix. Yes, it was not an intentional change from my side.

Martin

> 
> Regstrapped on x86_64-linux-gnu, installing as obvious.
> 
> 
> drop -dumpbase-ext from producer string
> 
> From: Alexandre Oliva <oliva@adacore.com>
> 
> The -dumpbase and -dumpdir options are excluded from the producer
> string output in debug information, but -dumpbase-ext was not.  This
> patch excludes it as well.
> 
> 
> for  gcc/ChangeLog
> 
> 	* opts.c (gen_command_line_string): Exclude -dumpbase-ext.
> ---
>   gcc/opts.c |    1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/gcc/opts.c b/gcc/opts.c
> index 527f0dde70685..437389b3de8e7 100644
> --- a/gcc/opts.c
> +++ b/gcc/opts.c
> @@ -3284,6 +3284,7 @@ gen_command_line_string (cl_decoded_option *options,
>         case OPT_o:
>         case OPT_d:
>         case OPT_dumpbase:
> +      case OPT_dumpbase_ext:
>         case OPT_dumpdir:
>         case OPT_quiet:
>         case OPT_version:
> 
> 

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Egeyar Bagcioglu]

On 3/4/20 6:23 PM, Martin Liška wrote:
> On 3/4/20 4:25 PM, Egeyar Bagcioglu wrote:
>> Thanks Richard.
>>
>> I do not have write-access to the GCC repo. I'd be glad if someone 
>> commits it for me.
>
> Can we please wait? I'm really convinced we do not want one another 
> very similar
> functionality. 

I am sorry. I thought Richard's comment was only about the third patch, 
which is also necessary for the current -frecord-gcc-switches. 
Therefore, my reply was only for that patch as well.

Regards
Egeyar

> I would definitely recommend to change the semantics
> of -frecord-gcc-switches to what the patchset does.
>
> That's why I added Nick as he's the author of the original 
> implementation.
> Reasoning is provided in my previous email.
>
> Martin

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Richard Biener]

On Wed, Mar 4, 2020 at 8:39 PM Egeyar Bagcioglu
<egeyar.bagcioglu@oracle.com> wrote:
>
>
>
> On 3/4/20 6:23 PM, Martin Liška wrote:
> > On 3/4/20 4:25 PM, Egeyar Bagcioglu wrote:
> >> Thanks Richard.
> >>
> >> I do not have write-access to the GCC repo. I'd be glad if someone
> >> commits it for me.
> >
> > Can we please wait? I'm really convinced we do not want one another
> > very similar
> > functionality.
>
> I am sorry. I thought Richard's comment was only about the third patch,
> which is also necessary for the current -frecord-gcc-switches.
> Therefore, my reply was only for that patch as well.

Yes, my comment / approval was only about preserving the early compile
options for LTO.  I'll commit that piece momentarily.

Richard.

> Regards
> Egeyar
>
> > I would definitely recommend to change the semantics
> > of -frecord-gcc-switches to what the patchset does.
> >
> > That's why I added Nick as he's the author of the original
> > implementation.
> > Reasoning is provided in my previous email.
> >
> > Martin
>

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Andreas Schwab]

On Mär 04 2020, Richard Biener wrote:

> --record-gcc-command-line is not a FSF GCC option, there's
> -frecord-gcc-switches though which

--record-gcc-command-line is translated to -frecord-gcc-switches by the
driver.  That happens for all double-dash options that match an -f
option.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: [PATCH v2 3/3] Keep .GCC.command.line sections of LTO objetcs.

[Egeyar Bagcioglu]

On 3/4/20 4:34 PM, Andreas Schwab wrote:
> On Mär 04 2020, Richard Biener wrote:
>
>> --record-gcc-command-line is not a FSF GCC option, there's
>> -frecord-gcc-switches though which
> --record-gcc-command-line is translated to -frecord-gcc-switches by the
> driver.  That happens for all double-dash options that match an -f
> option.

I think there is a misunderstanding here.

I have just implemented --record-gcc-command-line. I have been testing 
it and no it does not act as -frecord-gcc-switches.

Regards
Egeyar

> Andreas.
>

[PATCH v2 2/3] Introduce the gcc option --record-gcc-command-line

[Egeyar Bagcioglu]

gcc:
2020-02-27  Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* common.opt (--record-gcc-command-line): New option.
	* config/elfos.h (TARGET_ASM_RECORD_GCC_COMMAND_LINE): Define as
	elf_record_gcc_command_line.
	* doc/tm.texi: Regenerate.
	* doc/tm.texi.in (TARGET_ASM_RECORD_GCC_COMMAND_LINE): Introduce.
	(TARGET_ASM_RECORD_GCC_COMMAND_LINE_SECTION): Likewise.
	* gcc.c (_gcc_argc): New static variable.
	(_gcc_argv): Likewise.
	(record_gcc_command_line_spec_function): New function.
	(cc1_options): Handle --record-gcc-command-line.
	(static_spec_functions): Add record_gcc_command_line_spec_function
	with pseudo name record-gcc-command-line.
	(driver::main): Call set_commandline.
	(driver::set_commandline): Declare.
	* gcc.h (driver::set_commandline): Declare.
	* target.def (record_gcc_command_line): A new hook.
	(record_gcc_command_line_section): A new hookpod.
	* target.h (elf_record_gcc_command_line): Declare.
	* toplev.c (init_asm_output): Check for gcc_command_line_file and
	call record_gcc_command_line if necessary.
	* varasm.c: Include "version.h".
	(elf_record_gcc_command_line): Define.

gcc/testsuite:
2020-02-27  Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* c-c++-common/record-gcc-command-line.c: New.
---
 gcc/common.opt                                     |  4 +++
 gcc/config/elfos.h                                 |  5 +++
 gcc/doc/tm.texi                                    | 22 ++++++++++++
 gcc/doc/tm.texi.in                                 |  4 +++
 gcc/gcc.c                                          | 41 ++++++++++++++++++++++
 gcc/gcc.h                                          |  1 +
 gcc/target.def                                     | 30 ++++++++++++++++
 gcc/target.h                                       |  3 ++
 .../c-c++-common/record-gcc-command-line.c         |  8 +++++
 gcc/toplev.c                                       | 13 +++++++
 gcc/varasm.c                                       | 40 +++++++++++++++++++++
 11 files changed, 171 insertions(+)
 create mode 100644 gcc/testsuite/c-c++-common/record-gcc-command-line.c

diff --git a/gcc/common.opt b/gcc/common.opt
index fa9da50..1bacded 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -391,6 +391,10 @@ Driver Alias(print-sysroot-headers-suffix)
 -profile
 Common Alias(p)
 
+-record-gcc-command-line
+Common NoDriverArg Separate Var(gcc_command_line_file)
+Record the command line making this gcc call in the produced object file.
+
 -save-temps
 Driver Alias(save-temps)
 
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index 74a3eaf..1d5f447 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -462,6 +462,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #undef  TARGET_ASM_RECORD_GCC_SWITCHES
 #define TARGET_ASM_RECORD_GCC_SWITCHES elf_record_gcc_switches
 
+/* Allow the use of the --record-gcc-command-line switch via the
+   elf_record_gcc_command_line function defined in varasm.c.  */
+#undef  TARGET_ASM_RECORD_GCC_COMMAND_LINE
+#define TARGET_ASM_RECORD_GCC_COMMAND_LINE elf_record_gcc_command_line
+
 /* A C statement (sans semicolon) to output to the stdio stream STREAM
    any text necessary for declaring the name of an external symbol
    named NAME which is referenced in this compilation but not defined.
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 19985ad..0a8ef03 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8113,6 +8113,28 @@ ELF implementation of the @code{TARGET_ASM_RECORD_GCC_SWITCHES} target
 hook.
 @end deftypevr
 
+@deftypefn {Target Hook} int TARGET_ASM_RECORD_GCC_COMMAND_LINE ()
+Provides the target with the ability to record the command line that
+has been passed to the compiler driver. The @var{gcc_command_line_file}
+variable specifies the intermediate file that holds the command line.
+
+The return value must be zero.  Other return values may be supported
+in the future.
+
+By default this hook is set to NULL, but an example implementation,
+@var{elf_record_gcc_command_line}, is provided for ELF based targets.
+it records the command line as ASCII text inside a new, mergable string
+section in the assembler output file.  The name of the new section is
+provided by the @code{TARGET_ASM_RECORD_GCC_COMMAND_LINE_SECTION}
+target hook.
+@end deftypefn
+
+@deftypevr {Target Hook} {const char *} TARGET_ASM_RECORD_GCC_COMMAND_LINE_SECTION
+This is the name of the section that will be created by the example
+ELF implementation of the @code{TARGET_ASM_RECORD_GCC_COMMAND_LINE}
+target hook.
+@end deftypevr
+
 @need 2000
 @node Data Output
 @subsection Output of Data
diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index 1a16150..174840b 100644
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -5192,6 +5192,10 @@ It must not be modified by command-line option processing.
 
 @hook TARGET_ASM_RECORD_GCC_SWITCHES_SECTION
 
+@hook TARGET_ASM_RECORD_GCC_COMMAND_LINE
+
+@hook TARGET_ASM_RECORD_GCC_COMMAND_LINE_SECTION
+
 @need 2000
 @node Data Output
 @subsection Output of Data
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 9f790db..3a9d6bf 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -235,6 +235,11 @@ static int verbose_only_flag;
 
 static int print_subprocess_help;
 
+/* argc and argv used to call gcc. Necessary for
+   --record-gcc-command-line option.  */
+static int _gcc_argc;
+static const char **_gcc_argv;
+
 /* Linker suffix passed to -fuse-ld=... */
 static const char *use_ld;
 
@@ -408,6 +413,7 @@ static const char *replace_extension_spec_func (int, const char **);
 static const char *greater_than_spec_func (int, const char **);
 static const char *debug_level_greater_than_spec_func (int, const char **);
 static const char *find_fortran_preinclude_file (int, const char **);
+static const char *record_gcc_command_line_spec_function (int, const char **);
 static char *convert_white_space (char *);
 \f
 /* The Specs Language
@@ -1157,6 +1163,7 @@ static const char *cc1_options =
  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
  %{fsyntax-only:-o %j} %{-param*}\
  %{coverage:-fprofile-arcs -ftest-coverage}\
+ %{-record-gcc-command-line:--record-gcc-command-line %:record-gcc-command-line(%g.cmdline) %<-record-gcc-command-line}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
      %{pthread:-fprofile-update=prefer-atomic}}}";
@@ -1648,6 +1655,7 @@ static const struct spec_function static_spec_functions[] =
   { "gt",			greater_than_spec_func },
   { "debug-level-gt",		debug_level_greater_than_spec_func },
   { "fortran-preinclude-file",	find_fortran_preinclude_file},
+  { "record-gcc-command-line",	record_gcc_command_line_spec_function},
 #ifdef EXTRA_SPEC_FUNCTIONS
   EXTRA_SPEC_FUNCTIONS
 #endif
@@ -7387,6 +7395,7 @@ driver::main (int argc, char **argv)
 
   set_progname (argv[0]);
   expand_at_files (&argc, &argv);
+  set_commandline (argc, const_cast <const char **> (argv));
   decode_argv (argc, const_cast <const char **> (argv));
   global_initializations ();
   build_multilib_strings ();
@@ -7430,6 +7439,15 @@ driver::set_progname (const char *argv0) const
   xmalloc_set_program_name (progname);
 }
 
+/* Keep command line for --record-gcc-command-line.  */
+
+void
+driver::set_commandline (int argc, const char **argv) const
+{
+  _gcc_argc = argc;
+  _gcc_argv = argv;
+}
+
 /* Expand any @ files within the command-line args,
    setting at_file_supplied if any were expanded.  */
 
@@ -10070,6 +10088,29 @@ find_fortran_preinclude_file (int argc, const char **argv)
   return result;
 }
 
+/* The option --record-gcc-command-line saves the command line options given to
+   gcc into the created object file. Those options are passed to the backends via
+   an intermediate file whose name is generated while the spec is evaluated. This
+   function takes that filename as an argument, writes to it, and returns it as a
+   single string.  */
+
+static const char *
+record_gcc_command_line_spec_function(int argc ATTRIBUTE_UNUSED, const char **argv)
+{
+  const char *filename = argv[0];
+  FILE *out = fopen (filename, "w");
+  if (!out)
+    error ("cannot open %s: %m", filename);
+
+  fprintf (out, "%s", _gcc_argv[0]);
+  for (int i = 1; i < _gcc_argc; i += 1)
+    {
+      fprintf (out, " %s", _gcc_argv[i]);
+    }
+
+  fclose (out);
+  return filename;
+}
 
 /* Insert backslash before spaces in ORIG (usually a file path), to 
    avoid being broken by spec parser.
diff --git a/gcc/gcc.h b/gcc/gcc.h
index 70d8f08..cde77fb 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -37,6 +37,7 @@ class driver
 
  private:
   void set_progname (const char *argv0) const;
+  void set_commandline (int argc, const char **argv) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
   void global_initializations ();
diff --git a/gcc/target.def b/gcc/target.def
index b5e82ff..4608119 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -801,6 +801,36 @@ ELF implementation of the @code{TARGET_ASM_RECORD_GCC_SWITCHES} target\n\
 hook.",
  const char *, ".GCC.command.line")
 
+/* Output a record of the command line that have been passed to gcc.  */
+DEFHOOK
+(record_gcc_command_line,
+ "Provides the target with the ability to record the command line that\n\
+has been passed to the compiler driver. The @var{gcc_command_line_file}\n\
+variable specifies the intermediate file that holds the command line.\n\
+\n\
+The return value must be zero.  Other return values may be supported\n\
+in the future.\n\
+\n\
+By default this hook is set to NULL, but an example implementation,\n\
+@var{elf_record_gcc_command_line}, is provided for ELF based targets.\n\
+it records the command line as ASCII text inside a new, mergable string\n\
+section in the assembler output file.  The name of the new section is\n\
+provided by the @code{TARGET_ASM_RECORD_GCC_COMMAND_LINE_SECTION}\n\
+target hook.",
+ int, (),
+ NULL)
+
+/* The name of the section that the example ELF implementation of
+   record_gcc_switches will use to store the information.  Target
+   specific versions of record_gcc_switches may or may not use
+   this information.  */
+DEFHOOKPOD
+(record_gcc_command_line_section,
+ "This is the name of the section that will be created by the example\n\
+ELF implementation of the @code{TARGET_ASM_RECORD_GCC_COMMAND_LINE}\n\
+target hook.",
+ const char *, ".GCC.command.line")
+
 /* Output the definition of a section anchor.  */
 DEFHOOK
 (output_anchor,
diff --git a/gcc/target.h b/gcc/target.h
index 2f47c57..66f7064 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -101,6 +101,9 @@ typedef int (* print_switch_fn_type) (print_switch_type, const char *);
 /* An example implementation for ELF targets.  Defined in varasm.c  */
 extern int elf_record_gcc_switches (print_switch_type type, const char *);
 
+/* An example implementation for ELF targets.  Defined in varasm.c  */
+extern int elf_record_gcc_command_line ();
+
 /* Some places still assume that all pointer or address modes are the
    standard Pmode and ptr_mode.  These optimizations become invalid if
    the target actually supports multiple different modes.  For now,
diff --git a/gcc/testsuite/c-c++-common/record-gcc-command-line.c b/gcc/testsuite/c-c++-common/record-gcc-command-line.c
new file mode 100644
index 0000000..2fdce4f
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/record-gcc-command-line.c
@@ -0,0 +1,8 @@
+/* Test the option "--record-gcc-command-line".
+   { dg-do compile }
+   { dg-require-target-object-format "elf" }
+   { dg-options "-O2 -g --record-gcc-command-line" } */
+
+int main () { return 0; }
+
+/* { dg-final { scan-assembler "-O2 -g --record-gcc-command-line"} }  */
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 4c8be50..d588a3d 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -868,6 +868,19 @@ init_asm_output (const char *name)
     {
       targetm.asm_out.file_start ();
 
+      if (gcc_command_line_file)
+	{
+	  if (targetm.asm_out.record_gcc_command_line)
+	    {
+	      /* Record the command line.  */
+	      targetm.asm_out.record_gcc_command_line ();
+	    }
+	  else
+	    inform (UNKNOWN_LOCATION,
+		    "--record-gcc-command-line is not supported by "
+		    "the current target");
+	}
+
       if (flag_record_gcc_switches)
 	{
 	  if (targetm.asm_out.record_gcc_switches)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index dc6da6c..9c8e477 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
+#include "version.h"
 #include "flags.h"
 #include "stmt.h"
 #include "expr.h"
@@ -7844,6 +7845,45 @@ elf_record_gcc_switches (print_switch_type type, const char * name)
   return 0;
 }
 
+/* This function provides a possible implementation of the
+   TARGET_ASM_RECORD_GCC_COMMAND_LINE target hook for ELF targets.  When
+   triggered by --record-gcc-command-line it creates a new mergeable
+   string section in the assembler output file called
+   TARGET_ASM_RECORD_GCC_COMMAND_LINE_SECTION which contains the command line
+   in ASCII format.  */
+
+int
+elf_record_gcc_command_line ()
+{
+  char cmdline[256];
+  section *sec;
+  sec = get_section (targetm.asm_out.record_gcc_command_line_section,
+		     SECTION_DEBUG | SECTION_MERGE
+		     | SECTION_STRINGS | (SECTION_ENTSIZE & 1),
+		     NULL);
+  switch_to_section (sec);
+
+  ASM_OUTPUT_ASCII (asm_out_file, version_string, strlen(version_string));
+
+  FILE *out_stream = fopen (gcc_command_line_file, "r");
+  if (!out_stream)
+    error ("cannot open %s: %m", gcc_command_line_file);
+
+  ASM_OUTPUT_ASCII (asm_out_file, " : ", 3);
+  ssize_t cmdline_length;
+  while ((cmdline_length = fread (cmdline, 1, 256, out_stream)))
+    ASM_OUTPUT_ASCII (asm_out_file, cmdline, cmdline_length);
+
+  fclose (out_stream);
+
+  /* End the line.  */
+  cmdline[0] = 0;
+  ASM_OUTPUT_ASCII (asm_out_file, cmdline, 1);
+
+  /* The return value is currently ignored by the caller, but must be 0.  */
+  return 0;
+}
+
 /* Emit text to declare externally defined symbols. It is needed to
    properly support non-default visibility.  */
 void
-- 
1.8.3.1

[PATCH v2 1/3] Introduce dg-require-target-object-format

[Egeyar Bagcioglu]

gcc/testsuite/:
2020-02-27  Egeyar Bagcioglu  <egeyar.bagcioglu@oracle.com>

	* lib/target-supports-dg.exp (dg-require-target-object-format):	New.
---
 gcc/testsuite/lib/target-supports-dg.exp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gcc/testsuite/lib/target-supports-dg.exp b/gcc/testsuite/lib/target-supports-dg.exp
index 2a21424..9678a66 100644
--- a/gcc/testsuite/lib/target-supports-dg.exp
+++ b/gcc/testsuite/lib/target-supports-dg.exp
@@ -164,6 +164,17 @@ proc dg-require-dll { args } {
     set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
 }
 
+# If this target does not produce the given object format skip this test.
+
+proc dg-require-target-object-format { args } {
+    if [string equal [gcc_target_object_format] [lindex $args 1] ] {
+	return
+    }
+
+    upvar dg-do-what dg-do-what
+    set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+}
+
 # If this host does not support an ASCII locale, skip this test.
 
 proc dg-require-ascii-locale { args } {
-- 
1.8.3.1

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Egeyar Bagcioglu]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]



On 3/3/20 3:44 PM, Egeyar Bagcioglu wrote:
> In addition to the new test case, I built binutils as my test case after passing this option to CFLAGS. The added .GCC.command.line section of ld.bfd listed many compile commands as expected. Tested on x86_64-pc-linux-gnu.

As mentioned above, I used binutils as the sample project to compile 
with --record-gcc-command-line. I am attaching to this email the file 
produced by the command "readelf -p .GCC.command.line ld/ld-new  > 
ld.commandline.out". You can see in it, all the gcc invocations whose 
output is merged into ld.bfd.

Regards
Egeyar

[-- Attachment #2: ld.commandline.out --]
[-- Type: text/plain, Size: 87610 bytes --]


String dump of section '.GCC.command.line':
  [     0]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldgram.o -MD -MP -MF .deps/ldgram.Tpo -c -o ldgram.o ldgram.c -Wno-error
  [   282]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldlex-wrapper.o -MD -MP -MF .deps/ldlex-wrapper.Tpo -c -o ldlex-wrapper.o ../../binutils-catools4/ld/ldlex-wrapper.c -Wno-error
  [   53b]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT lexsup.o -MD -MP -MF .deps/lexsup.Tpo -c -o lexsup.o ../../binutils-catools4/ld/lexsup.c
  [   7cd]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldlang.o -MD -MP -MF .deps/ldlang.Tpo -c -o ldlang.o ../../binutils-catools4/ld/ldlang.c
  [   a5f]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT mri.o -MD -MP -MF .deps/mri.Tpo -c -o mri.o ../../binutils-catools4/ld/mri.c
  [   ce5]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldctor.o -MD -MP -MF .deps/ldctor.Tpo -c -o ldctor.o ../../binutils-catools4/ld/ldctor.c
  [   f77]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldmain.o -MD -MP -MF .deps/ldmain.Tpo -c -o ldmain.o -DDEFAULT_EMULATION="elf_x86_64" -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DTOOLBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/x86_64-pc-linux-gnu/bin" -DTARGET="x86_64-pc-linux-gnu" -DTARGET_SYSTEM_ROOT="" ../../binutils-catools4/ld/ldmain.c
  [  12fd]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldwrite.o -MD -MP -MF .deps/ldwrite.Tpo -c -o ldwrite.o ../../binutils-catools4/ld/ldwrite.c
  [  1593]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldexp.o -MD -MP -MF .deps/ldexp.Tpo -c -o ldexp.o ../../binutils-catools4/ld/ldexp.c
  [  1821]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldemul.o -MD -MP -MF .deps/ldemul.Tpo -c -o ldemul.o ../../binutils-catools4/ld/ldemul.c
  [  1ab3]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldver.o -MD -MP -MF .deps/ldver.Tpo -c -o ldver.o ../../binutils-catools4/ld/ldver.c
  [  1d41]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldmisc.o -MD -MP -MF .deps/ldmisc.Tpo -c -o ldmisc.o ../../binutils-catools4/ld/ldmisc.c
  [  1fd3]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldfile.o -MD -MP -MF .deps/ldfile.Tpo -c -o ldfile.o -DSCRIPTDIR="/home/egeyar/catools4repos/binutils-catools4-build/x86_64-pc-linux-gnu/lib" -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DTOOLBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/x86_64-pc-linux-gnu/bin" ../../binutils-catools4/ld/ldfile.c
  [  235a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldcref.o -MD -MP -MF .deps/ldcref.Tpo -c -o ldcref.o ../../binutils-catools4/ld/ldcref.c
  [  25ec]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT plugin.o -MD -MP -MF .deps/plugin.Tpo -c -o plugin.o ../../binutils-catools4/ld/plugin.c
  [  287e]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldbuildid.o -MD -MP -MF .deps/ldbuildid.Tpo -c -o ldbuildid.o ../../binutils-catools4/ld/ldbuildid.c
  [  2b1c]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT eelf_x86_64.o -MD -MP -MF .deps/eelf_x86_64.Tpo -c -o eelf_x86_64.o eelf_x86_64.c
  [  2da7]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT eelf32_x86_64.o -MD -MP -MF .deps/eelf32_x86_64.Tpo -c -o eelf32_x86_64.o eelf32_x86_64.c
  [  303a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT eelf_i386.o -MD -MP -MF .deps/eelf_i386.Tpo -c -o eelf_i386.o eelf_i386.c
  [  32bd]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT eelf_iamcu.o -MD -MP -MF .deps/eelf_iamcu.Tpo -c -o eelf_iamcu.o eelf_iamcu.c
  [  3544]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT eelf_l1om.o -MD -MP -MF .deps/eelf_l1om.Tpo -c -o eelf_l1om.o eelf_l1om.c
  [  37c7]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT eelf_k1om.o -MD -MP -MF .deps/eelf_k1om.Tpo -c -o eelf_k1om.o eelf_k1om.c
  [  3a4a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldelf.o -MD -MP -MF .deps/ldelf.Tpo -c -o ldelf.o ../../binutils-catools4/ld/ldelf.c
  [  3cd8]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/ld -I. -I../../binutils-catools4/ld -I../bfd -I../../binutils-catools4/ld/../bfd -I../../binutils-catools4/ld/../include -I../../binutils-catools4/ld/../zlib --record-gcc-command-line -DENABLE_PLUGINS -DLOCALEDIR="/home/egeyar/catools4repos/binutils-catools4-build/share/locale" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -DELF_LIST_OPTIONS=TRUE -DELF_SHLIB_LIST_OPTIONS=TRUE -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE --record-gcc-command-line -MT ldelfgen.o -MD -MP -MF .deps/ldelfgen.Tpo -c -o ldelfgen.o ../../binutils-catools4/ld/ldelfgen.c
  [  3f72]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT archive.lo -MD -MP -MF .deps/archive.Tpo -c ../../binutils-catools4/bfd/archive.c -o archive.o
  [  4296]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT archures.lo -MD -MP -MF .deps/archures.Tpo -c -DDEFAULT_VECTOR=x86_64_elf64_vec -DSELECT_VECS=&x86_64_elf64_vec,&i386_elf32_vec,&iamcu_elf32_vec,&x86_64_elf32_vec,&i386_pei_vec,&x86_64_pei_vec,&l1om_elf64_vec,&k1om_elf64_vec,&elf64_le_vec,&elf64_be_vec,&elf32_le_vec,&elf32_be_vec -DSELECT_ARCHITECTURES=&bfd_i386_arch,&bfd_iamcu_arch,&bfd_l1om_arch,&bfd_k1om_arch ../../binutils-catools4/bfd/archures.c -o archures.o
  [  46fd]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT bfd.lo -MD -MP -MF .deps/bfd.Tpo -c ../../binutils-catools4/bfd/bfd.c -o bfd.o
  [  4a11]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT bfdio.lo -MD -MP -MF .deps/bfdio.Tpo -c ../../binutils-catools4/bfd/bfdio.c -o bfdio.o
  [  4d2d]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT cache.lo -MD -MP -MF .deps/cache.Tpo -c ../../binutils-catools4/bfd/cache.c -o cache.o
  [  5049]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf-properties.lo -MD -MP -MF .deps/elf-properties.Tpo -c ../../binutils-catools4/bfd/elf-properties.c -o elf-properties.o
  [  5389]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT format.lo -MD -MP -MF .deps/format.Tpo -c ../../binutils-catools4/bfd/format.c -o format.o
  [  56a9]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT hash.lo -MD -MP -MF .deps/hash.Tpo -c ../../binutils-catools4/bfd/hash.c -o hash.o
  [  59c1]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT init.lo -MD -MP -MF .deps/init.Tpo -c ../../binutils-catools4/bfd/init.c -o init.o
  [  5cd9]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT libbfd.lo -MD -MP -MF .deps/libbfd.Tpo -c ../../binutils-catools4/bfd/libbfd.c -o libbfd.o
  [  5ff9]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT linker.lo -MD -MP -MF .deps/linker.Tpo -c ../../binutils-catools4/bfd/linker.c -o linker.o
  [  6319]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT opncls.lo -MD -MP -MF .deps/opncls.Tpo -c ../../binutils-catools4/bfd/opncls.c -o opncls.o
  [  6639]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT reloc.lo -MD -MP -MF .deps/reloc.Tpo -c ../../binutils-catools4/bfd/reloc.c -o reloc.o
  [  6955]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT section.lo -MD -MP -MF .deps/section.Tpo -c ../../binutils-catools4/bfd/section.c -o section.o
  [  6c79]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT syms.lo -MD -MP -MF .deps/syms.Tpo -c ../../binutils-catools4/bfd/syms.c -o syms.o
  [  6f91]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT targets.lo -MD -MP -MF .deps/targets.Tpo -c -DDEFAULT_VECTOR=x86_64_elf64_vec -DSELECT_VECS=&x86_64_elf64_vec,&i386_elf32_vec,&iamcu_elf32_vec,&x86_64_elf32_vec,&i386_pei_vec,&x86_64_pei_vec,&l1om_elf64_vec,&k1om_elf64_vec,&elf64_le_vec,&elf64_be_vec,&elf32_le_vec,&elf32_be_vec -DSELECT_ARCHITECTURES=&bfd_i386_arch,&bfd_iamcu_arch,&bfd_l1om_arch,&bfd_k1om_arch ../../binutils-catools4/bfd/targets.c -o targets.o
  [  73f4]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT binary.lo -MD -MP -MF .deps/binary.Tpo -c ../../binutils-catools4/bfd/binary.c -o binary.o
  [  7714]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT ihex.lo -MD -MP -MF .deps/ihex.Tpo -c ../../binutils-catools4/bfd/ihex.c -o ihex.o
  [  7a2c]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT srec.lo -MD -MP -MF .deps/srec.Tpo -c ../../binutils-catools4/bfd/srec.c -o srec.o
  [  7d44]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT tekhex.lo -MD -MP -MF .deps/tekhex.Tpo -c ../../binutils-catools4/bfd/tekhex.c -o tekhex.o
  [  8064]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT verilog.lo -MD -MP -MF .deps/verilog.Tpo -c ../../binutils-catools4/bfd/verilog.c -o verilog.o
  [  8388]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf64-x86-64.lo -MD -MP -MF .deps/elf64-x86-64.Tpo -c ../../binutils-catools4/bfd/elf64-x86-64.c -o elf64-x86-64.o
  [  86c0]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elfxx-x86.lo -MD -MP -MF .deps/elfxx-x86.Tpo -c ../../binutils-catools4/bfd/elfxx-x86.c -o elfxx-x86.o
  [  89ec]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf-ifunc.lo -MD -MP -MF .deps/elf-ifunc.Tpo -c ../../binutils-catools4/bfd/elf-ifunc.c -o elf-ifunc.o
  [  8d18]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf-nacl.lo -MD -MP -MF .deps/elf-nacl.Tpo -c ../../binutils-catools4/bfd/elf-nacl.c -o elf-nacl.o
  [  9040]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf-vxworks.lo -MD -MP -MF .deps/elf-vxworks.Tpo -c ../../binutils-catools4/bfd/elf-vxworks.c -o elf-vxworks.o
  [  9374]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf64.lo -MD -MP -MF .deps/elf64.Tpo -c ../../binutils-catools4/bfd/elf64.c -o elf64.o
  [  9690]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf.lo -MD -MP -MF .deps/elf.Tpo -c ../../binutils-catools4/bfd/elf.c -o elf.o
  [  99a4]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elflink.lo -MD -MP -MF .deps/elflink.Tpo -c ../../binutils-catools4/bfd/elflink.c -o elflink.o
  [  9cc8]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf-attrs.lo -MD -MP -MF .deps/elf-attrs.Tpo -c ../../binutils-catools4/bfd/elf-attrs.c -o elf-attrs.o
  [  9ff4]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf-strtab.lo -MD -MP -MF .deps/elf-strtab.Tpo -c ../../binutils-catools4/bfd/elf-strtab.c -o elf-strtab.o
  [  a324]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf-eh-frame.lo -MD -MP -MF .deps/elf-eh-frame.Tpo -c ../../binutils-catools4/bfd/elf-eh-frame.c -o elf-eh-frame.o
  [  a65c]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT dwarf1.lo -MD -MP -MF .deps/dwarf1.Tpo -c ../../binutils-catools4/bfd/dwarf1.c -o dwarf1.o
  [  a97c]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT dwarf2.lo -MD -MP -MF .deps/dwarf2.Tpo -c -DDEBUGDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib/debug" ../../binutils-catools4/bfd/dwarf2.c -o dwarf2.o
  [  ace6]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf32-i386.lo -MD -MP -MF .deps/elf32-i386.Tpo -c ../../binutils-catools4/bfd/elf32-i386.c -o elf32-i386.o
  [  b016]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf32.lo -MD -MP -MF .deps/elf32.Tpo -c ../../binutils-catools4/bfd/elf32.c -o elf32.o
  [  b332]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT pei-i386.lo -MD -MP -MF .deps/pei-i386.Tpo -c ../../binutils-catools4/bfd/pei-i386.c -o pei-i386.o
  [  b65a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT peigen.lo -MD -MP -MF .deps/peigen.Tpo -c peigen.c -o peigen.o
  [  b95e]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT cofflink.lo -MD -MP -MF .deps/cofflink.Tpo -c ../../binutils-catools4/bfd/cofflink.c -o cofflink.o
  [  bc86]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT coffgen.lo -MD -MP -MF .deps/coffgen.Tpo -c ../../binutils-catools4/bfd/coffgen.c -o coffgen.o
  [  bfaa]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT pei-x86_64.lo -MD -MP -MF .deps/pei-x86_64.Tpo -c ../../binutils-catools4/bfd/pei-x86_64.c -o pei-x86_64.o
  [  c2da]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT pex64igen.lo -MD -MP -MF .deps/pex64igen.Tpo -c pex64igen.c -o pex64igen.o
  [  c5ea]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf64-gen.lo -MD -MP -MF .deps/elf64-gen.Tpo -c ../../binutils-catools4/bfd/elf64-gen.c -o elf64-gen.o
  [  c916]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT elf32-gen.lo -MD -MP -MF .deps/elf32-gen.Tpo -c ../../binutils-catools4/bfd/elf32-gen.c -o elf32-gen.o
  [  cc42]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT plugin.lo -MD -MP -MF .deps/plugin.Tpo -c ../../binutils-catools4/bfd/plugin.c -o plugin.o
  [  cf62]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT cpu-i386.lo -MD -MP -MF .deps/cpu-i386.Tpo -c ../../binutils-catools4/bfd/cpu-i386.c -o cpu-i386.o
  [  d28a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT cpu-iamcu.lo -MD -MP -MF .deps/cpu-iamcu.Tpo -c ../../binutils-catools4/bfd/cpu-iamcu.c -o cpu-iamcu.o
  [  d5b6]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT cpu-l1om.lo -MD -MP -MF .deps/cpu-l1om.Tpo -c ../../binutils-catools4/bfd/cpu-l1om.c -o cpu-l1om.o
  [  d8de]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT cpu-k1om.lo -MD -MP -MF .deps/cpu-k1om.Tpo -c ../../binutils-catools4/bfd/cpu-k1om.c -o cpu-k1om.o
  [  dc06]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT archive64.lo -MD -MP -MF .deps/archive64.Tpo -c ../../binutils-catools4/bfd/archive64.c -o archive64.o
  [  df32]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT compress.lo -MD -MP -MF .deps/compress.Tpo -c ../../binutils-catools4/bfd/compress.c -o compress.o
  [  e25a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT corefile.lo -MD -MP -MF .deps/corefile.Tpo -c ../../binutils-catools4/bfd/corefile.c -o corefile.o
  [  e582]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT merge.lo -MD -MP -MF .deps/merge.Tpo -c ../../binutils-catools4/bfd/merge.c -o merge.o
  [  e89e]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT simple.lo -MD -MP -MF .deps/simple.Tpo -c ../../binutils-catools4/bfd/simple.c -o simple.o
  [  ebbe]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/bfd -DBINDIR="/home/egeyar/catools4repos/binutils-catools4-build/bin" -DLIBDIR="/home/egeyar/catools4repos/binutils-catools4-build/lib" -I. -I../../binutils-catools4/bfd -I../../binutils-catools4/bfd/../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wstack-usage=262144 -Werror -I../../binutils-catools4/bfd/../zlib --record-gcc-command-line -MT stabs.lo -MD -MP -MF .deps/stabs.Tpo -c ../../binutils-catools4/bfd/stabs.c -o stabs.o
  [  eeda]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-create.lo -MD -MP -MF .deps/ctf-create.Tpo -c ../../binutils-catools4/libctf/ctf-create.c -o ctf-create.o
  [  f122]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-error.lo -MD -MP -MF .deps/ctf-error.Tpo -c ../../binutils-catools4/libctf/ctf-error.c -o ctf-error.o
  [  f366]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-hash.lo -MD -MP -MF .deps/ctf-hash.Tpo -c ../../binutils-catools4/libctf/ctf-hash.c -o ctf-hash.o
  [  f5a6]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-link.lo -MD -MP -MF .deps/ctf-link.Tpo -c ../../binutils-catools4/libctf/ctf-link.c -o ctf-link.o
  [  f7e6]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-lookup.lo -MD -MP -MF .deps/ctf-lookup.Tpo -c ../../binutils-catools4/libctf/ctf-lookup.c -o ctf-lookup.o
  [  fa2e]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-open.lo -MD -MP -MF .deps/ctf-open.Tpo -c ../../binutils-catools4/libctf/ctf-open.c -o ctf-open.o
  [  fc6e]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-string.lo -MD -MP -MF .deps/ctf-string.Tpo -c ../../binutils-catools4/libctf/ctf-string.c -o ctf-string.o
  [  feb6]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-subr.lo -MD -MP -MF .deps/ctf-subr.Tpo -c ../../binutils-catools4/libctf/ctf-subr.c -o ctf-subr.o
  [ 100f6]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-types.lo -MD -MP -MF .deps/ctf-types.Tpo -c ../../binutils-catools4/libctf/ctf-types.c -o ctf-types.o
  [ 1033a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-util.lo -MD -MP -MF .deps/ctf-util.Tpo -c ../../binutils-catools4/libctf/ctf-util.c -o ctf-util.o
  [ 1057a]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-open-bfd.lo -MD -MP -MF .deps/ctf-open-bfd.Tpo -c ../../binutils-catools4/libctf/ctf-open-bfd.c -o ctf-open-bfd.o
  [ 107ca]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-archive.lo -MD -MP -MF .deps/ctf-archive.Tpo -c ../../binutils-catools4/libctf/ctf-archive.c -o ctf-archive.o
  [ 10a16]  10.0.1 20200227 (experimental) : gcc -DHAVE_CONFIG_H -I. -I../../binutils-catools4/libctf -D_GNU_SOURCE -I../../binutils-catools4/libctf -I../../binutils-catools4/libctf/../include -I../../binutils-catools4/libctf/../bfd -I../bfd -std=gnu99 -Wall -W -Wall -Wno-narrowing -Wwrite-strings -Wmissing-format-attribute -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -pedantic -Wno-long-long -I../../binutils-catools4/libctf/../zlib --record-gcc-command-line -MT ctf-decl.lo -MD -MP -MF .deps/ctf-decl.Tpo -c ../../binutils-catools4/libctf/ctf-decl.c -o ctf-decl.o
  [ 10c56]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/cplus-dem.c -o cplus-dem.o
  [ 10d79]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/cp-demangle.c -o cp-demangle.o
  [ 10ea0]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/md5.c -o md5.o
  [ 10fb7]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/sha1.c -o sha1.o
  [ 110d0]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/argv.c -o argv.o
  [ 111e9]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/concat.c -o concat.o
  [ 11306]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/d-demangle.c -o d-demangle.o
  [ 1142b]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/filename_cmp.c -o filename_cmp.o
  [ 11554]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/getpwd.c -o getpwd.o
  [ 11671]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/getruntime.c -o getruntime.o
  [ 11796]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/hashtab.c -o hashtab.o
  [ 118b5]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/hex.c -o hex.o
  [ 119cc]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/lbasename.c -o lbasename.o
  [ 11aef]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/lrealpath.c -o lrealpath.o
  [ 11c12]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/make-relative-prefix.c -o make-relative-prefix.o
  [ 11d4b]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/make-temp-file.c -o make-temp-file.o
  [ 11e78]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/objalloc.c -o objalloc.o
  [ 11f99]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/obstack.c -o obstack.o
  [ 120b8]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/rust-demangle.c -o rust-demangle.o
  [ 121e3]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/safe-ctype.c -o safe-ctype.o
  [ 12308]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/unlink-if-ordinary.c -o unlink-if-ordinary.o
  [ 1243d]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/xatexit.c -o xatexit.o
  [ 1255c]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/xexit.c -o xexit.o
  [ 12677]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/xmalloc.c -o xmalloc.o
  [ 12796]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/xmemdup.c -o xmemdup.o
  [ 128b5]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/xstrdup.c -o xstrdup.o
  [ 129d4]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/xstrerror.c -o xstrerror.o
  [ 12af7]  10.0.1 20200227 (experimental) : gcc -c -DHAVE_CONFIG_H --record-gcc-command-line -I. -I../../binutils-catools4/libiberty/../include -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -Wshadow=local -pedantic -D_GNU_SOURCE ../../binutils-catools4/libiberty/xstrndup.c -o xstrndup.o
  [ 12c18]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-compress.o -MD -MP -MF .deps/libz_a-compress.Tpo -c -o libz_a-compress.o ../../binutils-catools4/zlib/compress.c
  [ 12f19]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-deflate.o -MD -MP -MF .deps/libz_a-deflate.Tpo -c -o libz_a-deflate.o ../../binutils-catools4/zlib/deflate.c
  [ 13216]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-gzwrite.o -MD -MP -MF .deps/libz_a-gzwrite.Tpo -c -o libz_a-gzwrite.o ../../binutils-catools4/zlib/gzwrite.c
  [ 13513]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-gzlib.o -MD -MP -MF .deps/libz_a-gzlib.Tpo -c -o libz_a-gzlib.o ../../binutils-catools4/zlib/gzlib.c
  [ 13808]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-inflate.o -MD -MP -MF .deps/libz_a-inflate.Tpo -c -o libz_a-inflate.o ../../binutils-catools4/zlib/inflate.c
  [ 13b05]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-inftrees.o -MD -MP -MF .deps/libz_a-inftrees.Tpo -c -o libz_a-inftrees.o ../../binutils-catools4/zlib/inftrees.c
  [ 13e06]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-trees.o -MD -MP -MF .deps/libz_a-trees.Tpo -c -o libz_a-trees.o ../../binutils-catools4/zlib/trees.c
  [ 140fb]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-uncompr.o -MD -MP -MF .deps/libz_a-uncompr.Tpo -c -o libz_a-uncompr.o ../../binutils-catools4/zlib/uncompr.c
  [ 143f8]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-zutil.o -MD -MP -MF .deps/libz_a-zutil.Tpo -c -o libz_a-zutil.o ../../binutils-catools4/zlib/zutil.c
  [ 146ed]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-adler32.o -MD -MP -MF .deps/libz_a-adler32.Tpo -c -o libz_a-adler32.o ../../binutils-catools4/zlib/adler32.c
  [ 149ea]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-crc32.o -MD -MP -MF .deps/libz_a-crc32.Tpo -c -o libz_a-crc32.o ../../binutils-catools4/zlib/crc32.c
  [ 14cdf]  10.0.1 20200227 (experimental) : gcc -DPACKAGE_NAME="zlib" -DPACKAGE_TARNAME="zlib" -DPACKAGE_VERSION="1.1.4" -DPACKAGE_STRING="zlib 1.1.4" -DPACKAGE_BUGREPORT="" -DPACKAGE_URL="" -DPACKAGE="zlib" -DVERSION="1.1.4" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=".libs/" -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_MEMCPY=1 -DHAVE_STRERROR=1 -DHAVE_UNISTD_H=1 -I. -I../../binutils-catools4/zlib --record-gcc-command-line -MT libz_a-inffast.o -MD -MP -MF .deps/libz_a-inffast.Tpo -c -o libz_a-inffast.o ../../binutils-catools4/zlib/inffast.c

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Joseph Myers]

On Tue, 3 Mar 2020, Egeyar Bagcioglu wrote:

> Although we discussed after the submission of the first version that 
> there are several other options performing similar tasks, I believe we 
> established that there is still a need for this specific functionality. 
> Therefore, I am skipping in this email the comparison between this 
> option and the existing options with similarities.

We're now using git-style commit messages with self-contained explanation 
/ justification of the change being committed.

This means that one of the commit messages (not just message 0, whose 
contents don't go in a commit message) for an individual patch should have 
the explanation, which should include the self-contained justification by 
reference to comparison with other existing similar options.  People 
should be able to find the relevant information in the commit without 
needing to search the list archives for reviews of a previous patch 
version.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Fangrui Song]

On 2020-03-03, Joseph Myers wrote:
>On Tue, 3 Mar 2020, Egeyar Bagcioglu wrote:
>
>> Although we discussed after the submission of the first version that
>> there are several other options performing similar tasks, I believe we
>> established that there is still a need for this specific functionality.
>> Therefore, I am skipping in this email the comparison between this
>> option and the existing options with similarities.

Mentioning -frecord-gcc-switches will be much appreciated.

How is the new .GCC.command.line different?

Does it still have the SHF_MERGE | SHF_STRINGS flag?
If you change the flags, the .GCC.command.line section may not play with
another object file (generated by -frecord-gcc-switches) whose .GCC.command.line is
SHF_MERGE | SHF_STRINGS.

When both -frecord-gcc-switches and --record-command-line are specified,
is it an error?

>We're now using git-style commit messages with self-contained explanation
>/ justification of the change being committed.
>
>This means that one of the commit messages (not just message 0, whose
>contents don't go in a commit message) for an individual patch should have
>the explanation, which should include the self-contained justification by
>reference to comparison with other existing similar options.  People
>should be able to find the relevant information in the commit without
>needing to search the list archives for reviews of a previous patch
>version.

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Egeyar Bagcioglu]

On 3/4/20 1:18 AM, Fangrui Song wrote:
> On 2020-03-03, Joseph Myers wrote:
>> On Tue, 3 Mar 2020, Egeyar Bagcioglu wrote:
>>
>>> Although we discussed after the submission of the first version that
>>> there are several other options performing similar tasks, I believe we
>>> established that there is still a need for this specific functionality.
>>> Therefore, I am skipping in this email the comparison between this
>>> option and the existing options with similarities.
>
> Mentioning -frecord-gcc-switches will be much appreciated.
>
> How is the new .GCC.command.line different?
>
> Does it still have the SHF_MERGE | SHF_STRINGS flag?
> If you change the flags, the .GCC.command.line section may not play with
> another object file (generated by -frecord-gcc-switches) whose 
> .GCC.command.line is
> SHF_MERGE | SHF_STRINGS.
>
> When both -frecord-gcc-switches and --record-command-line are specified,
> is it an error?

This option is similar to -frecord-gcc-switches. However, they have 
three fundamental differences: Firstly, -frecord-gcc-switches saves the 
internal state after the argv is processed and passed by the driver. As 
opposed to that, --record-gcc-command-line saves the command-line as 
received by the driver, with the exception of extending @files first. 
Secondly, -frecord-gcc-switches saves the switches as separate entries 
into a mergeable string section. Therefore, the entries belonging to 
different object files get mixed up after being linked. The new 
--record-gcc-command-line, on the other hand, creates one entry per 
invocation. By doing so, it makes it clear which options were used 
together in a single gcc invocation. Lastly, --record-gcc-command-line 
also adds the version of the gcc into this single entry to make it clear 
which version of gcc was called with any given command line. This is 
useful in cases where .comment section reports multiple versions.

While there are also similarities between the implementations of these 
two options, those implementations are completely independent. These 
commands can be used separately or together without issues. I used the 
same section that -frecord-gcc-switches uses on purpose, so that they 
can also be used together to save both the command line given to GCC and 
the internal switches passed by GCC.

The option -grecord-gcc-switches is similar to -frecord-gcc-switches, 
but saves the internal GCC switches into DWARF. Lastly, -fverbose-asm 
option saves the switches into the assembly file but that information 
never makes it to the object files.

>
>> We're now using git-style commit messages with self-contained 
>> explanation
>> / justification of the change being committed.
>>
>> This means that one of the commit messages (not just message 0, whose
>> contents don't go in a commit message) for an individual patch should 
>> have
>> the explanation, which should include the self-contained 
>> justification by
>> reference to comparison with other existing similar options. People
>> should be able to find the relevant information in the commit without
>> needing to search the list archives for reviews of a previous patch
>> version.

Thanks for telling me. I will extend the above comparison according to 
the questions I might receive. Then I'll add it, together with the 
explanation in the cover letter, into the commit message of the second 
patch.

Regards
Egeyar

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Egeyar Bagcioglu]

On 3/4/20 5:28 PM, Egeyar Bagcioglu wrote:
>
>
> On 3/4/20 1:18 AM, Fangrui Song wrote:
>> On 2020-03-03, Joseph Myers wrote:
>>> On Tue, 3 Mar 2020, Egeyar Bagcioglu wrote:
>>>
>>>> Although we discussed after the submission of the first version that
>>>> there are several other options performing similar tasks, I believe we
>>>> established that there is still a need for this specific 
>>>> functionality.
>>>> Therefore, I am skipping in this email the comparison between this
>>>> option and the existing options with similarities.
>>
>> Mentioning -frecord-gcc-switches will be much appreciated.
>>
>> How is the new .GCC.command.line different?
>>
>> Does it still have the SHF_MERGE | SHF_STRINGS flag?
>> If you change the flags, the .GCC.command.line section may not play with
>> another object file (generated by -frecord-gcc-switches) whose 
>> .GCC.command.line is
>> SHF_MERGE | SHF_STRINGS.
>>
>> When both -frecord-gcc-switches and --record-command-line are specified,
>> is it an error?
>
> This option is similar to -frecord-gcc-switches. However, they have 
> three fundamental differences: Firstly, -frecord-gcc-switches saves 
> the internal state after the argv is processed and passed by the 
> driver. As opposed to that, --record-gcc-command-line saves the 
> command-line as received by the driver, with the exception of 
> extending @files first. Secondly, -frecord-gcc-switches saves the 
> switches as separate entries into a mergeable string section. 
> Therefore, the entries belonging to different object files get mixed 
> up after being linked. The new --record-gcc-command-line, on the other 
> hand, creates one entry per invocation. By doing so, it makes it clear 
> which options were used together in a single gcc invocation. Lastly, 
> --record-gcc-command-line also adds the version of the gcc into this 
> single entry to make it clear which version of gcc was called with any 
> given command line. This is useful in cases where .comment section 
> reports multiple versions.

I should add here that both Martin Liska and Nick Clifton mentioned 
during the last round of discussion the importance of capturing options 
such as -D_FORTIFY_SOURCE which is apparently not distinguished by 
--frecord-gcc-switches. The option I am suggesting, 
--record-gcc-command-line, saves that without any special case handling.

>
> While there are also similarities between the implementations of these 
> two options, those implementations are completely independent. These 
> commands can be used separately or together without issues. I used the 
> same section that -frecord-gcc-switches uses on purpose, so that they 
> can also be used together to save both the command line given to GCC 
> and the internal switches passed by GCC.

Here is an old example from the previous discussion, calling g++ with 
both -frecord-gcc-switches and --record-gcc-command-line for comparison:
[egeyar@localhost save-commandline]$ g++ main.c 
--record-gcc-command-line -frecord-gcc-switches
[egeyar@localhost save-commandline]$ readelf -p .GCC.command.line a.out

String dump of section '.GCC.command.line':
   [     0]  10.0.0 20191025 (experimental) : g++ main.c 
--record-gcc-command-line -frecord-gcc-switches
   [    5c]  -D_GNU_SOURCE
   [    6a]  main.c
   [    71]  -mtune=generic
   [    80]  -march=x86-64
   [    8e]  --record-gcc-command-line /tmp/ccgC4ZtS.cmdline

Above, the first entry in the .GCC.command.line section is saved by 
--record-gcc-command-line; while the rest of the entries are added by 
-frecord-gcc-switches.

Regards
Egeyar

>
>
> The option -grecord-gcc-switches is similar to -frecord-gcc-switches, 
> but saves the internal GCC switches into DWARF. Lastly, -fverbose-asm 
> option saves the switches into the assembly file but that information 
> never makes it to the object files.
>
>>
>>> We're now using git-style commit messages with self-contained 
>>> explanation
>>> / justification of the change being committed.
>>>
>>> This means that one of the commit messages (not just message 0, whose
>>> contents don't go in a commit message) for an individual patch 
>>> should have
>>> the explanation, which should include the self-contained 
>>> justification by
>>> reference to comparison with other existing similar options. People
>>> should be able to find the relevant information in the commit without
>>> needing to search the list archives for reviews of a previous patch
>>> version.
>
> Thanks for telling me. I will extend the above comparison according to 
> the questions I might receive. Then I'll add it, together with the 
> explanation in the cover letter, into the commit message of the second 
> patch.
>
> Regards
> Egeyar

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Richard Biener]

On Wed, Mar 4, 2020 at 5:28 PM Egeyar Bagcioglu
<egeyar.bagcioglu@oracle.com> wrote:
>
>
>
> On 3/4/20 1:18 AM, Fangrui Song wrote:
> > On 2020-03-03, Joseph Myers wrote:
> >> On Tue, 3 Mar 2020, Egeyar Bagcioglu wrote:
> >>
> >>> Although we discussed after the submission of the first version that
> >>> there are several other options performing similar tasks, I believe we
> >>> established that there is still a need for this specific functionality.
> >>> Therefore, I am skipping in this email the comparison between this
> >>> option and the existing options with similarities.
> >
> > Mentioning -frecord-gcc-switches will be much appreciated.
> >
> > How is the new .GCC.command.line different?
> >
> > Does it still have the SHF_MERGE | SHF_STRINGS flag?
> > If you change the flags, the .GCC.command.line section may not play with
> > another object file (generated by -frecord-gcc-switches) whose
> > .GCC.command.line is
> > SHF_MERGE | SHF_STRINGS.
> >
> > When both -frecord-gcc-switches and --record-command-line are specified,
> > is it an error?
>
> This option is similar to -frecord-gcc-switches. However, they have
> three fundamental differences: Firstly, -frecord-gcc-switches saves the
> internal state after the argv is processed and passed by the driver. As
> opposed to that, --record-gcc-command-line saves the command-line as
> received by the driver, with the exception of extending @files first.
> Secondly, -frecord-gcc-switches saves the switches as separate entries
> into a mergeable string section. Therefore, the entries belonging to
> different object files get mixed up after being linked. The new
> --record-gcc-command-line, on the other hand, creates one entry per
> invocation. By doing so, it makes it clear which options were used
> together in a single gcc invocation. Lastly, --record-gcc-command-line
> also adds the version of the gcc into this single entry to make it clear
> which version of gcc was called with any given command line. This is
> useful in cases where .comment section reports multiple versions.
>
> While there are also similarities between the implementations of these
> two options, those implementations are completely independent. These
> commands can be used separately or together without issues. I used the
> same section that -frecord-gcc-switches uses on purpose, so that they
> can also be used together to save both the command line given to GCC and
> the internal switches passed by GCC.
>
> The option -grecord-gcc-switches is similar to -frecord-gcc-switches,
> but saves the internal GCC switches into DWARF. Lastly, -fverbose-asm
> option saves the switches into the assembly file but that information
> never makes it to the object files.

-grecord-gcc-switches also allows to match the options used to the
actual generated code while both -frecord-gcc-switches and
--record-gcc-command-line
end up as ELF comment sections not associated with particular
code pieces.

So IMHO anything but -grecord-gcc-switches is quite useless in case options
used do not match for all object files.

Richard.

> >
> >> We're now using git-style commit messages with self-contained
> >> explanation
> >> / justification of the change being committed.
> >>
> >> This means that one of the commit messages (not just message 0, whose
> >> contents don't go in a commit message) for an individual patch should
> >> have
> >> the explanation, which should include the self-contained
> >> justification by
> >> reference to comparison with other existing similar options. People
> >> should be able to find the relevant information in the commit without
> >> needing to search the list archives for reviews of a previous patch
> >> version.
>
> Thanks for telling me. I will extend the above comparison according to
> the questions I might receive. Then I'll add it, together with the
> explanation in the cover letter, into the commit message of the second
> patch.
>
> Regards
> Egeyar

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Egeyar Bagcioglu]

On 3/5/20 8:36 AM, Richard Biener wrote:
> On Wed, Mar 4, 2020 at 5:28 PM Egeyar Bagcioglu
> <egeyar.bagcioglu@oracle.com> wrote:
>>
>>
>> On 3/4/20 1:18 AM, Fangrui Song wrote:
>>> On 2020-03-03, Joseph Myers wrote:
>>>> On Tue, 3 Mar 2020, Egeyar Bagcioglu wrote:
>>>>
>>>>> Although we discussed after the submission of the first version that
>>>>> there are several other options performing similar tasks, I believe we
>>>>> established that there is still a need for this specific functionality.
>>>>> Therefore, I am skipping in this email the comparison between this
>>>>> option and the existing options with similarities.
>>> Mentioning -frecord-gcc-switches will be much appreciated.
>>>
>>> How is the new .GCC.command.line different?
>>>
>>> Does it still have the SHF_MERGE | SHF_STRINGS flag?
>>> If you change the flags, the .GCC.command.line section may not play with
>>> another object file (generated by -frecord-gcc-switches) whose
>>> .GCC.command.line is
>>> SHF_MERGE | SHF_STRINGS.
>>>
>>> When both -frecord-gcc-switches and --record-command-line are specified,
>>> is it an error?
>> This option is similar to -frecord-gcc-switches. However, they have
>> three fundamental differences: Firstly, -frecord-gcc-switches saves the
>> internal state after the argv is processed and passed by the driver. As
>> opposed to that, --record-gcc-command-line saves the command-line as
>> received by the driver, with the exception of extending @files first.
>> Secondly, -frecord-gcc-switches saves the switches as separate entries
>> into a mergeable string section. Therefore, the entries belonging to
>> different object files get mixed up after being linked. The new
>> --record-gcc-command-line, on the other hand, creates one entry per
>> invocation. By doing so, it makes it clear which options were used
>> together in a single gcc invocation. Lastly, --record-gcc-command-line
>> also adds the version of the gcc into this single entry to make it clear
>> which version of gcc was called with any given command line. This is
>> useful in cases where .comment section reports multiple versions.
>>
>> While there are also similarities between the implementations of these
>> two options, those implementations are completely independent. These
>> commands can be used separately or together without issues. I used the
>> same section that -frecord-gcc-switches uses on purpose, so that they
>> can also be used together to save both the command line given to GCC and
>> the internal switches passed by GCC.
>>
>> The option -grecord-gcc-switches is similar to -frecord-gcc-switches,
>> but saves the internal GCC switches into DWARF. Lastly, -fverbose-asm
>> option saves the switches into the assembly file but that information
>> never makes it to the object files.
> -grecord-gcc-switches also allows to match the options used to the
> actual generated code while both -frecord-gcc-switches and
> --record-gcc-command-line
> end up as ELF comment sections not associated with particular
> code pieces.
>
> So IMHO anything but -grecord-gcc-switches is quite useless in case options
> used do not match for all object files.
>
> Richard.

I hear that. I am definitely not arguing against the use cases where 
-grecord-gcc-switches is the best option. But this patch is coming from 
the point of view of a different use case at hand. We need to have the 
frontend command line saved in a way that it can be later extracted from 
the ELF object (including shared libraries and binaries) and be used to 
re-compile individual objects, producing more or less the same generated 
code. This patch is not enough to get the exact same output, but it is 
necessary for us.

Correct me if I am wrong, but none of the existing options are very 
helpful when it comes to asking gcc to do the same thing that it did 
while creating that object. They hint some things about the command line 
but do not help much reconstructing the command line. That is what I 
mean when I say this option is not about the internals of gcc. It is 
definitely not about knowing what's passed to the backend. As long as 
this option's output is concerned, gcc is a blackbox. This is about the 
command-line, about higher-level users' interaction with the driver and 
nothing more.

Best regards
Egeyar

>
>>>> We're now using git-style commit messages with self-contained
>>>> explanation
>>>> / justification of the change being committed.
>>>>
>>>> This means that one of the commit messages (not just message 0, whose
>>>> contents don't go in a commit message) for an individual patch should
>>>> have
>>>> the explanation, which should include the self-contained
>>>> justification by
>>>> reference to comparison with other existing similar options. People
>>>> should be able to find the relevant information in the commit without
>>>> needing to search the list archives for reviews of a previous patch
>>>> version.
>> Thanks for telling me. I will extend the above comparison according to
>> the questions I might receive. Then I'll add it, together with the
>> explanation in the cover letter, into the commit message of the second
>> patch.
>>
>> Regards
>> Egeyar

Re: [PATCH v2 0/3] Introduce a new GCC option, --record-gcc-command-line

[Martin Liška]

On 3/3/20 3:44 PM, Egeyar Bagcioglu wrote:
> Hello,

Hi.

> 
> I would like to propose the second version of the patches which introduce a compile option --record-gcc-command-line. When passed to gcc, it saves the command line invoking gcc into the produced object file. The option makes it trivial to trace back with which command a file was compiled and by which version of the gcc. It helps with debugging, reproducing bugs and repeating the build process.
> 
> The reviews addressed in this version include indentation changes, error handling and corner case coverage pointed out by Segher Boessenkool in the first two patches; while the new third patch is another corner case (lto) coverage requested by Martin Liska.

Great, thanks for working on that.
Based on the mentioned disadvantages of -frecord-gcc-switches, where each option entry is put into a mergeable section and
so one can't disambiguate in between multiple command line options, I would suggest to replace -frecord-gcc-switches
functionality with what --record-gcc-command-line does. Moreover, looking at clang:
https://reviews.llvm.org/D54487, their current implementation of -frecord-gcc-switches does the very same:

$ clang main.c -frecord-gcc-switches -c
$ readelf -p .GCC.command.line main.o

String dump of section '.GCC.command.line':
   [     1]  /usr/bin/clang-9.0.1 main.c -frecord-command-line -c

One additional advantage is that driver options also catch macros (like -D_FORTIFY_SOURCE), which
is also what clang does.
It's question to Nick who originally implemented the option. Nick, are you fine with that?
If I'm correct you're using the annobin plugin and this can help you to replace it?

> 
> Although we discussed after the submission of the first version that there are several other options performing similar tasks, I believe we established that there is still a need for this specific functionality. Therefore, I am skipping in this email the comparison between this option and the existing options with similarities.
> 
> This functionality operates as the following: It saves gcc's argv into a temporary file, and passes --record-gcc-command-line <tempfilename> to cc1 or cc1plus. The functionality of the backend is implemented via a hook. This patch includes an example implementation of the hook for elf targets: elf_record_gcc_command_line function. This function reads the given file and writes gcc's version and the command line into a mergeable string section, .GCC.command.line. It creates one entry per invocation. By doing so, it makes it clear which options were used together in a single gcc invocation, even after linking.
> 
> Here is an *example usage* of the option:
> [egeyar@localhost save-commandline]$ gcc main.c --record-gcc-command-line
> [egeyar@localhost save-commandline]$ readelf -p .GCC.command.line a.out
> 
> String dump of section '.GCC.command.line':
>    [     0]  10.0.1 20200227 (experimental) : gcc main.c --record-gcc-command-line
> 
> 
> The following is a *second example* calling g++ with -save-temps and a repetition of options, where --save-temps saves the intermediate file, main.cmdline in this case. You can see that the options are recorded unprocessed:
> 
> [egeyar@localhost save-commandline]$ g++ main.c -save-temps --record-gcc-command-line -O0 -O2 -O3 -DFORTIFY=2 --record-gcc-command-line
> [egeyar@localhost save-commandline]$ readelf -p .GCC.command.line a.out
> 
> String dump of section '.GCC.command.line':
>    [     0]  10.0.1 20200227 (experimental) : g++ main.c -save-temps --record-gcc-command-line -O0 -O2 -O3 -DFORTIFY=2 --record-gcc-command-line
> 
> 
> The first patch of this three-patch-series only extends the testsuite machinery, while the second patch implements the functionality and adds a test case for it. The third patch that alters libiberty is to make sure the .GCC.command.line section in LTO objects survive the linking and appear in the linked object.

One small nit: I would not send in 3 parts, as the first and last one are just one hunks.

Martin

> 
> In addition to the new test case, I built binutils as my test case after passing this option to CFLAGS. The added .GCC.command.line section of ld.bfd listed many compile commands as expected. Tested on x86_64-pc-linux-gnu.
> 
> Please review the patches, let me know what you think and apply if appropriate.
> 
> Regards
> Egeyar
> 
> Egeyar Bagcioglu (3):
>    Introduce dg-require-target-object-format
>    Introduce the gcc option --record-gcc-command-line
>    Keep .GCC.command.line sections of LTO objetcs.
> 
>   gcc/common.opt                                     |  4 +++
>   gcc/config/elfos.h                                 |  5 +++
>   gcc/doc/tm.texi                                    | 22 ++++++++++++
>   gcc/doc/tm.texi.in                                 |  4 +++
>   gcc/gcc.c                                          | 41 ++++++++++++++++++++++
>   gcc/gcc.h                                          |  1 +
>   gcc/target.def                                     | 30 ++++++++++++++++
>   gcc/target.h                                       |  3 ++
>   .../c-c++-common/record-gcc-command-line.c         |  8 +++++
>   gcc/testsuite/lib/target-supports-dg.exp           | 11 ++++++
>   gcc/toplev.c                                       | 13 +++++++
>   gcc/varasm.c                                       | 40 +++++++++++++++++++++
>   libiberty/simple-object.c                          |  3 ++
>   13 files changed, 185 insertions(+)
>   create mode 100644 gcc/testsuite/c-c++-common/record-gcc-command-line.c
>