opts: do not allow Separate+Joined ending with =

Do not allow strange option format:
-msmall-data-limit= 11.

For -output-pch we need to use Separate syntax as lang spec
rules automatically append a space.

	PR target/105355

gcc/ChangeLog:

	* config/riscv/riscv.opt: Remove Separate from
	-msmall-data-limit=.
	* optc-gen.awk: Report error for the described situation.
	* gcc.cc: Use Separate syntax.
	* opts.cc (gen_command_line_string): Change option name.

gcc/c-family/ChangeLog:

	* c-opts.cc (c_common_handle_option): Change option name.
	* c.opt: Remove Joined and use Separate option.

gcc/cp/ChangeLog:

	* lang-specs.h: Use Separate syntax.

gcc/objc/ChangeLog:

	* lang-specs.h: Use Separate syntax.

gcc/objcp/ChangeLog:

	* lang-specs.h: Use Separate syntax.

diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc
index 09a16b20f36cef3235ef3da03094a8fa3c1cd61e..b9f01a65ed71b5f2f493b727e468baa2b553259c 100644 (file)
--- a/gcc/c-family/c-opts.cc
+++ b/gcc/c-family/c-opts.cc
@@ -300,7 +300,7 @@ c_common_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value,
       result = false;
       break;
 
-    case OPT__output_pch_:
+    case OPT__output_pch:
       pch_file = arg;
       break;
 

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 07da40ef43bdc9aae4ee8f425d59819b0ff47785..035b1de0d841e6cfbf551c1e1a2169129ecc7299 100644 (file)
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -135,8 +135,8 @@ C ObjC C++ ObjC++ Separate Alias(o)
 -output=
 C ObjC C++ ObjC++ Joined Alias(o)
 
--output-pch=
-C ObjC C++ ObjC++ Joined Separate
+-output-pch
+C ObjC C++ ObjC++ Separate
 
 -pedantic
 C ObjC C++ ObjC++ Alias(pedantic)

diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
index 492aad1232404c2711811c3d04f2e02902d1b740..84c8cf5a2de51fa87405a486d14d5fa98e272d3c 100644 (file)
--- a/gcc/config/riscv/riscv.opt
+++ b/gcc/config/riscv/riscv.opt
@@ -92,7 +92,7 @@ Target RejectNegative Joined Var(riscv_cpu_string)
 -mcpu=PROCESSOR        Use architecture of and optimize the output for PROCESSOR.
 
 msmall-data-limit=
-Target Joined Separate UInteger Var(g_switch_value) Init(8)
+Target Joined 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

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index f35c9fab76b7d21caaa643156edceba6428273dd..dbda5a7b2e44ebdff8ad6815471ef633467b328b 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -55,7 +55,7 @@ along with GCC; see the file COPYING3.  If not see
       "  %{!fsyntax-only:"
       "    %{!S:-o %g.s%V}"
       "    %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-      "                 %{!o*:--output-pch=%i.gch}%W{o*:--output-pch=%*}}}}}"
+      "                 %{!o*:--output-pch %i.gch}%W{o*:--output-pch %*}}}}}"
       "}}}",
      CPLUSPLUS_CPP_SPEC, 0, 0},
   {"@c++-system-header",
@@ -76,7 +76,7 @@ along with GCC; see the file COPYING3.  If not see
       "  %{!fsyntax-only:"
       "    %{!S:-o %g.s%V}"
       "    %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-      "                 %{!o*:--output-pch=%i.gch}%W{o*:--output-pch=%*}}}}}"
+      "                 %{!o*:--output-pch %i.gch}%W{o*:--output-pch %*}}}}}"
       "}}}",
      CPLUSPLUS_CPP_SPEC, 0, 0},
   {"@c++-user-header",
@@ -96,7 +96,7 @@ along with GCC; see the file COPYING3.  If not see
       "  %{!fsyntax-only:"
       "    %{!S:-o %g.s%V}"
       "    %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-      "                 %{!o*:--output-pch=%i.gch}%W{o*:--output-pch=%*}}}}}"
