[PATCH] doc/install.texi: CRIS: Remove gone websites. Adjust CRIS targets

[PATCH] doc/install.texi: CRIS: Remove gone websites. Adjust CRIS targets

[Hans-Peter Nilsson]

I'm about to commit this to master.

I'd like to also install this on the gcc-11 branch.

Ok?

-- 8< --

That is, support for cris-linux-gnu was removed in gcc-11, but
install.texi wasn't adjusted accordingly.  Also, unfortunately the
developer-related sites are gone with no replacements.  And, CRIS is
used in other chip series as well, but allude rather than list.

The generated manpages, info, pdf and html were sanity-checked.

gcc:
	* doc/install.texi <CRIS>: Remove references to removed websites and
	adjust for cris-*-elf being the only remaining toolchain.
---
 gcc/doc/install.texi | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index ab67a639836b..304785767027 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -3901,8 +3901,8 @@ configure GCC@ for building a CR16 uclinux cross-compiler.
 @end html
 @anchor{cris}
 @heading CRIS
-CRIS is the CPU architecture in Axis Communications ETRAX system-on-a-chip
-series.  These are used in embedded applications.
+CRIS is a CPU architecture in Axis Communications systems-on-a-chip, for
+example the ETRAX series.  These are used in embedded applications.
 
 @ifnothtml
 @xref{CRIS Options,, CRIS Options, gcc, Using the GNU Compiler
@@ -3913,21 +3913,8 @@ See ``CRIS Options'' in the main manual
 @end ifhtml
 for a list of CRIS-specific options.
 
-There are a few different CRIS targets:
-@table @code
-@item cris-axis-elf
-Mainly for monolithic embedded systems.  Includes a multilib for the
-@samp{v10} core used in @samp{ETRAX 100 LX}.
-@item cris-axis-linux-gnu
-A GNU/Linux port for the CRIS architecture, currently targeting
-@samp{ETRAX 100 LX} by default.
-@end table
-
-Pre-packaged tools can be obtained from
-@uref{ftp://ftp.axis.com/@/pub/@/axis/@/tools/@/cris/@/compiler-kit/}.  More
-information about this platform is available at
-@uref{http://developer.axis.com/}.
-
+Use @samp{configure --target=cris-elf} to configure GCC@ for building
+a cross-compiler for CRIS.
 @html
 <hr />
 @end html
-- 
2.30.2

Re: [PATCH] doc/install.texi: CRIS: Remove gone websites. Adjust CRIS targets

[Richard Biener]

On Mon, Apr 18, 2022 at 6:48 PM Hans-Peter Nilsson <hp@axis.com> wrote:
>
> I'm about to commit this to master.
>
> I'd like to also install this on the gcc-11 branch.

OK.

> Ok?

OK.

> -- 8< --
>
> That is, support for cris-linux-gnu was removed in gcc-11, but
> install.texi wasn't adjusted accordingly.  Also, unfortunately the
> developer-related sites are gone with no replacements.  And, CRIS is
> used in other chip series as well, but allude rather than list.
>
> The generated manpages, info, pdf and html were sanity-checked.
>
> gcc:
>         * doc/install.texi <CRIS>: Remove references to removed websites and
>         adjust for cris-*-elf being the only remaining toolchain.
> ---
>  gcc/doc/install.texi | 21 ++++-----------------
>  1 file changed, 4 insertions(+), 17 deletions(-)
>
> diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
> index ab67a639836b..304785767027 100644
> --- a/gcc/doc/install.texi
> +++ b/gcc/doc/install.texi
> @@ -3901,8 +3901,8 @@ configure GCC@ for building a CR16 uclinux cross-compiler.
>  @end html
>  @anchor{cris}
>  @heading CRIS
> -CRIS is the CPU architecture in Axis Communications ETRAX system-on-a-chip
> -series.  These are used in embedded applications.
> +CRIS is a CPU architecture in Axis Communications systems-on-a-chip, for
> +example the ETRAX series.  These are used in embedded applications.
>
>  @ifnothtml
>  @xref{CRIS Options,, CRIS Options, gcc, Using the GNU Compiler
> @@ -3913,21 +3913,8 @@ See ``CRIS Options'' in the main manual
>  @end ifhtml
>  for a list of CRIS-specific options.
>
> -There are a few different CRIS targets:
> -@table @code
> -@item cris-axis-elf
> -Mainly for monolithic embedded systems.  Includes a multilib for the
> -@samp{v10} core used in @samp{ETRAX 100 LX}.
> -@item cris-axis-linux-gnu
> -A GNU/Linux port for the CRIS architecture, currently targeting
> -@samp{ETRAX 100 LX} by default.
> -@end table
> -
> -Pre-packaged tools can be obtained from
> -@uref{ftp://ftp.axis.com/@/pub/@/axis/@/tools/@/cris/@/compiler-kit/}.  More
> -information about this platform is available at
> -@uref{http://developer.axis.com/}.
> -
> +Use @samp{configure --target=cris-elf} to configure GCC@ for building
> +a cross-compiler for CRIS.
>  @html
>  <hr />
>  @end html
> --
> 2.30.2
>