From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id B95A538518AC; Mon, 14 Nov 2022 08:38:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B95A538518AC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668415086; bh=0zvyNzeVjV5eUJQmQ531oFrLWp4XfAgd7/jwV3hA3ic=; h=From:To:Subject:Date:From; b=jy2tgjAeqatn0/ozwCcCczrwQo2jpjRqXOaI8ZTHDURuekBE5TnK5769YBWt8Wczh DLYXk/bDcOtUjXc+q1XpuhTYAvfjMX6ZCo9wvdE7ySH8Jynim2FU4nZmFj9mJOvYL6 AeQtxpLzkJXbwKowIN0YpsAADKY29QjciFaSGzT4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3979] Revert "sphinx: update diagnostics URLs" X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 1f9b8c3053ece903a80d4def7d419b8a0cbf9411 X-Git-Newrev: 9d29dd2fcf2922e3bc9632b91dbca1f53c9a5ef4 Message-Id: <20221114083806.B95A538518AC@sourceware.org> Date: Mon, 14 Nov 2022 08:38:06 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9d29dd2fcf2922e3bc9632b91dbca1f53c9a5ef4 commit r13-3979-g9d29dd2fcf2922e3bc9632b91dbca1f53c9a5ef4 Author: Martin Liska Date: Sun Nov 13 21:57:36 2022 +0100 Revert "sphinx: update diagnostics URLs" This reverts commit 9c3bc557995463fe1dcc37ec503af780a6c1a341. Diff: --- gcc/opts.cc | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gcc/opts.cc b/gcc/opts.cc index c00887ae76e..3797784c865 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -3608,11 +3608,11 @@ get_option_html_page (int option_index) /* Analyzer options are on their own page. */ if (strstr (cl_opt->opt_text, "analyzer-")) - return "gcc/gcc-command-options/options-that-control-static-analysis.html"; + return "gcc/Static-Analyzer-Options.html"; /* Handle -flto= option. */ if (strstr (cl_opt->opt_text, "flto")) - return "gcc/gcc-command-options/options-that-control-optimization.html"; + return "gcc/Optimize-Options.html"; #ifdef CL_Fortran if ((cl_opt->flags & CL_Fortran) != 0 @@ -3623,11 +3623,10 @@ get_option_html_page (int option_index) && (cl_opt->flags & CL_CXX) == 0 #endif ) - return ("gfortran/gnu-fortran-command-options/" - "options-to-request-or-suppress-errors-and-warnings.html"); + return "gfortran/Error-and-Warning-Options.html"; #endif - return "gcc/gcc-command-options/options-to-request-or-suppress-warnings.html"; + return "gcc/Warning-Options.html"; } /* Return malloced memory for a URL describing the option OPTION_INDEX @@ -3646,8 +3645,11 @@ get_option_url (diagnostic_context *, int option_index) "gcc/Warning-Options.html". */ get_option_html_page (option_index), - /* Expect an anchor of the form "cmdoption-Wfoo". */ - "#cmdoption", cl_options[option_index].opt_text, NULL); + /* Expect an anchor of the form "index-Wfoo" e.g. + , and thus an id within + the URL of "#index-Wformat". */ + "#index", cl_options[option_index].opt_text, + NULL); else return NULL; } @@ -3784,16 +3786,12 @@ namespace selftest { static void test_get_option_html_page () { - ASSERT_STREQ (get_option_html_page (OPT_Wcpp), - "gcc/gcc-command-options/" - "options-to-request-or-suppress-warnings.html"); + ASSERT_STREQ (get_option_html_page (OPT_Wcpp), "gcc/Warning-Options.html"); ASSERT_STREQ (get_option_html_page (OPT_Wanalyzer_double_free), - "gcc/gcc-command-options/" - "options-that-control-static-analysis.html"); + "gcc/Static-Analyzer-Options.html"); #ifdef CL_Fortran ASSERT_STREQ (get_option_html_page (OPT_Wline_truncation), - "gfortran/gnu-fortran-command-options/" - "options-to-request-or-suppress-errors-and-warnings.html"); + "gfortran/Error-and-Warning-Options.html"); #endif }