From ca4602e914d4ec00bf5db51e0830d702d5bc3f4e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 25 Jan 2016 22:03:00 +0100 Subject: Use linker set for libio initialization Update #2408. --- c/src/lib/libbsp/Makefile.am | 2 +- c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am | 2 -- c/src/lib/libbsp/arm/atsam/Makefile.am | 2 -- c/src/lib/libbsp/arm/beagle/Makefile.am | 2 -- c/src/lib/libbsp/arm/csb336/Makefile.am | 2 +- c/src/lib/libbsp/arm/csb337/Makefile.am | 2 +- c/src/lib/libbsp/arm/edb7312/Makefile.am | 2 +- c/src/lib/libbsp/arm/gdbarmsim/Makefile.am | 2 +- c/src/lib/libbsp/arm/gumstix/Makefile.am | 2 +- c/src/lib/libbsp/arm/lm3s69xx/Makefile.am | 2 -- c/src/lib/libbsp/arm/lpc176x/Makefile.am | 2 -- c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 2 -- c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 2 -- c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 2 -- c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am | 2 -- c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 2 +- c/src/lib/libbsp/arm/smdk2410/Makefile.am | 2 +- c/src/lib/libbsp/arm/stm32f4/Makefile.am | 2 -- c/src/lib/libbsp/arm/tms570/Makefile.am | 2 -- c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am | 2 -- c/src/lib/libbsp/bfin/TLL6527M/Makefile.am | 2 +- c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am | 2 +- c/src/lib/libbsp/bfin/eZKit533/Makefile.am | 2 +- c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am | 2 -- c/src/lib/libbsp/i386/pc386/Makefile.am | 2 -- c/src/lib/libbsp/lm32/lm32_evr/Makefile.am | 2 -- c/src/lib/libbsp/lm32/milkymist/Makefile.am | 2 -- c/src/lib/libbsp/m32c/m32cbsp/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/av5282/Makefile.am | 2 +- c/src/lib/libbsp/m68k/csb360/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/gen68340/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/gen68360/Makefile.am | 1 - c/src/lib/libbsp/m68k/genmcf548x/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 3 +- c/src/lib/libbsp/m68k/mcf52235/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5225x/Makefile.am | 2 -- c/src/lib/libbsp/m68k/mcf5235/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5329/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mrm332/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/mvme147/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/mvme162/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/mvme167/Makefile.am | 4 +-- c/src/lib/libbsp/m68k/uC5282/Makefile.am | 4 +-- c/src/lib/libbsp/mips/csb350/Makefile.am | 2 -- c/src/lib/libbsp/mips/hurricane/Makefile.am | 2 -- c/src/lib/libbsp/mips/jmr3904/Makefile.am | 2 -- c/src/lib/libbsp/mips/malta/Makefile.am | 2 -- c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 2 -- c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 2 -- c/src/lib/libbsp/moxie/moxiesim/Makefile.am | 4 +-- c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 2 -- c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am | 4 +-- c/src/lib/libbsp/or1k/generic_or1k/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 3 +- c/src/lib/libbsp/powerpc/haleakala/Makefile.am | 4 +-- .../libbsp/powerpc/motorola_powerpc/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 4 +-- c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 1 - c/src/lib/libbsp/powerpc/psim/Makefile.am | 3 +- c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 4 +-- c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 3 +- c/src/lib/libbsp/powerpc/ss555/Makefile.am | 4 +-- c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 3 +- c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 4 +-- c/src/lib/libbsp/powerpc/virtex/Makefile.am | 4 +-- c/src/lib/libbsp/powerpc/virtex4/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 2 -- c/src/lib/libbsp/sh/gensh1/Makefile.am | 2 +- c/src/lib/libbsp/sh/gensh2/Makefile.am | 4 +-- c/src/lib/libbsp/sh/gensh4/Makefile.am | 2 +- c/src/lib/libbsp/sh/shsim/Makefile.am | 2 -- c/src/lib/libbsp/shared/bootcard.c | 12 ------- c/src/lib/libbsp/shared/bsplibc.c | 19 ----------- c/src/lib/libbsp/shared/bsppost.c | 22 ------------- c/src/lib/libbsp/shared/include/bootcard.h | 4 --- c/src/lib/libbsp/sparc/erc32/Makefile.am | 2 -- c/src/lib/libbsp/sparc/leon2/Makefile.am | 2 -- c/src/lib/libbsp/sparc/leon3/Makefile.am | 4 +-- c/src/lib/libbsp/sparc64/niagara/Makefile.am | 2 -- c/src/lib/libbsp/sparc64/usiii/Makefile.am | 3 +- c/src/lib/libbsp/v850/gdbv850sim/Makefile.am | 2 -- cpukit/libcsupport/Makefile.am | 1 - cpukit/libcsupport/include/rtems/libio.h | 15 --------- cpukit/libcsupport/src/libio_helper_null.c | 30 ----------------- cpukit/libcsupport/src/libio_init.c | 15 ++++++++- cpukit/sapi/include/confdefs.h | 14 -------- cpukit/score/include/rtems/sysinit.h | 4 +-- testsuites/fstests/fsnofs01/init.c | 6 ++-- testsuites/sptests/spsysinit01/init.c | 38 ++++++++++++++-------- 94 files changed, 109 insertions(+), 279 deletions(-) delete mode 100644 c/src/lib/libbsp/shared/bsplibc.c delete mode 100644 c/src/lib/libbsp/shared/bsppost.c delete mode 100644 cpukit/libcsupport/src/libio_helper_null.c diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am index bd159290f0..16c276f7b0 100644 --- a/c/src/lib/libbsp/Makefile.am +++ b/c/src/lib/libbsp/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = MERGE.PROCEDURE bsp.am # shared EXTRA_DIST += shared/bootcard.c shared/bspclean.c \ - shared/bsplibc.c shared/bsppost.c shared/console-polled.c \ + shared/console-polled.c \ shared/console.c shared/gnatinstallhandler.c shared/sbrk.c \ shared/tod.c EXTRA_DIST += shared/vmeUniverse/vmeUniverse.c \ diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am index 7565d8ad08..c168d07b1e 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am @@ -152,8 +152,6 @@ libbsp_a_SOURCES += hwlib/src/hwmgr/alt_reset_manager.c # Shared libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am index 901e851bc4..e125aa17cf 100644 --- a/c/src/lib/libbsp/arm/atsam/Makefile.am +++ b/c/src/lib/libbsp/arm/atsam/Makefile.am @@ -327,8 +327,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterread.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am index b16b99882f..20d30928da 100644 --- a/c/src/lib/libbsp/arm/beagle/Makefile.am +++ b/c/src/lib/libbsp/arm/beagle/Makefile.am @@ -77,8 +77,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index ada11bf7cc..e2687b899a 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -28,7 +28,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bspgetworkarea.c \ ../../shared/bsppredriverhook.c startup/bspstart.c ../../shared/bspclean.c \ ../../shared/bspreset.c startup/memmap.c ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 53bbc95430..598a67f60b 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -50,7 +50,7 @@ EXTRA_DIST += README.kit637_v6 noinst_LIBRARIES += libbsp.a # startup -libbsp_a_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES = \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ startup/bspstart.c \ ../../shared/bspclean.c startup/bspreset.c \ diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index 31ecdbbf21..fae2c5fdf9 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -30,7 +30,7 @@ libbsp_a_SOURCES = include_HEADERS += ../../arm/shared/comm/uart.h # startup -libbsp_a_SOURCES += ../../shared/bsppost.c ../../shared/bsplibc.c \ +libbsp_a_SOURCES += \ ../../shared/bspgetworkarea.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ ../../shared/bspclean.c ../../shared/bootcard.c ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am index 03351df5eb..8100c96e1b 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am +++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am @@ -32,7 +32,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bspgetworkarea.c \ ../../shared/bsppredriverhook.c ../../shared/bspstart.c \ ../../shared/bspclean.c startup/bspreset.c ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am index adba4a0fa2..708a75bbbc 100644 --- a/c/src/lib/libbsp/arm/gumstix/Makefile.am +++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am @@ -28,7 +28,7 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c \ diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am index 9fab35fd1b..621a1eda38 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am @@ -63,8 +63,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterread.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am index 659ee49f67..d6cc64ff10 100644 --- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am @@ -92,8 +92,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 43e65143f1..4f14f362ee 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -94,8 +94,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c \ ../../shared/bspclean.c \ ../../shared/bspgetworkarea.c \ - ../../shared/bsplibc.c \ - ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c \ ../../shared/gnatinstallhandler.c \ ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am index 5d2bb39474..5426323ce8 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am @@ -86,8 +86,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am index ed48bf762e..a092a28914 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am +++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am @@ -81,8 +81,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterread.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am index 5a38edbabd..e95bb073f0 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am @@ -81,8 +81,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 94e25a393d..fd5255fd0f 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am @@ -30,7 +30,7 @@ libbsp_a_SOURCES = include_HEADERS += ../../arm/shared/comm/uart.h # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bsppredriverhook.c \ ../../shared/bspgetworkarea.c startup/bspstart.c \ ../../shared/bspclean.c startup/bspreset.c \ diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index 2d13a465ad..7fce249459 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -27,7 +27,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../gp32/startup/bspstart.c ../gp32/startup/bspidle.c ../../shared/bspclean.c \ startup/bspreset.c startup/memmap.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am index 9a1bfc8a10..9634b5c514 100644 --- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am +++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am @@ -78,8 +78,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterread.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am index 6ea81e595b..568ce11121 100644 --- a/c/src/lib/libbsp/arm/tms570/Makefile.am +++ b/c/src/lib/libbsp/arm/tms570/Makefile.am @@ -113,8 +113,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am index d081eb6efa..8e6f8c3c9c 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am +++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am @@ -78,8 +78,6 @@ libbsp_a_LIBADD = libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am index f73c23bad7..00afc743d4 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am +++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am @@ -26,7 +26,7 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a -libbsp_a_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES = \ startup/bspstart.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c \ diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am index 042d4354f6..756c2f1ef7 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am @@ -26,7 +26,7 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ startup/bspstart.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c \ diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am index 4f30570ca2..1c680f1e1f 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -27,7 +27,7 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ startup/bspstart.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c \ diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am index 368be81ab9..d7d55262c1 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am @@ -57,8 +57,6 @@ libbsp_a_SOURCES += ../../shared/bspstart.c # Shared libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index ebc95fd7cf..ac0774126f 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -146,8 +146,6 @@ libbsp_a_SOURCES += ../../i386/shared/pci/pcibios.c \ include_HEADERS += ../../i386/shared/comm/uart.h # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += startup/bspgetworkarea.c libbsp_a_SOURCES += startup/bspstart.c diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am index 113886eb7e..d8a03de17c 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am @@ -30,8 +30,6 @@ libbsp_a_LIBADD = # startup libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../shared/startup/bspstart.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c libbsp_a_SOURCES += ../../shared/bootcard.c diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am index 4b37573b9c..bab2a7f3ea 100644 --- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am +++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am @@ -46,8 +46,6 @@ libbsp_a_LIBADD = # startup libbsp_a_SOURCES += startup/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../shared/startup/bspstart.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c libbsp_a_SOURCES += ../../shared/bootcard.c diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am index 12ff351ed7..dd38e9784a 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am +++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am @@ -25,9 +25,9 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c \ - ../../shared/bspgetworkarea.c ../../shared/bsppost.c \ + ../../shared/bspgetworkarea.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c startup/crtn.S clock_SOURCES = ../../shared/clock_driver_simidle.c diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index bc8e634c75..2e7418c418 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -27,7 +27,7 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c ../../shared/bspreset_loop.c \ + ../../shared/bspreset_loop.c \ ../../shared/bspgetworkarea.c \ startup/init5282.c startup/bspstart.c \ ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index 8ecbecbc14..2271b53d83 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -28,9 +28,9 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c \ - ../../shared/bsppost.c ../../shared/bspgetworkarea.c \ + ../../shared/bspgetworkarea.c \ ../../shared/bspstart.c startup/init5272.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index e46dfda8ae..7130692fd7 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -31,9 +31,9 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ - ../../shared/bsppost.c ../../shared/bspstart.c startup/init68340.c \ + ../../shared/bspstart.c startup/init68340.c \ ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/setvec.c \ startup/dumpanic.c ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 87b6692cba..e81a29f5c8 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -28,7 +28,6 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += startup/alloc360.c ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bspgetworkarea.c ../../shared/bspstart.c \ startup/init68360.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index f63dac309a..e9e1f40e4f 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -36,8 +36,8 @@ libbsp_a_SOURCES = libbsp_a_CPPFLAGS = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bspgetworkarea.c \ +libbsp_a_SOURCES += \ + ../../shared/bspclean.c ../../shared/bspgetworkarea.c \ ../../shared/bspreset_loop.c \ ../../shared/bsppredriverhook.c startup/init548x.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index e056ae4108..3411b27651 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -34,9 +34,8 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ - ../../shared/bsppost.c \ ../../shared/bspstart.c startup/init5206e.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am index 752cf81694..ec373d77ee 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -27,7 +27,7 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c ../../shared/bspreset_loop.c \ + ../../shared/bspreset_loop.c \ ../../shared/bspgetworkarea.c \ startup/init52235.c ../../shared/bspstart.c startup/cfinit.c \ startup/bspgetcpuclockspeed.c ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am index 85895ba60a..5106369391 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am @@ -27,8 +27,6 @@ libbsp_a_SOURCES = \ ../../shared/bspclean.c \ ../../shared/bspreset_loop.c \ ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c \ - ../../shared/bsppost.c \ ../../shared/bspgetworkarea.c \ startup/init5225x.c startup/bspstart.c \ ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index a7f93ea475..6b06f89b00 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -28,7 +28,7 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c ../../shared/bspreset_loop.c \ + ../../shared/bspreset_loop.c \ startup/bspgetcpuclockspeed.c \ ../../shared/bspgetworkarea.c startup/init5235.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index e273345c3a..496d322637 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -27,7 +27,7 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c ../../shared/bspreset_loop.c \ + ../../shared/bspreset_loop.c \ ../../shared/bspgetworkarea.c \ startup/init5329.c startup/bspstart.c startup/cfinit.c\ ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 5258733164..3d43fcaefe 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -28,8 +28,8 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += startup/start_c.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bspstart.c startup/bsppredriverhook.c \ +libbsp_a_SOURCES += startup/start_c.c \ + ../../shared/bspstart.c startup/bsppredriverhook.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/bspclean.c \ ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index 6a3673f4c6..18e0c79f5f 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -30,8 +30,8 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += startup/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ +libbsp_a_SOURCES += startup/bspclean.c \ + startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/bspgetworkarea.c ../../shared/sbrk.c \ ../../shared/setvec.c ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 04f4d3fd6c..4da9f823f1 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -30,8 +30,8 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ + ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../shared/setvec.c \ ../../shared/bspgetworkarea.c ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 89332f7059..62490a5aa6 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -33,8 +33,8 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += startup/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += startup/bspclean.c \ + ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ startup/page_table.c \ ../../shared/bspgetworkarea.c startup/page_table.c \ diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index 2e3ab4f256..56fefe9235 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -29,10 +29,10 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += startup/bspclean.c ../../shared/bsplibc.c \ +libbsp_a_SOURCES += startup/bspclean.c \ ../../shared/bsppredriverhook.c \ ../../shared/bspgetworkarea.c \ - ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ + startup/bspstart.c ../../shared/bootcard.c \ startup/page_table.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index a8fe0cee44..530cdcbc08 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -26,8 +26,8 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += startup/bspclean.c ../../shared/bsplibc.c startup/bspreset.c \ - ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ +libbsp_a_SOURCES += startup/bspclean.c startup/bspreset.c \ + ../../shared/bsppredriverhook.c \ ../../shared/bspgetworkarea.c \ startup/init5282.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index 14024f0e4c..4296a45979 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -33,9 +33,7 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += startup/bspreset.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c libbsp_a_SOURCES += startup/bspstart.c diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am index e7d18950ed..7dfdc1561c 100644 --- a/c/src/lib/libbsp/mips/hurricane/Makefile.am +++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am @@ -32,8 +32,6 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += startup/bspstart.c diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index 6f48c6f6b4..e0b68ca0c8 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -32,9 +32,7 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += ../../shared/bootcard.c diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am index 64520d1d7e..15aa8987c7 100644 --- a/c/src/lib/libbsp/mips/malta/Makefile.am +++ b/c/src/lib/libbsp/mips/malta/Makefile.am @@ -38,9 +38,7 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += startup/simple_access.c libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += startup/bspreset.c diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index 5faf18a175..5c0b08b640 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -35,8 +35,6 @@ libbsp_a_SOURCES = libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index 5faf18a175..5c0b08b640 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -35,8 +35,6 @@ libbsp_a_SOURCES = libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am index 71fbc2867f..9d7051053b 100644 --- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am +++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am @@ -30,9 +30,9 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c \ - ../../shared/bspgetworkarea.c ../../shared/bsppost.c \ + ../../shared/bspgetworkarea.c \ ../../shared/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c # clock diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 41b154a4c7..71b605662f 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -30,9 +30,7 @@ libbsp_a_CPPFLAGS = # startup libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c libbsp_a_SOURCES += ../../shared/bspreset_loop.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c libbsp_a_SOURCES += ../../shared/bootcard.c diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am index 2937b07e47..74ab358196 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am @@ -23,9 +23,9 @@ noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c \ - ../../shared/startup/bspgetworkarea.c ../../shared/bsppost.c \ + ../../shared/startup/bspgetworkarea.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ startup/setvec.c ../../shared/gnatinstallhandler.c # clock diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am index 8bfd241b3f..ac50a2d74e 100644 --- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am +++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am @@ -68,8 +68,6 @@ libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am index 6284d19830..83bc96e52d 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am +++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am @@ -66,7 +66,7 @@ libbsp_a_SOURCES += startup/bspstart.c \ ../../powerpc/shared/startup/pgtbl_setup.c \ ../../powerpc/shared/startup/pgtbl_activate.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ - startup/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ + startup/bspclean.c \ ../../shared/gnatinstallhandler.c include_bsp_HEADERS += ../shared/motorola/vpd.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 06cda0ca8c..c6afc9990b 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -132,8 +132,6 @@ libbsp_a_SOURCES += tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \ libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index 6e200ea955..f8dd80c3d2 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -51,8 +51,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c \ - ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am index 8a0f7466eb..b121b08e37 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am +++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am @@ -26,8 +26,8 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bspreset_loop.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ + ../../shared/bspreset_loop.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index b15c836029..e098206083 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -49,7 +49,7 @@ libbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c \ ../../powerpc/shared/startup/pgtbl_activate.c \ ../../powerpc/shared/startup/ppc_idle.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ - ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/bspclean.c \ ../../shared/gnatinstallhandler.c \ startup/bspreset.c diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index bc095337e6..7a0f5843c7 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -64,8 +64,6 @@ include_bsp_HEADERS += include/console-linflex.h # startup libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/src/stackalloc.c libbsp_a_SOURCES += ../shared/src/bsp-start-zero.S diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index e43d7484b6..f2f6f154b7 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -49,8 +49,8 @@ libbsp_a_SOURCES += ../../shared/src/irq-shell.c libbsp_a_SOURCES += irq/irq.c # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ + ../../shared/bsppredriverhook.c \ ../shared/startup/bspidle.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c \ ../../shared/bspgetworkarea.c diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am index 3a293d30ef..c9573ea1b4 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am @@ -54,7 +54,7 @@ libbsp_a_SOURCES += startup/bspstart.c \ ../../powerpc/shared/startup/bsppredriverhook.c \ ../../powerpc/shared/startup/zerobss.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ - ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/bspclean.c \ ../../shared/gnatinstallhandler.c # tod libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 6d7f870a2f..c8cb2293e1 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -34,7 +34,6 @@ libbsp_a_SOURCES += startup/bspstart.c \ ../../powerpc/shared/startup/bspgetworkarea.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ startup/bspclean.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c startup/bspreset.c \ ../../powerpc/shared/startup/probeMemEnd.c diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 06eef03cf8..a66cf42feb 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -33,8 +33,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ ../../shared/bspgetworkarea.c ../../shared/bootcard.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am index 73b186c106..8c0d1186f5 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am @@ -28,9 +28,9 @@ project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds # startup -startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c \ - ../../shared/bspgetworkarea.c ../../shared/bsppost.c \ + ../../shared/bspgetworkarea.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c \ startup/cmain.c startup/bspstart.c startup/bsppanic.c diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index f2f8959539..a564c2d465 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -56,8 +56,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # Startup -libbsp_a_SOURCES += ../../shared/bsplibc.c \ - ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bootcard.c \ ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c \ diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index 24d4ac1da0..61f615e131 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -33,8 +33,8 @@ libbsp_a_SOURCES += clock/p_clock.c # console libbsp_a_SOURCES += console/console.c # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ + ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c startup/iss555.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c start/start.S \ ../../shared/bspgetworkarea.c diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am index 3c89d113f5..5b7339a28c 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am @@ -42,8 +42,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # Startup -libbsp_a_SOURCES += ../../shared/bsplibc.c \ - ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am index 1244023bfb..29044518cf 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am @@ -58,8 +58,8 @@ libbsp_a_SOURCES += spi/spi.c # timer libbsp_a_SOURCES += timer/timer.c # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ +libbsp_a_SOURCES += ../../shared/bspclean.c \ + ../../shared/bsppredriverhook.c \ ../shared/startup/bspidle.c \ startup/bspstart.c startup/bspgetworkarea.c ../../shared/bootcard.c \ startup/mmutlbtab.c startup/cpuinit.c ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index ecaa64dfb5..e355e9eeeb 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am @@ -43,8 +43,8 @@ libbsp_a_LIBADD = # startup libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bspgetworkarea.c \ - ../../shared/bspreset_loop.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ + ../../shared/bspreset_loop.c \ + startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../shared/src/bsp-start-zero.S diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am index 1215d7470e..4b996e041f 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am @@ -30,9 +30,7 @@ noinst_LIBRARIES += libbsp.a # startup libbsp_a_SOURCES = startup/bspclean.c \ ../shared/startup/zerobss.c \ - ../../shared/bsplibc.c \ ../../shared/bspgetworkarea.c \ - ../../shared/bsppost.c \ startup/bspstart.c \ ../../shared/bootcard.c \ ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am index 09231d2b55..eaa7e22a72 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am @@ -29,9 +29,7 @@ noinst_LIBRARIES += libbsp.a # startup libbsp_a_SOURCES = startup/bspclean.c \ ../shared/startup/zerobss.c \ - ../../shared/bsplibc.c \ ../../shared/bspgetworkarea.c \ - ../../shared/bsppost.c \ startup/bspstart.c \ ../../shared/bootcard.c \ ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index fbc60dfb6e..1fd30f8f4a 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -32,7 +32,7 @@ BUILT_SOURCES = scitab.c CLEANFILES = scitab.c # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bsppredriverhook.c ../shared/startup/bspstart.c \ ../../shared/bspclean.c ../../shared/bspreset_loop.c \ ../../shared/bspgetworkarea.c \ diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 571c84dd28..ba58a211cd 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -34,8 +34,8 @@ BUILT_SOURCES = scitab.c CLEANFILES = scitab.c # startup -libbsp_a_SOURCES += startup/hw_init.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ +libbsp_a_SOURCES += startup/hw_init.c \ + ../../shared/bsppredriverhook.c \ ../shared/startup/bspstart.c \ ../../shared/bspgetworkarea.c ../../shared/sbrk.c ../../shared/bootcard.c \ ../../shared/gnatinstallhandler.c ../../shared/bspclean.c \ diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 9baa3093f3..995c149004 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -27,7 +27,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += \ ../../shared/bsppredriverhook.c ../shared/startup/bspstart.c \ ../../shared/bspgetworkarea.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 9f98636f6a..fc0d77a459 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -28,8 +28,6 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../shared/startup/bspstart.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c diff --git a/c/src/lib/libbsp/shared/bootcard.c b/c/src/lib/libbsp/shared/bootcard.c index 8b37a52258..3e243d2569 100644 --- a/c/src/lib/libbsp/shared/bootcard.c +++ b/c/src/lib/libbsp/shared/bootcard.c @@ -49,24 +49,12 @@ RTEMS_SYSINIT_ITEM( RTEMS_SYSINIT_ORDER_MIDDLE ); -RTEMS_SYSINIT_ITEM( - bsp_libc_init, - RTEMS_SYSINIT_BSP_LIBC, - RTEMS_SYSINIT_ORDER_MIDDLE -); - RTEMS_SYSINIT_ITEM( bsp_predriver_hook, RTEMS_SYSINIT_BSP_PRE_DRIVERS, RTEMS_SYSINIT_ORDER_MIDDLE ); -RTEMS_SYSINIT_ITEM( - bsp_postdriver_hook, - RTEMS_SYSINIT_BSP_POST_DRIVERS, - RTEMS_SYSINIT_ORDER_MIDDLE -); - /* * This is the initialization framework routine that weaves together * calls to RTEMS and the BSP in the proper sequence to initialize diff --git a/c/src/lib/libbsp/shared/bsplibc.c b/c/src/lib/libbsp/shared/bsplibc.c deleted file mode 100644 index 252a4cd74a..0000000000 --- a/c/src/lib/libbsp/shared/bsplibc.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * COPYRIGHT (c) 1989-2008. - * On-Line Applications Research Corporation (OAR). - */ - -#include -#include - -#include - -void bsp_libc_init(void) -{ - /* - * Init the RTEMS libio facility to provide UNIX-like system - * calls for use by newlib (ie: provide open, close, etc) - * Uses malloc() to get area for the iops, so must be after malloc init - */ - (*rtems_libio_init_helper)(); -} diff --git a/c/src/lib/libbsp/shared/bsppost.c b/c/src/lib/libbsp/shared/bsppost.c deleted file mode 100644 index bd903e4584..0000000000 --- a/c/src/lib/libbsp/shared/bsppost.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This is a shared BSP post driver hook designed to open - * /dev/console for stdin, stdout, and stderr if it exists. - * Newlib will automatically associate the file descriptors - * with the first three files opened. - * - * 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 - -#include - -void bsp_postdriver_hook(void) -{ - (*rtems_libio_post_driver_helper)(); -} diff --git a/c/src/lib/libbsp/shared/include/bootcard.h b/c/src/lib/libbsp/shared/include/bootcard.h index 385c0aeb08..aaac42e8e2 100644 --- a/c/src/lib/libbsp/shared/include/bootcard.h +++ b/c/src/lib/libbsp/shared/include/bootcard.h @@ -55,8 +55,6 @@ void bsp_start(void); void bsp_predriver_hook(void); -void bsp_postdriver_hook(void); - void bsp_reset(void); /** @@ -171,8 +169,6 @@ static inline void bsp_work_area_initialize_with_table( void bsp_work_area_initialize(void); -void bsp_libc_init(void); - /** * @brief Standard start routine for secondary processors. * diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index 6e0311c27c..3c15887d46 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -29,10 +29,8 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c libbsp_a_SOURCES += startup/bsppredriver.c libbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bspstart.c libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 59ba5b8de7..5ac0e04c2d 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -30,8 +30,6 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += startup/bsppredriver.c libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index e67092c538..f2f690e707 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -33,8 +33,8 @@ libbsp_a_SOURCES = # startup libbsp_a_SOURCES += startup/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bootcard.c startup/bspstart.c \ +libbsp_a_SOURCES += \ + ../../shared/bootcard.c startup/bspstart.c \ startup/bsppredriver.c \ ../../sparc/shared/startup/bspgetworkarea.c ../../shared/sbrk.c \ startup/setvec.c \ diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index 0e9a3afae9..9f3c2e8352 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -39,9 +39,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += ../shared/startup/linkcmds startup_SOURCES = startup/bspclean.c startup/m5op_sparc.S \ - ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ - ../../shared/bsppost.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/bspgetworkarea.c \ ../../shared/bspstart.c \ diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 99bd1f7571..709252dc78 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -84,9 +84,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += ../shared/startup/linkcmds -startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c \ ../../shared/bspstart.c \ - ../../shared/bsppost.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/bspgetworkarea.c \ ../../shared/bsppredriverhook.c \ diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am index b455a395d5..a54a787ddb 100644 --- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am +++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am @@ -30,10 +30,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds libbsp_a_SOURCES = ../../shared/bspclean.c -libbsp_a_SOURCES += ../../shared/bsplibc.c libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += ../../shared/bspgetworkarea.c -libbsp_a_SOURCES += ../../shared/bsppost.c libbsp_a_SOURCES += ../../shared/bspstart.c libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/sbrk.c diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index d223b1d78e..0b2607f2b9 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -41,7 +41,6 @@ ASSOCIATION_C_FILES = src/assoclocalbyname.c \ BASE_FS_C_FILES = src/base_fs.c src/mount.c src/unmount.c src/libio.c \ src/mount-mgr.c src/mount-mktgt.c src/libio_init.c \ src/privateenv.c \ - src/libio_helper_null.c \ src/libio_exit.c \ src/open_dev_console.c src/__usrenv.c src/rtems_mkdir.c BASE_FS_C_FILES += src/uenvgetgroups.c diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index 824fa2833d..a87031ca91 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -1337,13 +1337,6 @@ typedef struct { /** @} */ -/** - * @brief RTEMS LibIO Initialization - * - * Called by BSP startup code to initialize the libio subsystem. - */ -void rtems_libio_init(void); - /** * @name External I/O Handlers */ @@ -1481,14 +1474,6 @@ static inline rtems_device_minor_number rtems_filesystem_dev_minor_t( */ void rtems_filesystem_initialize( void ); -typedef void (*rtems_libio_helper)(void); - -extern const rtems_libio_helper rtems_libio_init_helper; - -extern const rtems_libio_helper rtems_libio_post_driver_helper; - -void rtems_libio_helper_null(void); - void rtems_libio_post_driver(void); void rtems_libio_exit(void); diff --git a/cpukit/libcsupport/src/libio_helper_null.c b/cpukit/libcsupport/src/libio_helper_null.c deleted file mode 100644 index 947155fc85..0000000000 --- a/cpukit/libcsupport/src/libio_helper_null.c +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file - * - * @ingroup LibIO - */ - -/* - * Copyright (c) 2013 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Obere Lagerstr. 30 - * 82178 Puchheim - * Germany - * - * - * 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. - */ - -#if HAVE_CONFIG_H - #include "config.h" -#endif - -#include - -void rtems_libio_helper_null(void) -{ - /* Do nothing */ -} diff --git a/cpukit/libcsupport/src/libio_init.c b/cpukit/libcsupport/src/libio_init.c index 88f5d8cef3..3ac2e3b67d 100644 --- a/cpukit/libcsupport/src/libio_init.c +++ b/cpukit/libcsupport/src/libio_init.c @@ -32,6 +32,7 @@ #include /* calloc() */ #include /* libio.h not pulled in by rtems */ +#include /* * File descriptor Table Information @@ -40,7 +41,7 @@ rtems_id rtems_libio_semaphore; rtems_libio_t *rtems_libio_iop_freelist; -void rtems_libio_init( void ) +static void rtems_libio_init( void ) { rtems_status_code rc; uint32_t i; @@ -81,3 +82,15 @@ void rtems_libio_init( void ) if ( rc != RTEMS_SUCCESSFUL ) rtems_fatal_error_occurred( rc ); } + +RTEMS_SYSINIT_ITEM( + rtems_libio_init, + RTEMS_SYSINIT_LIBIO, + RTEMS_SYSINIT_ORDER_MIDDLE +); + +RTEMS_SYSINIT_ITEM( + rtems_libio_post_driver, + RTEMS_SYSINIT_STD_FILE_DESCRIPTORS, + RTEMS_SYSINIT_ORDER_MIDDLE +); diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 67616741b6..aa705e4c09 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -115,20 +115,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #include #ifdef CONFIGURE_INIT -const rtems_libio_helper rtems_libio_init_helper = - #ifdef CONFIGURE_APPLICATION_DISABLE_FILESYSTEM - rtems_libio_helper_null; - #else - rtems_libio_init; - #endif - -const rtems_libio_helper rtems_libio_post_driver_helper = - #ifdef CONFIGURE_APPLICATION_DISABLE_FILESYSTEM - rtems_libio_helper_null; - #else - rtems_libio_post_driver; - #endif - #ifndef CONFIGURE_APPLICATION_DISABLE_FILESYSTEM RTEMS_SYSINIT_ITEM( rtems_filesystem_initialize, diff --git a/cpukit/score/include/rtems/sysinit.h b/cpukit/score/include/rtems/sysinit.h index 033ba871ed..178afd8ca3 100644 --- a/cpukit/score/include/rtems/sysinit.h +++ b/cpukit/score/include/rtems/sysinit.h @@ -56,12 +56,12 @@ extern "C" { #define RTEMS_SYSINIT_POSIX_CLEANUP 00036a #define RTEMS_SYSINIT_POSIX_KEYS 00036b #define RTEMS_SYSINIT_IDLE_THREADS 000380 -#define RTEMS_SYSINIT_BSP_LIBC 000400 +#define RTEMS_SYSINIT_LIBIO 000400 #define RTEMS_SYSINIT_ROOT_FILESYSTEM 000401 #define RTEMS_SYSINIT_BEFORE_DRIVERS 000500 #define RTEMS_SYSINIT_BSP_PRE_DRIVERS 000600 #define RTEMS_SYSINIT_DEVICE_DRIVERS 000700 -#define RTEMS_SYSINIT_BSP_POST_DRIVERS 000800 +#define RTEMS_SYSINIT_STD_FILE_DESCRIPTORS 000800 /* * The value of each order define must consist of exactly two hexadecimal diff --git a/testsuites/fstests/fsnofs01/init.c b/testsuites/fstests/fsnofs01/init.c index f4759491ba..298ba8d237 100644 --- a/testsuites/fstests/fsnofs01/init.c +++ b/testsuites/fstests/fsnofs01/init.c @@ -74,7 +74,9 @@ static void test_initial_values(void) rtems_test_assert(null_mt->mt_fs_root == null_loc); rtems_test_assert(!null_mt->mounted); rtems_test_assert(!null_mt->writeable); - rtems_test_assert(null_loc->reference_count == 4); + rtems_test_assert(null_loc->reference_count == 6); + rtems_test_assert(null_loc->deferred_released_next == NULL); + rtems_test_assert(null_loc->deferred_released_count == 2); } static void test_location_obtain(void) @@ -495,8 +497,6 @@ static void Init(rtems_task_argument arg) { rtems_test_begink(); - rtems_libio_init(); - test_initial_values(); test_location_obtain(); test_null_location_obtain(); diff --git a/testsuites/sptests/spsysinit01/init.c b/testsuites/sptests/spsysinit01/init.c index 645156e3d0..18727e102e 100644 --- a/testsuites/sptests/spsysinit01/init.c +++ b/testsuites/sptests/spsysinit01/init.c @@ -16,12 +16,14 @@ #include "config.h" #endif +#include #include #include #include #include #include +#include #include #include @@ -122,8 +124,8 @@ typedef enum { POSIX_KEYS_POST, IDLE_THREADS_PRE, IDLE_THREADS_POST, - BSP_LIBC_PRE, - BSP_LIBC_POST, + LIBIO_PRE, + LIBIO_POST, ROOT_FILESYSTEM_PRE, ROOT_FILESYSTEM_POST, BEFORE_DRIVERS_PRE, @@ -132,8 +134,8 @@ typedef enum { BSP_PRE_DRIVERS_POST, DEVICE_DRIVERS_PRE, DEVICE_DRIVERS_POST, - BSP_POST_DRIVERS_PRE, - BSP_POST_DRIVERS_POST, + STD_FILE_DESCRIPTORS_PRE, + STD_FILE_DESCRIPTORS_POST, INIT_TASK, DONE } init_step; @@ -546,16 +548,16 @@ LAST(RTEMS_SYSINIT_IDLE_THREADS) next_step(IDLE_THREADS_POST); } -FIRST(RTEMS_SYSINIT_BSP_LIBC) +FIRST(RTEMS_SYSINIT_LIBIO) { assert(rtems_libio_semaphore == 0); - next_step(BSP_LIBC_PRE); + next_step(LIBIO_PRE); } -LAST(RTEMS_SYSINIT_BSP_LIBC) +LAST(RTEMS_SYSINIT_LIBIO) { assert(rtems_libio_semaphore != 0); - next_step(BSP_LIBC_POST); + next_step(LIBIO_POST); } FIRST(RTEMS_SYSINIT_ROOT_FILESYSTEM) @@ -615,16 +617,24 @@ LAST(RTEMS_SYSINIT_DEVICE_DRIVERS) next_step(DEVICE_DRIVERS_POST); } -FIRST(RTEMS_SYSINIT_BSP_POST_DRIVERS) +FIRST(RTEMS_SYSINIT_STD_FILE_DESCRIPTORS) { - assert(rtems_libio_iop_freelist != NULL); - next_step(BSP_POST_DRIVERS_PRE); + struct stat st; + int rv; + + rv = fstat(0, &st); + assert(rv == -1); + next_step(STD_FILE_DESCRIPTORS_PRE); } -LAST(RTEMS_SYSINIT_BSP_POST_DRIVERS) +LAST(RTEMS_SYSINIT_STD_FILE_DESCRIPTORS) { - assert(rtems_libio_iop_freelist == NULL); - next_step(BSP_POST_DRIVERS_POST); + struct stat st; + int rv; + + rv = fstat(0, &st); + assert(rv == 0); + next_step(STD_FILE_DESCRIPTORS_POST); } static void Init(rtems_task_argument arg) -- cgit v1.2.3