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 r12-8269] lto: use diagnostics_context in print_lto_docs_link
Date: Tue, 26 Apr 2022 13:47:10 +0000 (GMT)	[thread overview]
Message-ID: <20220426134710.389F13858C83@sourceware.org> (raw)

https://gcc.gnu.org/g:cd4acb8cd9e45fd35664baa5b0a3150e479aae32

commit r12-8269-gcd4acb8cd9e45fd35664baa5b0a3150e479aae32
Author: Martin Liska <mliska@suse.cz>
Date:   Tue Apr 26 09:56:37 2022 +0200

    lto: use diagnostics_context in print_lto_docs_link
    
    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.
    
            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.

Diff:
---
 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 = get_option_url (NULL, OPT_flto);
+  bool print_url = global_dc->printer->url_format != URL_FORMAT_NONE;
+  const char *url = global_dc->get_option_url (global_dc, OPT_flto);
 
   pretty_printer pp;
   pp.url_format = 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 = dumppfx = 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 = get_option_url;
 
   if (atexit (lto_wrapper_cleanup) != 0)
     fatal_error (input_location, "%<atexit%> failed");


                 reply	other threads:[~2022-04-26 13:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20220426134710.389F13858C83@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).