From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x936.google.com (mail-ua1-x936.google.com [IPv6:2607:f8b0:4864:20::936]) by sourceware.org (Postfix) with ESMTPS id A3CDD3857C4D for ; Tue, 26 Apr 2022 11:30:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A3CDD3857C4D Received: by mail-ua1-x936.google.com with SMTP id l6so3282828uar.2 for ; Tue, 26 Apr 2022 04:30:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=JndZxuilpAckrJK0pfdoyS00cVQlDQ37suFhPQh/CaQ=; b=F0BmexfpIGLO321hyT1jKsoWHwloyFnBjbHz9T5BtHq1EFiaHne8M158Ofbr/azTi2 kEE9uA6DkBfgAUzgRiBxrV9wGs+/l+n0kybdrxBDrdCzin/KOZaApJbuVTFrheeVn/hW krmyt9Z2/NAZA7NWMwGlRW7a7w1vMH2xfmbQIs09OB5KCJg8AwVh2MsxFFNjBcGxVMGu Hf5i+g8GxGF1RZ/o4RWRpMFzR05TcHoaI/CWAk/t0edDsS3XXI5/N5BMVfx+NSz+tRA7 OHnLFTOpALU8/BUQ67zPGSYvkAg7O5MgLB4WFqP0uQKnO1l3Ex6e94ug3mkvoKc9NO0P Urhw== X-Gm-Message-State: AOAM531tRdMyZEAMNwc/E2JHOX113bM1myaxxPpoJQVnPvHqHp/ETYyi 64ro148/uI9oFcWtwlc8has8ORVk4kvtcmXEKXuOo71k X-Google-Smtp-Source: ABdhPJxAehfZ+m2WeFmqjNUZMKJz3YguYSZFhAxsyiZqoLycxvitaX1Bb5keE+yCZRyBC/Fqu7eqkgIqvLSNK3VTCtM= X-Received: by 2002:ab0:6989:0:b0:346:b33f:7b94 with SMTP id t9-20020ab06989000000b00346b33f7b94mr6665940uaq.5.1650972631892; Tue, 26 Apr 2022 04:30:31 -0700 (PDT) MIME-Version: 1.0 References: <7029c5f6-5b6d-4697-1cfd-82f2417d5ba8@suse.cz> In-Reply-To: <7029c5f6-5b6d-4697-1cfd-82f2417d5ba8@suse.cz> From: Richard Biener Date: Tue, 26 Apr 2022 13:30:20 +0200 Message-ID: Subject: Re: [PATCH] lto: use diagnostics_context in print_lto_docs_link To: =?UTF-8?Q?Martin_Li=C5=A1ka?= Cc: GCC Patches Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: , X-List-Received-Date: Tue, 26 Apr 2022 11:30:34 -0000 On Tue, Apr 26, 2022 at 12:41 PM Martin Li=C5=A1ka wrote: > > Properly parse OPT_fdiagnostics_urls_ and then initialize both urls > and colors for global_dc. Doing that we would follow the configure > option --with-documentation-root-url, -fdiagnostics-urls is respected. > Plus we'll print colored warning and note messages. > > Patch can bootstrap on x86_64-linux-gnu and survives regression tests. > > Ready to be installed? OK. Thanks, Richard. > Thanks, > Martin > > PR lto/105364 > > gcc/ChangeLog: > > * lto-wrapper.cc (print_lto_docs_link): Use global_dc. > (run_gcc): Parse OPT_fdiagnostics_urls_. > (main): Initialize global_dc. > --- > gcc/lto-wrapper.cc | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/gcc/lto-wrapper.cc b/gcc/lto-wrapper.cc > index 6027fd9efdd..285e6e96af5 100644 > --- a/gcc/lto-wrapper.cc > +++ b/gcc/lto-wrapper.cc > @@ -1364,14 +1364,17 @@ jobserver_active_p (void) > void > print_lto_docs_link () > { > - const char *url =3D get_option_url (NULL, OPT_flto); > + bool print_url =3D global_dc->printer->url_format !=3D URL_FORMAT_NONE= ; > + const char *url =3D global_dc->get_option_url (global_dc, OPT_flto); > > pretty_printer pp; > pp.url_format =3D URL_FORMAT_DEFAULT; > pp_string (&pp, "see the "); > - pp_begin_url (&pp, url); > + if (print_url) > + pp_begin_url (&pp, url); > pp_string (&pp, "%<-flto%> option documentation"); > - pp_end_url (&pp); > + if (print_url) > + pp_end_url (&pp); > pp_string (&pp, " for more information"); > inform (UNKNOWN_LOCATION, pp_formatted_text (&pp)); > } > @@ -1573,6 +1576,14 @@ run_gcc (unsigned argc, char *argv[]) > incoming_dumppfx =3D dumppfx =3D option->arg; > break; > > + case OPT_fdiagnostics_urls_: > + diagnostic_urls_init (global_dc, option->value); > + break; > + > + case OPT_fdiagnostics_color_: > + diagnostic_color_init (global_dc, option->value); > + break; > + > default: > break; > } > @@ -2130,6 +2141,9 @@ main (int argc, char *argv[]) > gcc_init_libintl (); > > diagnostic_initialize (global_dc, 0); > + diagnostic_color_init (global_dc); > + diagnostic_urls_init (global_dc); > + global_dc->get_option_url =3D get_option_url; > > if (atexit (lto_wrapper_cleanup) !=3D 0) > fatal_error (input_location, "% failed"); > -- > 2.36.0 >