From patchwork Mon May 9 08:57:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 1628391 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=LIys+TKg; dkim=pass header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=LIJcgjiP; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KxZnY4RLTz9sGJ for ; Mon, 9 May 2022 18:57:52 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D26233856274 for ; Mon, 9 May 2022 08:57:48 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 3E39E3858427 for ; Mon, 9 May 2022 08:57:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3E39E3858427 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DD6551FA06 for ; Mon, 9 May 2022 08:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1652086655; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=anfT3JUbqlNpWgVr6hTOUyfEEgaZHUrVFG6fnBmn20s=; b=LIys+TKgMZkNjrpWkt4bu75GIp051oTwsobGkFsw7rgkToP24kysD8wKAGPjj/O/cj5B4S WGcUMeVT1mCh1XlgciqaKjq13V/AqTIi7BPToJJVoD0A8HS2jTMlYDNluTFcWlnLCAqczw ZFE1FcwUiRnnNdfUZHFC0bF+NQDODF8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1652086655; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=anfT3JUbqlNpWgVr6hTOUyfEEgaZHUrVFG6fnBmn20s=; b=LIJcgjiPSHzoFqhD7MfkGnAR4R79JyUlKcAEmucFmY/ys9NgoqsEmc0gr4rq5yUavXLB+Q 2NB02b33YHKeqVBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CF9C913AA5 for ; Mon, 9 May 2022 08:57:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id h2GTMX/XeGILUgAAMHmgww (envelope-from ) for ; Mon, 09 May 2022 08:57:35 +0000 Message-ID: Date: Mon, 9 May 2022 10:57:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] opts: do not allow Separate+Joined ending with = To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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. Patch can bootstrap on x86_64-linux-gnu and survives regression tests. Ready to be installed? Thanks, Martin 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. --- gcc/c-family/c-opts.cc | 2 +- gcc/c-family/c.opt | 4 ++-- gcc/config/riscv/riscv.opt | 2 +- gcc/cp/lang-specs.h | 6 +++--- gcc/gcc.cc | 8 ++++---- gcc/objc/lang-specs.h | 8 ++++---- gcc/objcp/lang-specs.h | 2 +- gcc/optc-gen.awk | 7 +++++++ gcc/opts.cc | 2 +- 9 files changed, 24 insertions(+), 17 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 07da40ef43b..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 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 492aad12324..84c8cf5a2de 100644 --- 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 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 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/optc-gen.awk b/gcc/optc-gen.awk index b51688d284f..595d3cff677 100644 --- 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 2ffbf429b7b..f9064d8680e 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -3611,7 +3611,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: