[rtems commit] sparc/*/bsp_specs, shared/linkcmds: Simplify bsp_specs

[Sebastian Huber]

I got a complaint from an anonymous RTEMS user. It gets now this error:

/disk2/development/rtems/5/lib/gcc/sparc-rtems5/7.2.0/../../../../sparc-rtems5/bin/ld: multiple STARTUP files

The addition of STARTUP(start.o) to linkcmds.base makes this file less re-usable, e.g. you cannot customize the startup procedure with own startup files.

I suggest to move the STARTUP(start.o) to the files which include the linkcmds.base, e.g.

c/src/lib/libbsp/sparc/leon2/startup/linkcmds
c/src/lib/libbsp/sparc/leon2/startup/linkcmds.leon2
c/src/lib/libbsp/sparc/leon3/startup/linkcmds.gr712rc
c/src/lib/libbsp/sparc/leon3/startup/linkcmds.ut699
c/src/lib/libbsp/sparc/leon3/startup/linkcmds.ut700
c/src/lib/libbsp/sparc/leon3/startup/linkcmds.gr740
c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3
c/src/lib/libbsp/sparc/erc32/startup/linkcmds


On 19/12/17 18:07, Joel Sherrill wrote:
> Module:    rtems
> Branch:    master
> Commit:    31c8db4aa69d7f8a9229315b21d17178e2a0086a
> Changeset: http://git.rtems.org/rtems/commit/?id=31c8db4aa69d7f8a9229315b21d17178e2a0086a
>
> Author:    Joel Sherrill <joel at rtems.org>
> Date:      Mon Dec 18 12:35:46 2017 -0600
>
> sparc/*/bsp_specs, shared/linkcmds: Simplify bsp_specs
>
> Updates #3520.
>
> ---
>
>   c/src/lib/libbsp/sparc/erc32/bsp_specs              | 2 +-
>   c/src/lib/libbsp/sparc/leon2/bsp_specs              | 2 +-
>   c/src/lib/libbsp/sparc/leon3/bsp_specs              | 2 +-
>   c/src/lib/libbsp/sparc/shared/startup/linkcmds.base | 2 ++
>   4 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/c/src/lib/libbsp/sparc/erc32/bsp_specs b/c/src/lib/libbsp/sparc/erc32/bsp_specs
> index 7cff0f3..a3efd94 100644
> --- a/c/src/lib/libbsp/sparc/erc32/bsp_specs
> +++ b/c/src/lib/libbsp/sparc/erc32/bsp_specs
> @@ -4,7 +4,7 @@
>   
>   *startfile:
>   %{!qrtems: %(old_startfile)} \
> -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s}}
> +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
>   
>   *link:
>   %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
> diff --git a/c/src/lib/libbsp/sparc/leon2/bsp_specs b/c/src/lib/libbsp/sparc/leon2/bsp_specs
> index 7cff0f3..a3efd94 100644
> --- a/c/src/lib/libbsp/sparc/leon2/bsp_specs
> +++ b/c/src/lib/libbsp/sparc/leon2/bsp_specs
> @@ -4,7 +4,7 @@
>   
>   *startfile:
>   %{!qrtems: %(old_startfile)} \
> -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s}}
> +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
>   
>   *link:
>   %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
> diff --git a/c/src/lib/libbsp/sparc/leon3/bsp_specs b/c/src/lib/libbsp/sparc/leon3/bsp_specs
> index 7cff0f3..a3efd94 100644
> --- a/c/src/lib/libbsp/sparc/leon3/bsp_specs
> +++ b/c/src/lib/libbsp/sparc/leon3/bsp_specs
> @@ -4,7 +4,7 @@
>   
>   *startfile:
>   %{!qrtems: %(old_startfile)} \
> -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s}}
> +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
>   
>   *link:
>   %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
> diff --git a/c/src/lib/libbsp/sparc/shared/startup/linkcmds.base b/c/src/lib/libbsp/sparc/shared/startup/linkcmds.base
> index 4e39142..cc264a2 100644
> --- a/c/src/lib/libbsp/sparc/shared/startup/linkcmds.base
> +++ b/c/src/lib/libbsp/sparc/shared/startup/linkcmds.base
> @@ -50,6 +50,8 @@ RAM_END = _RAM_END;
>    */
>   EXTERN(rtems_get_version_string);
>   
> +STARTUP(start.o)
> +
>   /*
>    * stick everything in ram (of course)
>    */
>
> _______________________________________________
> vc mailing list
> vc at rtems.org
> http://lists.rtems.org/mailman/listinfo/vc

-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber at embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.