From b408e010ccf6cacc1f36cef8fca3252cfa677094 Mon Sep 17 00:00:00 2001 From: Lewis Hyatt Date: Sun, 15 Mar 2020 08:58:30 -0400 Subject: [PATCH] driver: Fix redundant descriptions in options Addresses issues where the two-column format of options descriptions was used, but the columns were separated by spaces rather than a single tab, causing the help output to be more verbose than intended. gcc/ChangeLog: 2020-03-15 Lewis Hyatt * common.opt: Avoid redundancy in the help text. * config/arc/arc.opt: Likewise. * config/cr16/cr16.opt: Likewise. gcc/c-family/ChangeLog: 2020-03-15 Lewis Hyatt * c.opt: Avoid redundancy in the help text. gcc/fortran/ChangeLog: 2020-03-15 Lewis Hyatt * lang.opt: Avoid redundancy in the help text. gcc/testsuite/ChangeLog: 2020-03-15 Lewis Hyatt * gcc.misc-tests/help.exp: Adapt to new output for -Walloc-size-larger-than= option. --- gcc/ChangeLog | 6 ++++++ gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c.opt | 22 +++++++++++----------- gcc/common.opt | 20 ++++++++++---------- gcc/config/arc/arc.opt | 4 ++-- gcc/config/cr16/cr16.opt | 2 +- gcc/fortran/ChangeLog | 4 ++++ gcc/fortran/lang.opt | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.misc-tests/help.exp | 2 +- 10 files changed, 45 insertions(+), 26 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 883e13fa7d7..af96a9bbb81 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2020-03-15 Lewis Hyatt + + * common.opt: Avoid redundancy in the help text. + * config/arc/arc.opt: Likewise. + * config/cr16/cr16.opt: Likewise. + 2020-03-14 Jakub Jelinek PR middle-end/93566 diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 2e11b000094..f03e44feabd 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2020-03-15 Lewis Hyatt + + * c.opt: Avoid redundancy in the help text. + 2020-03-02 Marek Polacek PR c++/93958 - add missing -std=gnu++20. diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index 1cd585fa71d..a1e0f4cdc3a 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -309,16 +309,16 @@ Warn on any use of alloca. Walloc-size-larger-than= C ObjC C++ LTO ObjC++ Var(warn_alloc_size_limit) Joined Host_Wide_Int ByteSize Warning Init(HOST_WIDE_INT_MAX) --Walloc-size-larger-than= Warn for calls to allocation functions that +-Walloc-size-larger-than= Warn for calls to allocation functions that attempt to allocate objects larger than the specified number of bytes. Wno-alloc-size-larger-than C ObjC C++ LTO ObjC++ Alias(Walloc-size-larger-than=,18446744073709551615EiB,none) Warning --Wno-alloc-size-larger-than Disable Walloc-size-larger-than= warning. Equivalent to Walloc-size-larger-than= or larger. +Disable Walloc-size-larger-than= warning. Equivalent to Walloc-size-larger-than= or larger. Walloc-zero C ObjC C++ ObjC++ Var(warn_alloc_zero) Warning --Walloc-zero Warn for calls to allocation functions that specify zero bytes. +Warn for calls to allocation functions that specify zero bytes. Walloca-larger-than= C ObjC C++ LTO ObjC++ Var(warn_alloca_limit) Warning Joined Host_Wide_Int ByteSize Init(HOST_WIDE_INT_MAX) @@ -328,7 +328,7 @@ alloca, and on bounded uses of alloca whose bound can be larger than Wno-alloca-larger-than C ObjC C++ LTO ObjC++ Alias(Walloca-larger-than=,18446744073709551615EiB,none) Warning --Wno-alloca-larger-than Disable Walloca-larger-than= warning. Equivalent to Walloca-larger-than= or larger. +Disable Walloca-larger-than= warning. Equivalent to Walloca-larger-than= or larger. Warray-bounds LangEnabledBy(C ObjC C++ LTO ObjC++) @@ -1252,7 +1252,7 @@ larger than bytes. Wno-vla-larger-than C ObjC C++ LTO ObjC++ Alias(Wvla-larger-than=,18446744073709551615EiB,none) Warning --Wno-vla-larger-than Disable Wvla-larger-than= warning. Equivalent to Wvla-larger-than= or larger. +Disable Wvla-larger-than= warning. Equivalent to Wvla-larger-than= or larger. Wvolatile C++ ObjC++ Var(warn_volatile) Warning @@ -1313,7 +1313,7 @@ Enforce class member access control semantics. fada-spec-parent= C ObjC C++ ObjC++ RejectNegative Joined Var(ada_specs_parent) --fada-spec-parent=unit Dump Ada specs as child units of given parent. +-fada-spec-parent=unit Dump Ada specs as child units of given parent. faligned-new C++ ObjC++ Alias(faligned-new=,1,0) @@ -1321,7 +1321,7 @@ Support C++17 allocation of over-aligned types. faligned-new= C++ ObjC++ Joined RejectNegative Var(aligned_new_threshold) UInteger Init(-1) --faligned-new= Use C++17 over-aligned type allocation for alignments greater than N. +-faligned-new= Use C++17 over-aligned type allocation for alignments greater than N. fall-virtual C++ ObjC++ WarnRemoved @@ -1515,7 +1515,7 @@ Permit '$' as an identifier character. fmacro-prefix-map= C ObjC C++ ObjC++ Joined RejectNegative --fmacro-prefix-map== Map one directory name to another in __FILE__, __BASE_FILE__, and __builtin_FILE(). +-fmacro-prefix-map== Map one directory name to another in __FILE__, __BASE_FILE__, and __builtin_FILE(). fdump-ada-spec C ObjC C++ ObjC++ RejectNegative Var(flag_dump_ada_spec) @@ -1530,7 +1530,7 @@ C++ ObjC++ Var(flag_elide_constructors) Init(1) felide-type C++ ObjC++ Var(flag_elide_type) Init(1) --fno-elide-type Do not elide common elements in template comparisons. +Do not elide common elements in template comparisons. fenforce-eh-specs C++ ObjC++ Var(flag_enforce_eh_specs) Init(1) @@ -1778,11 +1778,11 @@ C ObjC C++ ObjC++ JoinedOrMissing RejectNegative UInteger ftrack-macro-expansion= C ObjC C++ ObjC++ JoinedOrMissing RejectNegative UInteger --ftrack-macro-expansion=<0|1|2> Track locations of tokens coming from macro expansion and display them in error messages. +-ftrack-macro-expansion=<0|1|2> Track locations of tokens coming from macro expansion and display them in error messages. fpretty-templates C++ ObjC++ Var(flag_pretty_templates) Init(1) --fno-pretty-templates Do not pretty-print template specializations as the template signature followed by the arguments. +Do not pretty-print template specializations as the template signature followed by the arguments. fprintf-return-value C ObjC C++ ObjC++ LTO Optimization Var(flag_printf_return_value) Init(1) diff --git a/gcc/common.opt b/gcc/common.opt index fa9da505fc2..4368910cb54 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -1196,11 +1196,11 @@ Common RejectNegative Joined Var(common_deferred_options) Defer fdebug-prefix-map= Common Joined RejectNegative Var(common_deferred_options) Defer --fdebug-prefix-map== Map one directory name to another in debug information. +-fdebug-prefix-map== Map one directory name to another in debug information. ffile-prefix-map= Common Joined RejectNegative Var(common_deferred_options) Defer --ffile-prefix-map== Map one directory name to another in compilation result. +-ffile-prefix-map== Map one directory name to another in compilation result. fdebug-types-section Common Report Var(flag_debug_types_section) Init(0) @@ -1311,7 +1311,7 @@ Enum(diagnostic_url_rule) String(auto) Value(DIAGNOSTICS_URL_AUTO) fdiagnostics-format= Common Joined RejectNegative Enum(diagnostics_output_format) --fdiagnostics-format=[text|json] Select output format. +-fdiagnostics-format=[text|json] Select output format. ; Required for these enum values. SourceInclude @@ -1368,11 +1368,11 @@ Set minimum width of left margin of source code when showing source. fdisable- Common Joined RejectNegative Var(common_deferred_options) Defer --fdisable-[tree|rtl|ipa]-=range1+range2 disables an optimization pass. +-fdisable-[tree|rtl|ipa]-=range1+range2 Disable an optimization pass. fenable- Common Joined RejectNegative Var(common_deferred_options) Defer --fenable-[tree|rtl|ipa]-=range1+range2 enables an optimization pass. +-fenable-[tree|rtl|ipa]-=range1+range2 Enable an optimization pass. fdump- Common Joined RejectNegative Var(common_deferred_options) Defer @@ -1755,11 +1755,11 @@ Instrument function entry and exit with profiling calls. finstrument-functions-exclude-function-list= Common RejectNegative Joined --finstrument-functions-exclude-function-list=name,... Do not instrument listed functions. +-finstrument-functions-exclude-function-list=name,... Do not instrument listed functions. finstrument-functions-exclude-file-list= Common RejectNegative Joined --finstrument-functions-exclude-file-list=filename,... Do not instrument functions listed in files. +-finstrument-functions-exclude-file-list=filename,... Do not instrument functions listed in files. fipa-cp Common Report Var(flag_ipa_cp) Optimization @@ -2020,11 +2020,11 @@ Support synchronous non-call exceptions. foffload= Common Driver Joined MissingArgError(options or targets missing after %qs) --foffload== Specify offloading targets and options for them. +-foffload== Specify offloading targets and options for them. foffload-abi= Common Joined RejectNegative Enum(offload_abi) Var(flag_offload_abi) Init(OFFLOAD_ABI_UNSET) --foffload-abi=[lp64|ilp32] Set the ABI to use in an offload compiler. +-foffload-abi=[lp64|ilp32] Set the ABI to use in an offload compiler. Enum Name(offload_abi) Type(enum offload_abi) UnknownError(unknown offload ABI %qs) @@ -2182,7 +2182,7 @@ Enum(profile_reproducibility) String(multithreaded) Value(PROFILE_REPRODUCIBILIT fprofile-reproducible Common Joined RejectNegative Var(flag_profile_reproducible) Enum(profile_reproducibility) Init(PROFILE_REPRODUCIBILITY_SERIAL) --fprofile-reproducible=[serial|parallel-runs|multithreaded] Control level of reproducibility of profile gathered by -fprofile-generate. +-fprofile-reproducible=[serial|parallel-runs|multithreaded] Control level of reproducibility of profile gathered by -fprofile-generate. Enum Name(profile_update) Type(enum profile_update) UnknownError(unknown profile update method %qs) diff --git a/gcc/config/arc/arc.opt b/gcc/config/arc/arc.opt index 7b994236a51..c6c64afa59c 100644 --- a/gcc/config/arc/arc.opt +++ b/gcc/config/arc/arc.opt @@ -59,7 +59,7 @@ Force all calls to be made via a jli instruction. mmpy-option= Target RejectNegative Joined Enum(arc_mpy) Var(arc_mpy_option) Init(DEFAULT_arc_mpy_option) --mmpy-option=MPY Compile ARCv2 code with a multiplier design option. +-mmpy-option=MPY Compile ARCv2 code with a multiplier design option. Enum Name(arc_mpy) Type(int) @@ -251,7 +251,7 @@ Cost to assume for a multiply instruction, with 4 being equal to a normal insn. mtune= Target RejectNegative ToLower Joined Var(arc_tune) Enum(arc_tune_attr) Init(ARC_TUNE_NONE) --mcpu=TUNE Tune code for given ARC variant. +-mtune=TUNE Tune code for given ARC variant. Enum Name(arc_tune_attr) Type(int) diff --git a/gcc/config/cr16/cr16.opt b/gcc/config/cr16/cr16.opt index 0396c8dd8fb..f82c1d633fb 100644 --- a/gcc/config/cr16/cr16.opt +++ b/gcc/config/cr16/cr16.opt @@ -20,7 +20,7 @@ msim Target --msim Use simulator runtime. +Use simulator runtime. mbit-ops Target Report Mask(BIT_OPS) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 661e4ce7eba..dd0487d23aa 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2020-03-15 Lewis Hyatt + + * lang.opt: Avoid redundancy in the help text. + 2020-03-12 Tobias Burnus PR middle-end/94120 diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt index 59523f74acf..da4b1aa879a 100644 --- a/gcc/fortran/lang.opt +++ b/gcc/fortran/lang.opt @@ -415,7 +415,7 @@ Produce a warning at runtime if a array temporary has been created for a procedu fconvert= Fortran RejectNegative Joined Enum(gfc_convert) Var(flag_convert) Init(GFC_FLAG_CONVERT_NATIVE) --fconvert= The endianness used for unformatted files. +-fconvert= The endianness used for unformatted files. Enum Name(gfc_convert) Type(enum gfc_convert) UnknownError(Unrecognized option to endianness value: %qs) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2e758849bde..02205f18219 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-15 Lewis Hyatt + + * gcc.misc-tests/help.exp: Adapt to new output for + -Walloc-size-larger-than= option. + 2020-03-14 H.J. Lu PR target/89229 diff --git a/gcc/testsuite/gcc.misc-tests/help.exp b/gcc/testsuite/gcc.misc-tests/help.exp index a9ee892c8f3..bcb62e09b6a 100644 --- a/gcc/testsuite/gcc.misc-tests/help.exp +++ b/gcc/testsuite/gcc.misc-tests/help.exp @@ -115,7 +115,7 @@ check_for_options c "-Q --help=warnings" { # Verify that an option that expects a byte-size argument is shown with # a meaningful byte-size argument as the value. check_for_options c "-Q --help=warnings" { --Walloc-size-larger-than=[ \t]+[1-9][0-9]+ bytes +-Walloc-size-larger-than=[ \t]+[1-9][0-9]+ bytes -Wlarger-than=[^\n\r]+[1-9][0-9]+ bytes } "" "" -- 2.30.2