bsps: Move startup files to bsps

Adjust build support files to new directory layout.

This patch is a part of the BSP source reorganization.

Update #3285.

5 files changed, 3 insertions, 310 deletions

diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index 226aadedd8..ac4a6c3836 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m32c/m32cbsp/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -19,10 +19,10 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/crtn.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/start/crtn.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/console/console-io.c
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs b/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs
deleted file mode 100644
index afa9f6badb..0000000000
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs
+++ /dev/null
@@ -1,9 +0,0 @@
-%rename endfile old_endfile
-%rename startfile old_startfile
-
-*startfile:
-%{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: crtbegin.o%s}}
-
-*endfile:
-%{!qrtems: %(old_endfile)} %{!nostdlib: %{qrtems: crtend.o%s}}
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/bspstart.c b/c/src/lib/libbsp/m32c/m32cbsp/startup/bspstart.c
deleted file mode 100644
index 7fdd598ccf..0000000000
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/bspstart.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-
-extern void sys_sbrk(int);
-
-/*
- * This routine would usually do the bulk of the system initialization.
- * But if a BSP doesn't need to do anything, it can use this version.
- */
-
-void bsp_start( void )
-{
-  /* Tell the simulator not to test for heap/stack collision */
-  sys_sbrk(0);
-}
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/crtn.S b/c/src/lib/libbsp/m32c/m32cbsp/startup/crtn.S
deleted file mode 100644
index 6004f28e05..0000000000
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/crtn.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define A16
-#define A(n,w) n
-#define W w
-#else
-#define A24
-#define A(n,w) w
-#define W l
-#endif
-
-	.section	.init,"ax",@progbits
-	jsr.a	_m32c_run_preinit_array
-	jsr.a	_m32c_run_init_array
-	exitd
-	.global	__m32c_init_end
-__m32c_init_end:
-
-	.section	.fini,"ax",@progbits
-
-	exitd
-	.global	__m32c_fini_end
-__m32c_fini_end:
-
-	.text
-
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds b/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds
deleted file mode 100644
index 48cc27e7ae..0000000000
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Declare some sizes.
- */
-_RamBase = DEFINED(_RamBase) ? _RamBase : 0x200000;
-_RamSize = DEFINED(_RamSize) ? _RamSize : 0x800000;
-_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
-_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
-
-
-/* Default linker script, for normal executables */
-OUTPUT_FORMAT("elf32-m32c", "elf32-m32c",
-	      "elf32-m32c")
-OUTPUT_ARCH(m32c)
-ENTRY(_start)
-STARTUP(start.o)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY {
-	RAM (w) : ORIGIN = 0x200000, LENGTH = 0x800000
-	VEC (r) : ORIGIN = 0xffffdc, LENGTH = 32
-	RESETVEC (r) : ORIGIN = 0xfffffc, LENGTH = 4
-}
-SECTIONS
-{
-  /* There are three cases we care about: First, RW data that must be
-     in the low 64k.  This will always be copied from ROM.  Second, RO
-     data that must be in the low 64k.  This may be copied from ROM if
-     the ROM is above 64k.  Third, anything that does not need to be
-     in the first 64k.  Chips normally only have two memory regions;
-     low ram and either high or low rom.  We map the low rom needs
-     into one of the actual regions.  */
-
-  /* .text goes first so the rom image of ram data will follow it.  */
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.interp .hash .dynsym .dynstr .gnu.version*)
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-    . = ALIGN(2);
-  } > RAM =0
-
-  /* rodata will either be part of data, or will be in low rom.  So we
-     might be spanning it, or we might not.  This lets us include it
-     in our calculations when appropriate.  */
-
-  .rodata : {
-    . = ALIGN(2);
-    *(.plt)
-    KEEP (*(.init))
-    KEEP (*(.fini))
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-    KEEP (*(SORT(.rtemsroset.*)))
-    *(.rodata1)
-    *(.eh_frame_hdr)
-    KEEP (*(.eh_frame))
-    KEEP (*(.gcc_except_table)) *(.gcc_except_table.*)
-    . = ALIGN(2);
-    PROVIDE(__romdatastart = .); /* IF_ROROM */
-  } > RAM
-
-  .tdata : {
-    __TLS_Data_begin = .;
-    *(.tdata .tdata.* .gnu.linkonce.td.*)
-    __TLS_Data_end = .;
-  } > RAM
-  .tbss : {
-    __TLS_BSS_begin = .;
-    *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon)
-    __TLS_BSS_end = .;
-  } > RAM
-  __TLS_Data_size = __TLS_Data_end - __TLS_Data_begin;
-  __TLS_Data_begin = __TLS_Data_size != 0 ? __TLS_Data_begin : __TLS_BSS_begin;
-  __TLS_Data_end = __TLS_Data_size != 0 ? __TLS_Data_end : __TLS_BSS_begin;
-  __TLS_BSS_size = __TLS_BSS_end - __TLS_BSS_begin;
-  __TLS_Size = __TLS_BSS_end - __TLS_Data_begin;
-  __TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss));
-
-  .data : {
-    . = ALIGN(32 / 8);
-    PROVIDE (__datastart = .); /* IF_ROROM */
-    PROVIDE (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE (__preinit_array_end = .);
-    PROVIDE (__init_array_start = .);
-    KEEP (*(.init_array))
-    PROVIDE (__init_array_end = .);
-    PROVIDE (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    PROVIDE (__fini_array_end = .);
-
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin*.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-
-    KEEP (*(.jcr))
-    *(.data.rel.ro.local) *(.data.rel.ro*)
-    *(.dynamic)
-
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(SORT(.rtemsrwset.*)))
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-    *(.data1)
-    *(.got.plt) *(.got)
-
-    . = ALIGN(2);
-    _edata = .;
-    PROVIDE (edata = .);
-    PROVIDE (__dataend = .);
-  } > RAM 
-
-  /* Note that __romdatacopysize may be ZERO for the simulator, which
-     knows how to intialize RAM directly.  It should ONLY be used for
-     copying data from ROM to RAM; if you need to know the size of the
-     data section, subtract the end symbol from the start symbol.  */
-  /* Note that crt0 assumes this is even; all the start/stop symbols
-     are also assumed word-aligned.  */
-  PROVIDE (__romdatacopysize = 0);
-
-  .bss : {
-    . = ALIGN(2);
-    PROVIDE (__bssstart = .);
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    . = ALIGN(2);
-    PROVIDE (__bssend = .);
-    _end = .;
-    PROVIDE (end = .);
-  } > RAM
-  PROVIDE (__bsssize = 0);
-  . = ALIGN(16);
-
-  . += _StackSize;
-  PROVIDE (__stack = .);
-  PROVIDE (_WorkAreaBase = .);
-  . = 0xa00000;
-  PROVIDE (_WorkAreaEnd = .);
-  PROVIDE (_WorkAreaSize = _WorkAreaEnd - _WorkAreaBase);
-
-/*
-  .stack (0x200000 + 0x800000 - 2) :
-  {
-    PROVIDE (__stack = .);
-    *(.stack)
-  }
-*/
-
-  .vec : {
-    *(.vec)
-  } > VEC
-  .resetvec : {
-    *(.resetvec)
-  } > RESETVEC
-
-  /* The rest are all not normally part of the runtime image.  */
-
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}