From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 6F1483814FF1; Mon, 30 May 2022 08:32:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F1483814FF1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-852] [Ada] Fix spurious options being inserted in -fdiagnostics-format=json output X-Act-Checkin: gcc X-Git-Author: Ghjuvan Lacambre X-Git-Refname: refs/heads/master X-Git-Oldrev: a4db870e1b042ac6ab7ddaef6e2d3e32408578dd X-Git-Newrev: 1b88c61e3749d8da905af1c8efc11002b01bd339 Message-Id: <20220530083209.6F1483814FF1@sourceware.org> Date: Mon, 30 May 2022 08:32:09 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2022 08:32:09 -0000 https://gcc.gnu.org/g:1b88c61e3749d8da905af1c8efc11002b01bd339 commit r13-852-g1b88c61e3749d8da905af1c8efc11002b01bd339 Author: Ghjuvan Lacambre Date: Fri Apr 29 16:53:05 2022 +0200 [Ada] Fix spurious options being inserted in -fdiagnostics-format=json output Without this patch, gnat would use `-gnatw?` as the default option for some of the default warnings. gcc/ada/ * erroutc.adb (Get_Warning_Option): Don't consider `?` as a valid option switch. Diff: --- gcc/ada/erroutc.adb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/erroutc.adb b/gcc/ada/erroutc.adb index b4f50649602..cab7fecef5e 100644 --- a/gcc/ada/erroutc.adb +++ b/gcc/ada/erroutc.adb @@ -367,7 +367,7 @@ package body Erroutc is Warn : constant Boolean := Errors.Table (Id).Warn; Warn_Chr : constant String (1 .. 2) := Errors.Table (Id).Warn_Chr; begin - if Warn and then Warn_Chr /= " " then + if Warn and then Warn_Chr /= " " and then Warn_Chr (1) /= '?' then if Warn_Chr = "$ " then return "-gnatel"; elsif Warn_Chr (2) = ' ' then