+      "                 %{!o*:--output-pch %i.gch}%W{o*:--output-pch %*}}}}}"
       "}}}",
      CPLUSPLUS_CPP_SPEC, 0, 0},
   {"@c++",

diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index bb07cc244e30fbeccc701816db888f497d65eb08..299e09c4f545feb3b4e15d0eec806fd9a2050de9 100644 (file)
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -1462,13 +1462,13 @@ static const struct compiler default_compilers[] =
                    cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
                        %(cc1_options)\
                        %{!fsyntax-only:%{!S:-o %g.s} \
-                           %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\
-                                              %W{o*:--output-pch=%*}}%V}}\
+                           %{!fdump-ada-spec*:%{!o*:--output-pch %i.gch}\
+                                              %W{o*:--output-pch %*}}%V}}\
          %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
                cc1 %(cpp_unique_options) %(cc1_options)\
                    %{!fsyntax-only:%{!S:-o %g.s} \
-                       %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\
-                                          %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
+                       %{!fdump-ada-spec*:%{!o*:--output-pch %i.gch}\
+                                          %W{o*:--output-pch %*}}%V}}}}}}}", 0, 0, 0},
   {".i", "@cpp-output", 0, 0, 0},
   {"@cpp-output",
    "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},

diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h
index 1a785ac3a885d0d9b957f7ebf2fbf1bdba98cf09..049166cb114120ceb776542f10c4765483a10523 100644 (file)
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
@@ -41,12 +41,12 @@ along with GCC; see the file COPYING3.  If not see
 %eGNU Objective C no longer supports traditional compilation}\
        %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
            cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-                        -o %g.s %{!o*:--output-pch=%i.gch}\
-                        %W{o*:--output-pch=%*}%V}\
+                        -o %g.s %{!o*:--output-pch %i.gch}\
+                        %W{o*:--output-pch %*}%V}\
        %{!save-temps*:%{!no-integrated-cpp:\
            cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-                        -o %g.s %{!o*:--output-pch=%i.gch}\
-                        %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
+                        -o %g.s %{!o*:--output-pch %i.gch}\
+                        %W{o*:--output-pch %*}%V}}}}}", 0, 0, 0},
   {".mi", "@objective-c-cpp-output", 0, 0, 0},
   {"@objective-c-cpp-output",
      "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\

diff --git a/gcc/objcp/lang-specs.h b/gcc/objcp/lang-specs.h
index 2d70f3090f77f80dd5b40dacbe05a46a1d283337..49f78a7cdfd270f6f959fe585cf29727546982f5 100644 (file)
--- a/gcc/objcp/lang-specs.h
+++ b/gcc/objcp/lang-specs.h
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
       cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
              %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
        %(cc1_options) %2\
-        -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
+        -o %g.s %{!o*:--output-pch %i.gch} %W{o*:--output-pch %*}%V}}}",
      CPLUSPLUS_CPP_SPEC, 0, 0},
   {"@objective-c++",
     "%{E|M|MM:cc1objplus -E %(cpp_options) %2 %(cpp_debug_options)}\

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index b51688d284fc16341a1301218c3164afcbfcc86b..595d3cff67779af44b0b528d1f0927660f247221 100644 (file)
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -342,6 +342,13 @@ for (i = 0; i < n_opts; i++) {
        len = length (opts[i]);
        enum = opt_enum(opts[i])
 
+       # Do not allow Joined and Separate properties if
+       # an options ends with '='.
+       if (flag_set_p("Joined", flags[i]) && flag_set_p("Separate", flags[i]) && opts[i] ~ "=$") {
+               print "#error Option '" opts[i] "' ending with '=' cannot have " \
+                       "both Joined and Separate properties"
+       }
+
        # If this switch takes joined arguments, back-chain all
        # subsequent switches to it for which it is a prefix.  If
        # a later switch S is a longer prefix of a switch T, T

diff --git a/gcc/opts.cc b/gcc/opts.cc
index c9badd241a01cf80835d905f25fdc532efa8f48f..cfac72a2eb02f0e923454ee95ad31510e84010c2 100644 (file)
--- a/gcc/opts.cc
+++ b/gcc/opts.cc
@@ -3639,7 +3639,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__output_pch_:
+      case OPT__output_pch:
       case OPT_fdiagnostics_show_location_:
       case OPT_fdiagnostics_show_option:
       case OPT_fdiagnostics_show_caret: