public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/marxin/heads/PR105355-joined-separate-opts)] Make --output-pch= a Separate option.
Date: Tue, 26 Apr 2022 13:45:57 +0000 (GMT) [thread overview]
Message-ID: <20220426134557.EFBF63857C41@sourceware.org> (raw)
https://gcc.gnu.org/g:a29c08ab0bb1840350d39ab44b827e6878117b8b
commit a29c08ab0bb1840350d39ab44b827e6878117b8b
Author: Martin Liska <mliska@suse.cz>
Date: Tue Apr 26 15:45:38 2022 +0200
Make --output-pch= a Separate option.
Diff:
---
gcc/c-family/c-opts.cc | 2 +-
gcc/c-family/c.opt | 4 ++--
gcc/cp/lang-specs.h | 6 +++---
gcc/gcc.cc | 8 ++++----
gcc/objc/lang-specs.h | 8 ++++----
gcc/objcp/lang-specs.h | 2 +-
gcc/opts.cc | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc
index a341a061758..da377f09bba 100644
--- a/gcc/c-family/c-opts.cc
+++ b/gcc/c-family/c-opts.cc
@@ -303,7 +303,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 873461d1fee..035b1de0d84 100644
--- 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
+-output-pch
+C ObjC C++ ObjC++ Separate
-pedantic
C ObjC C++ ObjC++ Alias(pedantic)
diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index f35c9fab76b..dbda5a7b2e4 100644
--- 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 bb07cc244e3..299e09c4f54 100644
--- 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 1a785ac3a88..049166cb114 100644
--- 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 2d70f3090f7..49f78a7cdfd 100644
--- 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/opts.cc b/gcc/opts.cc
index e5e3119a980..6f978431b52 100644
--- a/gcc/opts.cc
+++ b/gcc/opts.cc
@@ -3609,7 +3609,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:
next reply other threads:[~2022-04-26 13:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-26 13:45 Martin Liska [this message]
2022-05-09 8:54 Martin Liska
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220426134557.EFBF63857C41@sourceware.org \
--to=marxin@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).