This commit was manufactured by cvs2svn to create tag 'rtems-4-9-0'.

Sprout from rtems-4-9-branch 2008-09-24 17:16:13 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2008-09-24	Joel Sherrill <joel.sherrill@OARcorp.com>'
Cherrypick from rtems-4-9-branch 2009-09-15 05:32:51 UTC cvs2git <rtems-devel@rtems.org> 'This commit was manufactured by cvs2svn to create branch 'rtems-4-9-branch'.':
    c/src/lib/libbsp/arm/smdk2410/include/.cvsignore
    c/src/lib/libbsp/m68k/genmcf548x/include/.cvsignore
    c/src/lib/libbsp/m68k/mcf52235/include/.cvsignore
    c/src/lib/libbsp/m68k/mcf5329/include/.cvsignore
    c/src/lib/libbsp/powerpc/mvme3100/include/.cvsignore
    c/src/lib/libbsp/powerpc/virtex/include/.cvsignore

ChangeLog

@@ -1,184 +1,17 @@
-2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+2008-09-24	Joel Sherrill <joel.sherrill@OARcorp.com>
 
-	* configure.ac: Require autoconf-2.68, automake-1.11.1.
-
-2010-12-16	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	* SUPPORT: Update address.
-
-2010-09-27	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* README.configure: Cleanup.
-
-2010-06-23	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: autoconf >= 2.65, automake >= 1.11.
-
-2010-06-14	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	PR 1553/filesystem
-	Coverity Id 37
-	* libblock/src/flashdisk.c: Fix two paths which should have returned an
-	error but did not have the return statement.
-
-2010-05-11	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4: Change quoting to work-round
-	http://www.freebsd.org/cgi/query-pr.cgi?pr=146378.
-
-2009-10-23	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/check-custom-bsp.m4: Be less verbose.
-
-2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4: Fix quoting bug.
-
-2009-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/check-custom-bsp.m4:
-	Remove "${srcdir}/${RTEMS_TOPdir}/make/custom/$1".
-	* aclocal/check-bsps.m4: Remove "blacklist".
-
-2009-10-16	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4: Remove bare BSP (Abandoned).
-
-2009-10-16	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* README.configure: added COBRA5475 reference
-
-2009-10-16	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4: Pickup bsps from
-	c/src/lib/libbsp/<cpu>/<bsp_family>/make/custom*.cfg.
-
-2009-10-15	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/check-bsps.m4: Pickup bsps from
-	c/src/lib/libbsp/<cpu>/<bsp_family>/make/custom*.cfg.
-
-2009-10-15	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/check-custom-bsp.m4: Let _RTEMS_CHECK_CUSTOM_BSP look for
-	*.cfg into c/src/lib/libbsp/<cpu>/<bsp_family>/make/custom.
-
-2009-10-14	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* aclocal/canonical-target-name.m4, aclocal/enable-posix.m4:
-	Remove posix/unix simulator.
-
-2009-10-04	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Renamed LPC24XX BSP
-	variants.
-
-2009-10-01	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/bsp-alias.m4: Add BSP for GDB ARM simulator so we can easily
-	experiment with and debug different ARM architectural variations.
-
-2009-09-14	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* aclocal/check-bsps.m4: Add csb337 bsp family.
-
-2009-07-23	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* aclocal/enable-itron.m4: Default to not building itron.
-
-2009-05-28	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* aclocal/bsp-alias.m4: Add csb637 as variant of csb337.
-
-2009-02-27	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Added defines for
-	LPC2478 BSP variants.
-
-2009-02-19	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/bsp-alias.m4: Add simsh2e.
-
-2009-02-06	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* Makefile.maint: rtems_api=4.10.
-	* Makefile.maint: Dump stuff hanging around for much too long.
-
-2009-02-06	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/canonical-target-name.m4:
-	Remove comment referring to HPUX9.
-
-2009-02-05	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Remove pck6 BSP.
-
-2008-12-31	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* config-ml.in: Comment out arm/thumb exception (Add arm/thumb
-	multilib).
-
-2008-12-30	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/check-bsps.m4: remove stray ")" from rtl22xx_t alias.
-
-2008-12-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/canonical-target-name.m4: Remove tic4x.
-
-2008-12-04	Jukka Pietarinen <jukka.pietarinen@mrf.fi>
-
-	* README.configure: Add Lattice Mico32 support.
-
-2008-10-14	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Add h8sxsim as variant
-	of h8sim.
-
-2008-10-02	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* README.configure: Add new M32R port. It is just a beginning but the
-	BSP is functional enough to initialize and shutdown RTEMS.
-
-2008-10-02	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* README.configure, aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Add
-	M32C port and m32csim BSP.
-
-2008-10-01	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* VERSION: Bump version to 4.9.99.0
-
-2008-10-01	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	PR 1324/bsps
-        * aclocal/check-bsps.m4: Revert Joel's icecube patch.
-
-2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* MAINTAINERS: Remove myself from avr.
-
-2008-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* README.configure, aclocal/bsp-alias.m4, aclocal/check-bsps.m4:
-	Recognize the the GDB SuperH simulator is just an architectural
-	simulator and does not include devices. Rename existing simulator BSP
-	configurations to simsh1 and simsh2 and add simsh4.
+	* Makefile.maint: Bump rtems_api to 4.9.
 
 2008-09-24	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	PR 1324/bsps
 	* aclocal/check-bsps.m4: Add missing icecube.
 
-2008-09-22	Ralf Corsépius <ralf.corsepius@rtems.org>
+2008-09-10	Joel Sherrill <joel.sherrill@OARcorp.com>
 
-	* aclocal/version.m4: Bump RTEMS_API to 4.10.
-	Bump _RTEMS_VERSION to 4.9.99.0.
-
-2008-09-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Added defines for
-	LPC2478 BSP.
+	* MAINTAINERS, README.configure, aclocal/bsp-alias.m4,
+	aclocal/canonical-target-name.m4, aclocal/check-bsps.m4: Remove TI
+	C4x and NIOS2 ports from 4.9 branch.
 
 2008-09-09	Joel Sherrill <joel.sherrill@oarcorp.com>
 

MAINTAINERS

@@ -34,8 +34,7 @@ Networking		NAME-TBD		EMAIL-TBD
 			CPU Port Maintainers	(CPU alphabetical order)
 
 arm			Jay Monkman		jtm@lopingdog.com
-avr			NAME-TBD		EMAIL-TBD
-c4x			Joel Sherrill		joel.sherrill@OARcorp.com
+avr			Ralf Corsepius		ralf.corsepius@rtems.org
 h8300			NAME-TBD		EMAIL-TBD
 i386			NAME-TBD		EMAIL-TBD
 m68k			NAME-TBD		EMAIL-TBD
@@ -45,6 +44,7 @@ or32			NAME-TBD		EMAIL-TBD
 powerpc			NAME-TBD		EMAIL-TBD
 sh			NAME-TBD		EMAIL-TBD
 sparc			NAME-TBD		EMAIL-TBD
+unix			NAME-TBD		EMAIL-TBD
 
 		    BSP Maintainers		(CPU/BSP alphabetical order)
 

Makefile.maint

@@ -31,7 +31,7 @@ TAG_SUFFIX = -test1
 
 rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};')
 rtems_tag     := $(shell echo "rtems-$(rtems_version)" | tr . -)
-rtems_api     := 4.10
+rtems_api     := 4.9
 PATH          := /opt/rtems-$(rtems_api)/bin:$(PATH)
 
 # -----------------
@@ -131,23 +131,6 @@ new-revision:
 	  $(VERSION_FILES); \
 	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
 
-# -----------------
-# Create a new branch
-# increments the 2nd digit of the version number
-# set the 3rd digit of the version number to 99
-# set the 4rd digit of the version number to 0
-# Example: 4.6.34.4 -> 4.7.99.0
-new-branch:
-	v=$$(echo $(rtems_version) | sed 's,^\([0-9]\+\).*,\1,'); \
-	r=$$(echo $(rtems_version) | sed 's,^[0-9]\+\.\([0-9]\+\).*,\1,'); \
-	r=$$(($$r + 1)); version="$$v.$$r.99.0"; \
-	api="$$v.$$(($$r + 1))"; \
-	echo "New branch release: $$version"; \
-	sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
-	  -e "s|\[RTEMS_API\],\[.*\]|\[RTEMS_API\],\[$$api\]|" \
-	  $(VERSION_FILES); \
-	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
-
 VERSION_FILES += aclocal/version.m4
 VERSION_FILES += cpukit/aclocal/version.m4
 VERSION_FILES += c/src/aclocal/version.m4
@@ -159,4 +142,4 @@ commit:
 	$(CVS_RUN) commit -m "Upgrade to $(rtems_version)" \
 	  $(VERSION_FILES) VERSION
 
-.PHONY: commit new-minor new-revision new-branch tag tarball
+.PHONY: commit new-minor new-revision tag tarball

README.configure

@@ -11,20 +11,24 @@ tools in the Cygnus one-tree structure. Using autoconf also means
 that RTEMS now can be built in a separate build directory.
 
 To re-generate auto*tool generated files (configure, Makefile.in etc),
-autoconf-2.68 and automake-1.11.1 are required.
+autoconf-2.59 and automake-1.8 are required.
 
 2. Installation
 ===============
 
+2.1 Standalone build
+
 To configure RTEMS for a specific target, run configure in the build
 directory. In addition to the standard configure options, the following
 RTEMS-specific option are supported:
 
       --disable-rtems-inlines
       --disable-posix
-      --enable-itron
+      --disable-itron
       --disable-networking
       --enable-cxx
+      --enable-bare-cpu-model=<MODEL>
+      --enable-bare-cpu-cflags=<FLAGS>
       --enable-multiprocessing
       --enable-rtemsbsp="bsp1 bsp2 ..."
       --enable-tests
@@ -84,22 +88,26 @@ within a target architecture.  Remember that the target specifies the
 CPU family while the BSP specifies the precise board you will be using. 
 The following targets are supported:
 
-      arm-rtems4.10
-      avr-rtems4.10
-      bfin-rtems4.10
-      h8300-rtems4.10
-      i386-rtems4.10
-      lm32-rtems4.10
-      m32c-rtems4.10
-      m32r-rtems4.10
-      m68k-rtems4.10
-      mips-rtems4.10
-      no_cpu-rtems4.10
-      powerpc-rtems4.10
-      sh-rtems4.10
-      sparc-rtems4.10
+      (none)	will build the host-based version on Linux, Solaris and HPUX.
 
-The cross-compiler is set to $(target)-gcc by default.
+      arm-rtems4.9
+      h8300-rtems4.9
+      i386-rtems4.9
+      m68k-rtems4.9
+      mips-rtems4.9
+      no_cpu-rtems4.9
+      powerpc-rtems4.9
+      sh-rtems4.9
+      sparc-rtems4.9
+      bare                    see notes
+
+The cross-compiler is set to $(target)-gcc by default. This can be
+overridden by:
+
++ using the --program-prefix option to configure to specify the
+  string which will prepended to the tool names.  Be sure to include
+  a trailing "-".  For example, to use a m68k-coff toolset, use the
+  --program-prefix=m68k-coff- option.
 
 To build, run make in the build directory. To specify which bsps to build,
 add the RTEMS_BSP="bsp1 bsp2 .." to the make command.  Specifying multiple
@@ -109,7 +117,7 @@ Installation is done under $(prefix)/rtems.
 
 As an example, to build and install the mvme136 and mvme162 bsps for m68k do:
 
-      (path_to_rtems_src)/configure --target=m68k-rtems4.10
+      (path_to_rtems_src)/configure --target=m68k-rtems
 
       make RTEMS_BSP="mvme136 mvme162"
       
@@ -121,6 +129,19 @@ test suite.
 
 Documentation is built separately from the source code.
 
+2.2 Target Dependent Notes
+
+bare:
+
+1.  See the README in the bare bsp source directory. This should
+    contain all info you need.
+2.  The bare bsp source contains a script to show how to build it.
+3.  The configure flags must be used to get the bare bsp to work.
+    The --enable-bare-cpu-model and --enable-bare-cpu-cflags are the
+    only pieces of information. The module is usually a gcc module
+    such as m68302 or mcpu32. The flags are passed directly to gcc.
+    Use "" if more than one option is specified.
+
 3. To use the installed RTEMS library
 =====================================
 
@@ -142,10 +163,12 @@ following:
 
 The following bsps are supported:
 
+host-based	: posix (on Linux, FreeBSD, Cygwin, Solaris, and HPUX)
+
 arm             : csb336 csb337 edb7312 gba gp32 nds rtl22x rtl22xx_t
                   smdk2410
 
-avr:            : avrtest
+avr:            : none
 
 bfin            : eZKit533 bf537Stamp
 
@@ -156,16 +179,10 @@ i386		: i386ex pc386 pc386dx pc486 pc586 pc686 pck6 ts_386ex
 		      variety of PC configurations including PC-104
 		      based solutions.
 
-lm32:		: lm32_evr
-
-m32c		: m32csim
-
-m32r		: m32rsim
-
 m68k		: av5282 csb360 gen68302 gen68360 gen68360_040 
 		genmcf548x idp mcf5206elite mcf52235 mcf5235 mcf5239
 		m5484FireEngine mrm332 mvme136 mvme147s mvme162 mvme162lx
-		mvme167 ods68302 pgh360 sim68000 simcpu32 uC5282 COBRA5475 
+		mvme167 ods68302 pgh360 sim68000 simcpu32 uC5282 
 
 no_cpu          : no_bsp  (porting example)
 
@@ -187,10 +204,16 @@ powerpc		: brs5l ep1a gen5200 gen83xx haleakala hsc_cm01 icecube
 		  designed to handle a variety of boards based on the same
 		  family of system on chips CPUs
 
-sh              : gensh1 gensh2 gensh4 simsh1 simsh2 simsh4
+sh              : gensh1 gensh2 gensh4 shsim simsh4 simsh7045
 
 sparc 		: erc32 sis leon2 leon3
 
+any             : bare
+
+The following ports were considered obsoleted after the 4.6 releases
+and were removed: a29k, hppa, i960, mips64orion, and or32.
+
+
 5. Makefile structure
 =====================
 
@@ -216,15 +239,12 @@ Please refer to the BSP and Device Driver Guide.
 7. Tested configurations
 ========================
 
-All gnu-based bsps have been built on Linux. 
+All BSPs have been built on GNU/Linux if the target architecture
+is supported in the FSF tools distribution. 
 
 8. Prerequisites
 ================
 
-Gawk version 2 or higher.
-GNU make version 3.72 or higher.
+GNU make
 Bash.
-gcc version > 2.8
-
-NOTE: These prerequisites are probably out of date but autoconf should detect
-      any problems.
+binutils, gcc, newlib and gdb versions matching those in the RPMs.

SUPPORT

@@ -8,12 +8,12 @@ includes porting RTEMS to new processors and the development of custom board
 support packages and device drivers.   In addition, OAR is available
 to assist in the development of your real-time embedded application.
 
-For more information, email Joel Sherrill joel.sherrill@OARcorp.com 
+For more information, email Mark Johannes at mark.johannes@OARcorp.com 
 or contact OAR at:
 
 On-Line Applications Research Corporation
-7047 Old Madison Pike Suite 320
-Huntsville AL 35806
+4910-L Corporate Drive
+Huntsville AL 35805
 Voice: (205) 722-9985
 Fax:   (205 722-0985
 

VERSION

@@ -4,4 +4,4 @@
 #  $Id$
 #
 
-RTEMS Version 4.10.2
+RTEMS Version 4.9.0

aclocal/bsp-alias.m4

@@ -6,13 +6,42 @@ dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
 AC_DEFUN([_RTEMS_BSP_ALIAS],
 [# account for "aliased" bsps which share source code
-      for bsp_cfgs in `ls "$srcdir"/"$RTEMS_TOPdir"/c/src/lib/libbsp/"$RTEMS_CPU"/*/"make/custom/$1.cfg" 2>/dev/null`; do
-        $2=`echo "$bsp_cfgs" | sed \
-          -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
-          -e "s,/make/custom/.*\.cfg$,,"`
-        break
-      done
-])
+  case $1 in
+    bare*)        $2=bare             ;; # EXP: bare-aliases
+
+    gen68360_040) $2=gen68360         ;; # m68k - 68360 in companion mode
+    pghplus)      $2=tqm8xx           ;; # powerpc - mpc8xx custom board
+    tqm8xx_stk8xx) $2=tqm8xx          ;; # powerpc - tqm8xx on starter kit
+    pgh360)       $2=gen68360         ;; # m68k - 68360 custom board
+    m5484FireEngine) $2=genmcf548x    ;; # m68k - mcf548x eva board
+    mbx8*)        $2=mbx8xx           ;; # MBX821/MBX860 board
+    mcp750)       $2=motorola_powerpc ;; # Motorola PPC board variant
+    mtx603e)      $2=motorola_powerpc ;; # Motorola PPC board variant
+    mvme162lx)    $2=mvme162          ;; # m68k - mvme162 board variant
+    mvme2100)     $2=motorola_powerpc ;; # Motorola PPC board variant
+    mvme2307)     $2=motorola_powerpc ;; # Motorola PPC board variant
+    p4600)        $2=p4000            ;; # mips - p4000 board w/IDT 4600
+    p4650)        $2=p4000            ;; # mips - p4000 board w/IDT 4650
+    pc386dx)      $2=pc386            ;; # i386 - PC w/o FPU
+    pc486)        $2=pc386            ;; # i386 - PC with i486DX
+    pc586)        $2=pc386            ;; # i386 - PC with Pentium
+    pc686)        $2=pc386            ;; # i386 - PC with PentiumPro
+    pck6)         $2=pc386            ;; # i386 - PC with K6
+    brs5l*)       $2=gen5200          ;; # MPC5200 based board
+    pm520*)       $2=gen5200          ;; # MPC5200 based board
+    icecube)      $2=gen5200          ;; # MPC5200 based board - LITE5200B
+    mpc55??evb)   $2=mpc55xxevb       ;; # MPC5566EVB based board
+    mpc8349eamds) $2=gen83xx          ;; # MPC8349 based board
+    hsc_cm01)     $2=gen83xx          ;; # MPC8349 based board
+    mpc8313erdb)  $2=gen83xx          ;; # MPC83XX based board
+    rtl22xx_t)    $2=rtl22xx          ;; # rtl22xx bsp in thumb mode
+    simcpu32)     $2=sim68000         ;; # BSVC CPU32 variant
+    simsh7032)    $2=shsim            ;; # SH7032 simulator
+    simsh7045)    $2=shsim            ;; # SH7045 simulator
+    sis)          $2=erc32            ;; # erc32 SIS simulator
+    *)            $2=$1;;
+  esac]
+)
 
 dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY

aclocal/canonical-target-name.m4

@@ -13,9 +13,22 @@ AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
 AC_CANONICAL_TARGET
 AC_MSG_CHECKING(rtems target cpu)
 case "${target}" in
+  # hpux unix port should go here
+  i[[34567]]86-*linux*)		# unix "simulator" port
+	RTEMS_CPU=unix
+	;;
+  i[[34567]]86-*freebsd*) 	# unix "simulator" port
+	RTEMS_CPU=unix
+	;;
+  i[[34567]]86-pc-cygwin*) 	# Cygwin is just enough unix like :)
+	RTEMS_CPU=unix
+	;;
   no_cpu-*rtems*)
         RTEMS_CPU=no_cpu
 	;;
+  sparc-sun-solaris*)           # unix "simulator" port
+	RTEMS_CPU=unix
+	;;
   *) 
 	RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
 	;;

aclocal/check-bsps.m4

@@ -12,14 +12,32 @@ AC_MSG_CHECKING([for available BSPs])
   $1=
   for bsp_spec in `ls "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU"/*/bsp_specs 2>/dev/null`; do
     bsp_family=`echo "$bsp_spec" | sed \
-      -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
-      -e "s,/bsp_specs$,,"`
-    for bsp_cfgs in `ls "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$bsp_family/make/custom/"*.cfg 2>/dev/null`; do
-      bsp_cfg=`echo "$bsp_cfgs" | sed \
-        -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$bsp_family/make/custom/,," \
-        -e "s,\.cfg$,,"`
-      $1="[$]$1 $bsp_cfg"
-    done
+        -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
+        -e "s,/bsp_specs$,,"`
+    case $bsp_family in
+        # Now account for BSPs with build variants
+          gen68360)          bsps="gen68360 gen68360_040 pgh360";;
+          tqm8xx)            bsps="pghplus tqm8xx_stk8xx";;
+          genmcf548x)        bsps="m5484FireEngine";;
+          p4000)             bsps="p4600 p4650";;
+          mvme162)           bsps="mvme162 mvme162lx";;
+          mbx8xx)            bsps="mbx821_001 mbx860_001b"
+                             bsps="$bsps mbx821_002 mbx821_002b"
+                             bsps="$bsps mbx860_002"
+                             bsps="$bsps mbx860_005b"
+                             ;;
+          gen5200)           bsps="pm520_cr825 pm520_ze30 brs5l";;
+          mpc55xxevb)        bsps="mpc5566evb";;
+          gen83xx)           bsps="mpc8349eamds hsc_cm01 mpc8313erdb icecube";;
+	  motorola_powerpc)  bsps="mvme2307 mcp750 mtx603e mvme2100";;
+	  pc386)             bsps="pc386 pc386dx pc486 pc586 pc686 pck6";;
+          erc32)             bsps="erc32 sis";;
+          rtl22xx)           bsps="rtl22xx rtl22xx_t)";;
+	  sim68000)          bsps="sim68000 simcpu32";;
+	  shsim)             bsps="simsh7032 simsh7045";;
+	  *) 		     bsps="$bsp_family";;
+    esac;
+    $1="[$]$1 $bsps"
   done
   AS_IF([test -z "[$]$1"],
     [AC_MSG_RESULT([none])],

aclocal/check-custom-bsp.m4

@@ -4,16 +4,21 @@ AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
   $2=
-  for i in \
-    `ls "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1 2>/dev/null`;
+  AC_MSG_CHECKING([for $1])
+  for i in "${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}"/*/cfg/"$1" \
+    "${srcdir}/${RTEMS_TOPdir}/make/custom/$1";
   do
     AS_IF([test -r $i],[
       $2="$i"
       break;
     ])
   done
+  AS_IF([test -n "[$]$2"],
+    [AC_MSG_RESULT([[$]$2])],
+    [AC_MSG_RESULT([no])])
 ])
 
 AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
-  _RTEMS_CHECK_CUSTOM_BSP([[$]$1],[BSP_FOUND])
+  AC_REQUIRE([RTEMS_TOP])
+  _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
 ])

aclocal/enable-itron.m4

@@ -2,11 +2,13 @@ dnl $Id$
 
 AC_DEFUN([RTEMS_ENABLE_ITRON],
 [
+## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
+
 AC_ARG_ENABLE(itron,
-AS_HELP_STRING(--enable-itron,enable itron interface),
+[AS_HELP_STRING([--enable-itron],[enable itron interface])],
 [case "${enableval}" in 
   yes) RTEMS_HAS_ITRON_API=yes ;;
   no) RTEMS_HAS_ITRON_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-itron option) ;;
-esac],[RTEMS_HAS_ITRON_API=no]) 
+esac],[RTEMS_HAS_ITRON_API=yes]) 
 ])

aclocal/enable-posix.m4

@@ -13,9 +13,19 @@ AC_ARG_ENABLE(posix,
 esac],[RTEMS_HAS_POSIX_API=yes]) 
 
 case "${host}" in
+  # hpux unix port should go here
+  i[[34567]]86-pc-linux*)         # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
+  i[[34567]]86-*freebsd*) # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
   no_cpu-*rtems*)
 	RTEMS_HAS_POSIX_API=no
 	;;
+  sparc-sun-solaris*)             # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
   *) 
 	;;
 esac

aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.10.2]))
+m4_define([_RTEMS_VERSION],[4.9.0]))
 
-m4_define([RTEMS_API],[4.10])
+m4_define([RTEMS_API],[4.9])

bspkit/README

@@ -0,0 +1,6 @@
+WARNING
+=======
+
+All files in here are considered to be unstable and experimental.
+
+They are subject to change at any time without prior notice.

bspkit/avr/bare/ChangeLog

@@ -0,0 +1,3 @@
+2004-10-22	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* cfg/bare-avr3.cfg, cfg/bare-avr5.cfg: New.

bspkit/avr/bare/cfg/bare-avr3.cfg

@@ -0,0 +1,39 @@
+# 
+#  Config file for the "bare" BSP
+#
+#  $Id$
+#
+
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=bare
+
+RTEMS_CPU_MODEL=avr3
+
+CPU_CFLAGS=-mmcu=avr3
+
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V=-Os -fomit-frame-pointer
+
+# this target has no start file
+START_BASE=
+
+# The following are definitions of make-exe which will work using ld as
+# is currently required.  It is expected that as of gcc 2.8, the end user
+# will be able to override parts of the compilers specs and link using gcc.
+
+define make-exe
+	@echo "*** Cannot do a link with the bare bsp. ***"
+        @echo "#!/bin/sh" > $(basename $@).exe
+        @echo "echo \"Cannot do a link with the bare bsp.\"" >> $(basename $@).exe
+endef
+
+define make-cxx-exe
+	@echo "*** Cannot do a link with the bare bsp. ***"
+        @echo "#!/bin/sh" > $(basename $@).exe
+        @echo "echo \"Cannot do a link with the bare bsp.\"" >> $(basename $@).exe
+endef
+
+# Miscellaneous additions go here

bspkit/avr/bare/cfg/bare-avr5.cfg

@@ -0,0 +1,39 @@
+# 
+#  Config file for the "bare" BSP
+#
+#  $Id$
+#
+
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=bare
+
+RTEMS_CPU_MODEL=avr5
+
+CPU_CFLAGS=-mmcu=avr5
+
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
+
+# this target has no start file
+START_BASE=
+
+# The following are definitions of make-exe which will work using ld as
+# is currently required.  It is expected that as of gcc 2.8, the end user
+# will be able to override parts of the compilers specs and link using gcc.
+
+define make-exe
+	@echo "*** Cannot do a link with the bare bsp. ***"
+        @echo "#!/bin/sh" > $(basename $@).exe
+        @echo "echo \"Cannot do a link with the bare bsp.\"" >> $(basename $@).exe
+endef
+
+define make-cxx-exe
+	@echo "*** Cannot do a link with the bare bsp. ***"
+        @echo "#!/bin/sh" > $(basename $@).exe
+        @echo "echo \"Cannot do a link with the bare bsp.\"" >> $(basename $@).exe
+endef
+
+# Miscellaneous additions go here

c/ACKNOWLEDGEMENTS

@@ -153,7 +153,7 @@ The following persons/organizations have made contributions:
   interrupt management API that reduces interrupt latency while making
   it easier to support external interrupt controllers.
 
-+ Joel Sherrill <joel@OARcorp.com> for the BSPs that work with 
++ Joel Sherrill <joel.sherrill@OARcorp.com> for the BSPs that work with 
   numerous simulators including psim, c4xsim, h8sim, armulator,
   sim68000, and simcpu32.  Most of these BSPs work with instruction
   set simulators in gdb.

c/ChangeLog

@@ -1,21 +1,7 @@
-2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+2008-09-10	Joel Sherrill <joel.sherrill@OARcorp.com>
 
-	* configure.ac: Require autoconf-2.68, automake-1.11.1.
-
-2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Remove reference to bare BSP.
-	Simplify RTEMS_BSP_LIST setup.
-
-2008-12-04	Jukka Pietarinen <jukka.pietarinen@mrf.fi>
-
-	* TOOL_TARGETS: Add Lattice Mico32 support.
-
-2008-10-02	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* src/aclocal/rtems-cpu-subdirs.m4: Add new M32R port. It is just a
-	beginning but the BSP is functional enough to initialize and shutdown
-	RTEMS.
+	* ACKNOWLEDGEMENTS, TOOL_TARGETS: Remove TI C4x and NIOS2 ports from
+	4.9 branch.
 
 2007-03-27	Ralf Corsépius <ralf.corsepius@rtems.org>
 

c/TOOL_TARGETS

@@ -5,53 +5,32 @@
 The following are targets for the GNU tools (gcc, binutils, newlib, and gdb)
 that are for RTEMS, their object format, and status notes
 
-arm:
-        arm-rtems               ELF
+arm: arm-rtems               ELF
 
-c4x:
-        c4x-rtems               COFF           Requires patches
+h8300: h8300-rtems             COFF
 
-h8300:
-        h8300-rtems             COFF
+i386: i386-rtems		ELF
 
-i386:
-	i386-rtems		ELF
+m68k: m68k-rtems		ELF
 
-m68k:
-	m68k-rtems		ELF
-
-
-mips:
-	mips*-rtems		ELF		Big endian
-	mips*el-rtems		ELF		Little endian
+mips: mips*-rtems		ELF		Big endian
+      mips*el-rtems		ELF		Little endian
 
 	NOTE: Little endian configuration is not in all tools and 
 	      is untested for RTEMS itself.
 
-lm32:
-	lm32-elf		ELF		Big endian
-
-	NOTE: Currently there is no native lm32-rtems toolchain;
-
-nios2: 
-    nios2-elf           ELF     Little endian
+nios2: nios2-elf           ELF     Little endian
 
     NOTE: Currently there is no native nios2-rtems toolchain;
       Altera's nios2-elf-tools can be used with wrapper scripts.
 
-powerpc:
-	powerpc-rtems		ELF
-	powerpcle-rtems		ELF		Little endian
+powerpc: powerpc-rtems		ELF
+	 powerpcle-rtems		ELF		Little endian
 
 	NOTE: Little endian configuration is not in all tools and 
 	      is untested for RTEMS itself.
 
-sh:
-	sh-rtems		COFF
-	sh-rtemscoff		COFF
-	sh-rtemself		ELF
-
-	NOTE:  ELF is not completely stable for SH yet.
+sh: sh-rtems		ELF
 
 sparc:
 	sparc-rtems		ELF

c/configure.ac

@@ -1,15 +1,15 @@
 ## Process this file with autoconf to produce a configure script.
-##
+## 
 ## $Id$
 
-AC_PREREQ([2.68])
+AC_PREREQ(2.60)
 AC_INIT([rtems-c],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([TOOL_TARGETS])
 RTEMS_TOP(..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define foreign 1.11.1])
+AM_INIT_AUTOMAKE([no-define foreign 1.10])
 AM_MAINTAINER_MODE
 
 ## These options are used within this file.
@@ -37,8 +37,14 @@ for _rtems_bsp in : $rtems_bsp; do test "x$_rtems_bsp" = x: && continue
     # retrieve bsp_family
     RTEMS_BSP_ALIAS([$_rtems_bsp],[rtems_bsp_family])
 
-    # Is there a configure script for the BSP?
-    AS_IF([test -r "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$rtems_bsp_family/configure"],
+    # Is there code where there should be for this BSP?
+    case $rtems_bsp_family in
+    bare ) rtems_libbspdir="$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/bare" ;;
+    * )    rtems_libbspdir="$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$rtems_bsp_family";;
+    esac
+
+    # Is there a configure script for the BSP?    
+    AS_IF([test -r "$rtems_libbspdir/configure"],
       [RTEMS_BSP_LIST="$RTEMS_BSP_LIST $_rtems_bsp"])
   ])
 done

c/src/ChangeLog

@@ -1,582 +1,11 @@
-2011-11-09	Jennifer Averett <jennifer.averett@oarcorp.com>
+2008-09-10 	Ralf Corsépius <ralf.corsepius@rtems.org>
 
-	PR 1934/bsps
-	* libchip/serial/ns16550.c: Change to unsigned variable.
+	* aclocal/prog-cc.m4: Remove pre-production testing CFLAGS.
 
-2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+2008-09-10	Joel Sherrill <joel.sherrill@OARcorp.com>
 
-	* configure.ac: Require autoconf-2.68, automake-1.11.1.
-
-2011-01-19	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	* libchip/ide/ata.c: Fix spelling.
-
-2010-06-14	Arnout Vandecappelle <arnout@mind.be>
-
-	PR 1557/misc
-	* libchip/i2c/spi-sd-card.c: Fixed low capacity special case.
-
-2010-06-09	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/rtems-cpu-subdirs.m4: Remove nios2.
-
-2010-06-03	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	* libchip/network/if_dc.c: Fix warning.
-
-2010-05-31	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/network/greth.c: Misc. hacks to allow compilation on 
-	16bit targets.
-
-2010-05-31	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	PR 1531/newlib
-	* libchip/network/i82586.c:
-	Add local copy of ALIGN().
-
-2010-05-31	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/network/cs8900.c:
-	Misc. changes to make code 16bit-target compliant.
-	* libchip/network/i82586.c:
-	Use int32_t instead of int for 16bit-target compliance.
-	* libchip/network/open_eth.c: 
-	Misc. changes to make code 16bit-target compliant.
-
-2010-05-18	Chris Johns <chrisj@rtems.org>
-
-	* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: PR
-	1448/filesystem.
-
-2010-05-11	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4: Change quoting to work-round
-	http://www.freebsd.org/cgi/query-pr.cgi?pr=146378.
-
-2010-04-28	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	* libchip/network/if_dc.c: Remove warnings.
-
-2010-04-25	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	* libchip/serial/mc68681.c, libchip/serial/mc68681_reg.c,
-	libchip/serial/ns16550.c, libchip/serial/serial.h,
-	libchip/serial/z85c30.c, libchip/serial/z85c30_reg.c: Use uintptr_t
-	or intptr_t instead of uint32_t or int32_t.
-
-2010-04-25	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	* libchip/rtc/ds1375-rtc.h, libchip/rtc/ds1375.c,
-	libchip/rtc/icm7170.c, libchip/rtc/icm7170_reg.c,
-	libchip/rtc/m48t08_reg.c, libchip/rtc/rtc.h: Use uintptr_t instead of
-	uint32_t.
-
-2010-04-10	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/serial/serial.h: Add extern "C".
-
-2010-04-10	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/serial/serial.h, serial/mc68681.c, serial/mc68681_p.h,
-	serial/ns16550.c, serial/ns16550_p.h, serial/serial.h,
-	serial/z85c30.c, serial/z85c30_p.h: adapt _write_ functions to new
-	prototype
-
-2010-04-08	Joel Sherrill <joel.sherrilL@OARcorp.com>
-
-	* libchip/ide/ata.c: Change missed use of ATA_USE_OLD_EXCEPTIONS to
-	CPU_SIMPLE_VECTORED_INTERRUPTS.
-
-2010-04-07	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/ide/ata.c: Use correct macro from RTEMS to determine whether
-	simple or PIC interrupt model.
-
-2010-04-02	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/rtc/ds1375.c: #include <unistd.h>.
-
-2010-03-12	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/i82586.c: Readdress use of ctype methods per
-	recommendation from D.J. Delorie on the newlib mailing list. We
-	should pass an unsigned char into these methods.
-
-2010-03-11	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/ide/ide_controller.c: Fix warnings for uninitialized
-	variable.
-
-2010-03-11	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/i82586.c: Fix warnings for ctype methods.
-
-2010-02-19	Chris Johns <chrisj@rtems.org>
-
-	* libchip/ide/ide_controller.c: Create the devices as block
-	devices.
-
-2010-01-18	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/ide/ata_internal.h, libchip/ide/ata.c
-	libchip/i2c/spi-sd-card.c: Update for block device API change.
-
-2010-01-18	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/display/disp_hcms29xx.c,
-	libchip/display/disp_hcms29xx.h, libchip/display/font_hcms29xx.c,
-	libchip/display/font_hcms29xx.h: various fixes
-
-2009-12-18	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	PR 1474
-	* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: Update for block
-	device API change.
-
-2009-12-17	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/greth.c: Eliminate unused type
-	rtems_clock_time_value.
-
-2009-12-11	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/network/dec21140.c: Warning elimination
-	(dec21140_softc->base now is an uint32_t).
-
-2009-12-11	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	PR 1483/cpukit
-	* libchip/network/dec21140.c, libchip/network/elnk.c,
-	libchip/network/if_dc.c: Move #include <rtems/pci.h> into #if
-	*_SUPPORTED-guarded code sections.
-
-2009-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/dec21140.c, libchip/network/elnk.c,
-	libchip/network/if_dc.c: Ensure PCI drivers are built on all
-	supported configurations. PowerPC conditionals were not current and
-	code was not being built on supported BSPs.
-
-2009-11-23	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/network/smc91111.c: Formatting.
-
-2009-11-12	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/ide/ata.c (rtems_ata_initialize): Avoid implicit cast to uint16_t.
-	* libchip/ide/ata.c (ata_non_data_request): Change arg from int to 
-	uint32_t (16bit ints are too small).
-
-2009-11-06	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/network/elnk.c: Use PRI*32 to print u_int32_t's.
-	* libchip/network/if_dc.c: Fix type mismatch.
-
-2009-11-03	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-linkcmds.m4: New.
-
-2009-10-23	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Rework CFLAGS setup.
-	* aclocal/prog-cc.m4: Remove RTEMS_CFLAGS.
-	* automake/compile.am: Remove RTEMS_CFLAGS.
-
-2009-10-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/ide/ata.h: Move extern "C".
-
-2009-10-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-fram-fm25l256.c:
-	Use hex-constants to avoid implicit int-casts.
-	* libchip/i2c/spi-memdrv.c:
-	Use hex-constants to avoid implicit int-casts.
-	Use rtems_off64_t offsets to avoid loosing precision.
-
-2009-10-21	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/serial/ns16550.c: Update for interrupt handler type change.
-
-2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4: New.
-	* configure.ac: Apply RTEMS_BSP_ALIAS for RTEMS_BSP_FAMILY.
-
-2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/env-rtemsbsp.m4: Remove AM_CONDITIONAL MULTILIB.
-
-2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Remove AM_CONDITIONAL MULTILIB.
-	* Makefile.am: Remove BARE_CPU_MODEL.
-
-2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Remove cfg_dir.
-
-2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Remove -std=c99 -fasm.
-	Remove AM_CONDITIONAL LIBCHIP.
-	* libchip/Makefile.am, wrapup/Makefile.am:
-	Remove AM_CONDITIONAL LIBCHIP.
-
-2009-10-17	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Pick up make/custom/*.
-	* aclocal/check-custom-bsp.m4: Adapt to changes to configure.ac.
-
-2009-10-16	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* wrapup/Makefile.am: Remove AM_CONDITIONAL HAS_LIBBSP.
-	* configure.ac: Remove AM_CONDITIONAL HAS_LIBBSP.
-
-2009-10-16	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Remove special case lib/libbsp/bare (Abandoned).
-
-2009-10-16	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* Makefile.am: Remove RTEMS_HOST (unused).
-	* configure.ac: Remove RTEMS_HOST (unused).
-	* aclocal/canonical-target-name.m4: Remove RTEMS_HOST (unused).
-
-2009-10-15	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/check-custom-bsp.m4: Let _RTEMS_CHECK_CUSTOM_BSP look for
-	*.cfg into c/src/lib/libbsp/<cpu>/<bsp_family>/make/custom.
-
-2009-10-14	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/canonical-target-name.m4, aclocal/check-networking.m4,
-	aclocal/check-posix.m4, aclocal/enable-posix.m4,
-	aclocal/rtems-cpu-subdirs.m4: Remove posix/unix.
-
-2009-10-14	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Rework make/custom/* handling.
-	* aclocal/check-custom-bsp.m4: Change *.cfg handling.
-	* Makefile.am: Remove make/custom/default.cfg-rule.
-
-2009-10-13	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/serial/ns16550.c: Enable interrupts during open to avoid
-	NULL pointer access in interrupt handler.
-
-2009-10-09	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: Update for block
-	device API change.
-
-2009-10-08	Chris Johns <chrisj@rtems.org>
-
-	* libchip/ide/ata.c, c/src/libchip/ide/ata_internal.h: Remove the
-	multiblock support from the ATA driver. Multiblock at the disk
-	level should not be a global policy as a disk may have more than
-	one partition with different block sizes. An IDE driver could
-	decide to use the feature with DMA but this a driver specific
-	design choice. Fixed bugs relating to variable block sizes and
-	large block transfer.
-	* c/src/libchip/ide/ide_controller.c,
-	c/src/libchip/ide/ide_ctrl_cfg.h, c/src/libchip/ide/ide_ctrl_io.h:
-	Changed the block size to 32bits so blocks of 64K or bigger can be
-	transfered in a single driver call.
-
-2009-10-05	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/ide/ata.c: Revert previous change. Not all ARM BSPs use a
-	shared irq.h yet and this breaks a significant number of them.
-
-2009-10-01	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/ide/ata.c: Use simple vectored CPU macro to select interrupt
-	model.
-
-2009-09-30	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/serial/z85c30.c, libchip/serial/ns16550.c,
-	libchip/serial/mc68681.c: Reflect termios_baud_to_number having been
-	renamed to rtems_termios_baud_to_number.
-
-2009-09-30	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/serial/sersupp.h: Remove termios_baud_to_index,
-	termios_baud_to_number (duplicate prototypes).
-	Add C++-guards.
-	Include rtems/termiostypes.h.
-
-2009-09-15	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-configure.m4: Add RTEMS_BSP_BOOTCARD_OPTIONS.
-
-2009-08-20	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* aclocal/check-networking.m4: Disable TCP/IP on targets without enough
-	physical address to support BSD TCP/IP stack.
-
-2009-08-10	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/elnk.c: Convert calls to legacy routine
-	rtems_clock_get( RTEMS_CLOCK_GET_xxx, ..) to rtems_clock_get_xxx().
-
-2009-08-03	Roger Dahlkvist <ruppe@kth.se>
-
-	* libchip/shmdr/shm_driver.h: nios2 was not accounted for.
-
-2009-07-22	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/ide/ata.c: Remove warning.
-
-2009-07-16	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/bsp-bootcard-options.m4: Rename BSP_BOOTCARD_OPTIONS to
-	RTEMS_BSP_BOOTCARD_OPTIONS. Add RTEMS_BSP_CLEANUP_OPTIONS so all BSPs
-	now use the same macros.
-	* aclocal/bsp-bspcleanup-options.m4: New file.
-
-2009-07-15	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/serial/ns16550.c, libchip/serial/ns16550_p.h: Removed
-	obsolete defines and declarations.  Set initial baud during device
-	open.  Fixed interrupt mode.
-
-2009-06-12	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: Eliminate using the
-	GNU/Linux specific error numbers EBADRQC and ENOTBLK. Switch to
-	EINVAL and ENOTTY as appropriate.
-
-2009-05-30	Chris Johns <chrisj@rtems.org>
-
-	* c/src/libchip/ide/ata.c: Fixed the bug that ignored slave
-	devices on an IDE bus and cleaned up the initialisation register
-	call.
-
-2009-05-11	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/i82586.c: Fix warning in manner suggested by 
-	Arnout Vandecappelle <arnout@mind.be> in
-	http://www.rtems.org/pipermail/rtems-users/2009-May/005460.html.
-
-2009-05-06	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/if_dc.c: Fixed warnings.
-
-2009-05-03	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/rtc/ds1375.c, libchip/rtc/mc146818a.c: Fix warnings. Reformat
-	as needed.
-
-2009-04-29	Chris Johns <chrisj@rtems.org>
-
-	* libchip/ide/ata.c: Remove a detection test that fails in qemu.
-
-	* libchip/ide/ide_controller.c: Change the status detection and
-	add a message if the transfer fails. There is currently no error
-	handle at the IDE drvier level.
-
-2009-03-12	Daniel Hellstrom <daniel@gaisler.com>
-
-	PR 1392/bsps
-	* libchip/i2c/spi-memdrv.c: SPI Memory driver. Fix but where writes
-	over multiple pages results in extra data being written.
-
-2009-02-27	Gene Smith <gene.smith@siemens.com>
-
-	PR 1356
-	* libchip/i2c/spi-sd-card.c: Added support for high capacity and MMC
-	cards.
-
-2009-02-19	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/dec21140.c, libchip/network/elnk.c: Make sure this is
-	enabled on x86.
-
-2009-02-03	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bspopts.m4: Quoting cosmetics.
-
-2009-01-21	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.h, libchip/i2c/spi-sd-card.c: Fixed
-	RTEMS_BLKDEV_CAPABILITIES ioctl which caused invalid multiple block
-	writes.  Fixed integer type in device structure.
-
-2009-01-05	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/serial/ns16550.c: Turn on ns16550_process() for
-	BSP_FEATURE_IRQ_LEGACY case also.
-
-2008-11-23	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.h, libchip/i2c/spi-sd-card.c: Removed high
-	level LibI2C interface.  Added generic block IO functions.
-
-2008-12-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* optman/rtems/no-barrier.c, optman/rtems/no-dpmem.c,
-	optman/rtems/no-msg.c, optman/rtems/no-part.c,
-	optman/rtems/no-region.c, optman/rtems/no-rtmon.c,
-	optman/rtems/no-sem.c, optman/rtems/no-timer.c,
-	optman/sapi/no-ext.c, optman/sapi/no-io.c:
-	Revert previous patch (cvs clash with Joel hacking cpukit).
-
-2008-12-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/canonical-target-name.m4: Remove tic4x.
-
-2008-12-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/rtc/ds1375.c: Include <errno.h> instead of <sys/errno.h>.
-
-2008-12-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* optman/rtems/no-barrier.c, optman/rtems/no-dpmem.c,
-	optman/rtems/no-msg.c, optman/rtems/no-part.c,
-	optman/rtems/no-region.c, optman/rtems/no-rtmon.c,
-	optman/rtems/no-sem.c, optman/rtems/no-timer.c,
-	optman/sapi/no-ext.c, optman/sapi/no-io.c:
-	Fix prototypes.
-
-2008-12-18	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/serial/ns16550_p.h: Remove prototype with no implementation.
-
-2008-12-18	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/shmdr/dump.c, libchip/shmdr/init.c, libchip/shmdr/send.c,
-	libchip/shmdr/shm_driver.h: Cleanup and remove variables which
-	duplicated data.
-
-2008-12-17	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* optman/sapi/no-ext.c, optman/sapi/no-io.c: Convert SAPI manager and
-	SuperCore Handler initialization routines to directly pull parameters
-	from configuration table.
-
-2008-12-17	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* optman/rtems/no-barrier.c, optman/rtems/no-dpmem.c,
-	optman/rtems/no-event.c, optman/rtems/no-mp.c, optman/rtems/no-msg.c,
-	optman/rtems/no-part.c, optman/rtems/no-region.c,
-	optman/rtems/no-rtmon.c, optman/rtems/no-sem.c,
-	optman/rtems/no-signal.c, optman/rtems/no-timer.c: Convert manager
-	initialization routines to directly pull parameters from
-	configuration table. Eliminate empty routines sportted.
-
-2008-12-17	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/serial/ns16550.c: Add CVS-Id. Fix #define mess.
-
-2008-12-16	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/i82586.c, libchip/network/smc91111config.h: Eliminate
-	all public use of TOD conversion routines.
-
-2008-12-11	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/network/smc91111config.h: 
-	#include <stdint.h> instead of <rtems/stdint.h>.
-
-2008-12-10	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/prog-cc.m4: Use -r instead of -Wl,-r to build *.rels.
-	* aclocal/rtems-cpu-subdirs.m4: Remove obsolete cpus.
-
-2008-12-04	Jukka Pietarinen <jukka.pietarinen@mrf.fi>
-
-	* aclocal/rtems-cpu-subdirs.m4: Add Lattice Mico32 support.
-
-2008-11-13	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/serial/ns16550.c: Transmit the character in the polled write
-	function within a critical section for printk() compatibility.
-
-2008-10-02	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.c: Update for status-checks.h changes.
-
-2008-10-02	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/rtems-cpu-subdirs.m4: Add new M32C port.
-
-2008-09-24	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/bsp-bootcard-options.m4: Generalize and correct comment.
-
-2008-09-24	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-bootcard-options.m4: Fix quoting.
-
-2008-09-23	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/bsp-bootcard-options.m4: New file.
-	* aclocal/bsp-bootcards-handles-ram-allocation.m4: Removed.
-
-2008-09-23	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/serial/ns16550.c: Enable interrupt code only for PowerPC or
-	BSPs that support this feature.
-
-2008-09-22	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/serial/ns16550.c: Fix typo.
-
-2008-09-22	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/serial/ns16550.c: Fix typo.
-
-2008-09-22	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/serial/ns16550.c: Add not supported on arm even though it is
-	not simple vectored.
-
-2008-09-22	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/serial/ns16550.c: Not currently supported on architectures
-	with simple vectored interrupt model.
-
-2008-09-22	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/version.m4: Bump RTEMS_API to 4.10.
-	Bump _RTEMS_VERSION to 4.9.99.0.
-
-2008-09-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/rtc/icm7170.c, libchip/rtc/m48t08.c,
-	c/src/libchip/rtc/rtc.h:  Include required header files.  Some internal
-	functions have now static linkage type.  Added constant qualifier to
-	operations table and read-only function parameters.
-
-	* libchip/serial/ns16550.c, libchip/serial/ns16550_p.h,
-	c/src/libchip/serial/serial.h:  Include required header files.  Removed
-	support for old PowerPC exception handling.  Various fixes for
-	interrupt related routines.  Added support for BSPs with IRQ extension
-	API.
-
-2008-09-20	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/dec21140.c, libchip/network/elnk.c: Detect when there
-	is no PCI bus based upon the BSP not having a base address defined.
-	This means this driver cannot be supported on that board.
-
-2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/dec21140.c, libchip/network/elnk.c,
-	libchip/network/if_dc.c: Eliminate vestiges of mpc603e define.
-
-2008-09-17	Miao Yan <yanmiaobest@gmail.com>
-
-	* optman/Makefile.am, optman/preinstall.am: Merge GSOC project code to
-	add simple device only filesystem (devfs), optionally completely drop
-	out filesystem, and to clean up disabling newlib reentrancy support.
-	This dropped 17K from the minimum.exe for sparc/sis and arm/rtl22xx_t
-	now has a 15K code space.
-	* optman/no-console.c, optman/no-filesystem.c, optman/no-libio.c:
-	Removed.
+	* aclocal/canonical-target-name.m4, aclocal/rtems-cpu-subdirs.m4:
+	Remove TI C4x and NIOS2 ports from 4.9 branch.
 
 2008-09-08 	Ralf Corsépius <ralf.corsepius@rtems.org>
 

c/src/Makefile.am

@@ -13,7 +13,7 @@ clean-local:
 make/@RTEMS_BSP@.cache: make/bsp.mak @CUSTOM_CFG_FILES@
 	$(RM) make/@RTEMS_BSP@.cache
 	$(MAKE) -f ${srcdir}/make/bsp.mak \
-	'RTEMS_BSP=@RTEMS_BSP@' 'RTEMS_ROOT=.' \
+	'RTEMS_BSP=@RTEMS_BSP@' 'RTEMS_HOST=@RTEMS_HOST@' 'RTEMS_ROOT=.' 'BARE_CPU_MODEL=${BARE_CPU_MODEL}' \
 	make/@RTEMS_BSP@.cache
 
 noinst_DATA = make/@RTEMS_BSP@.cache
@@ -24,6 +24,9 @@ rtems_make_customdir = $(rtems_makedir)/custom
 rtems_make_custom_DATA = @CUSTOM_CFG_FILES@
 DISTCLEANFILES += @CUSTOM_CFG_FILES@
 
+make/custom/default.cfg: $(srcdir)/make/custom/default.cfg.in
+	cp $< $@
+
 noinst_DATA += make/custom/default.cfg
 DISTCLEANFILES += make/custom/default.cfg
 

c/src/aclocal/bsp-alias.m4

@@ -1,22 +0,0 @@
-dnl
-dnl  $Id$
-dnl 
-
-dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
-dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN([_RTEMS_BSP_ALIAS],
-[# account for "aliased" bsps which share source code
-      for bsp_cfgs in `ls "$srcdir"/"$RTEMS_TOPdir"/c/src/lib/libbsp/"$RTEMS_CPU"/*/"make/custom/$1.cfg" 2>/dev/null`; do
-        $2=`echo "$bsp_cfgs" | sed \
-          -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
-          -e "s,/make/custom/.*\.cfg$,,"`
-        break
-      done
-])
-
-dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
-dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY
-AC_DEFUN([RTEMS_BSP_ALIAS],
-[_RTEMS_BSP_ALIAS(m4_if([$1],,[$RTEMS_BSP],[$1]),
-  m4_if([$2],,[RTEMS_BSP_FAMILY],[$2]))]
-)

c/src/aclocal/bsp-bootcard-options.m4

@@ -1,19 +0,0 @@
-dnl $Id$
-dnl
-
-dnl BSP_BOOTCARD_OPTIONS - some autoconf voodoo to provide each BSPs'
-dnl configure script with the standard options supported by boot_card()
-dnl and other required parts of the BSP Framework.  Currently, this is
-dnl
-dnl   - Can optionally dirty memory at boot time.
-dnl
-
-dnl To be used in bsp-configure scripts
-
-AC_DEFUN([RTEMS_BSP_BOOTCARD_OPTIONS],[
-RTEMS_BSPOPTS_SET([BSP_DIRTY_MEMORY],[*],[0])
-RTEMS_BSPOPTS_HELP([BSP_DIRTY_MEMORY],
-[If defined, then the BSP Framework will put a non-zero pattern into
- the RTEMS Workspace and C program heap.  This should assist in finding
- code that assumes memory starts set to zero.])
-])

c/src/aclocal/bsp-bootcards-handles-ram-allocation.m4

@@ -0,0 +1,35 @@
+dnl $Id$
+dnl
+
+dnl RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION - some autoconf voodoo to
+dnl indicate that the BSP is using the shared RAM allocation code in 
+dnl bootcard.c.  This is a new way of doing things that will reduce the
+dnl size of each BSP's bspstart.c and open the door for another round
+dnl of benefits for BSPs that use this scheme.
+dnl
+dnl Benefits:
+dnl   - Reduced code in bspstart.c
+dnl   - Can optionally dirty memory at boot time.
+dnl
+dnl NOTE: This macro is intended to be temporary.  When most of the
+dnl       BSPs use the new shared method, we need to either bulk edit
+dnl       the remaining BSPs to eliminate code using the old way. Or
+dnl       switch the sense of this macro to be required on BSPs using
+dnl       the old way.
+dnl
+dnl       AGAIN: This is intended to be temporary.  Please help by
+dnl              updating BSPs to use the new scheme. 
+
+dnl To be used in bsp-configure scripts
+
+AC_DEFUN([RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION],
+ [AC_DEFINE_UNQUOTED([BSP_BOOTCARD_HANDLES_RAM_ALLOCATION],
+  [1],
+  [BSP uses shared logic in bootcard.c]
+)
+RTEMS_BSPOPTS_SET([BSP_DIRTY_MEMORY],[*],[0])
+RTEMS_BSPOPTS_HELP([BSP_DIRTY_MEMORY],
+[If defined, then PSIM will put a non-zero pattern into the RTEMS
+ Workspace and C program heap.  This should assist in finding
+ code that assumes memory starts set to zero.])
+])

c/src/aclocal/bsp-bspcleanup-options.m4

@@ -1,28 +0,0 @@
-dnl $Id$
-dnl
-
-dnl BSP_CLEANUP_OPTIONS - some autoconf voodoo to provide each BSPs'
-dnl configure script with the standard options supported by the shared
-dnl implementation of bsp_cleanup().
-dnl
-dnl   - Can optionally dirty memory at boot time.
-dnl
-
-dnl To be used in bsp-configure scripts
-
-dnl USAGE:
-dnl    RTEMS_BSP_CLEANUP_OPTIONS([0|1], [0|1]) 
-dnl WHERE:
-dnl    argument 1 indicates the default value for BSP_PRESS_KEY_FOR_RESET
-dnl    argument 2 indicates the default value for BSP_RESET_BOARD_AT_EXIT
-
-AC_DEFUN([RTEMS_BSP_CLEANUP_OPTIONS],[
-RTEMS_BSPOPTS_SET([BSP_PRESS_KEY_FOR_RESET],[*],[$1])
-RTEMS_BSPOPTS_HELP([BSP_PRESS_KEY_FOR_RESET],
-[If defined, print a message and wait until pressed before resetting
- board when application exits.])
-
-RTEMS_BSPOPTS_SET([BSP_RESET_BOARD_AT_EXIT],[*],[$2])
-RTEMS_BSPOPTS_HELP([BSP_RESET_BOARD_AT_EXIT],
-[If defined, reset the board when the application exits.])
-])

c/src/aclocal/bsp-configure.m4

@@ -34,6 +34,4 @@ echo "#endif /* __BSP_OPTIONS_H */"                   >>$tmp/config.h
   RTEMS_PROJECT_ROOT
 
   RTEMS_CHECK_MULTIPROCESSING
-
-  RTEMS_BSP_BOOTCARD_OPTIONS
 ])

c/src/aclocal/bsp-linkcmds.m4

@@ -1,19 +0,0 @@
-dnl $Id$
-
-dnl Install a BSP's linkcmds from the source-tree into the build-tree
-AC_DEFUN([RTEMS_BSP_LINKCMDS],[
-LINKCMDS=
-for f in "${srcdir}/startup/linkcmds.${RTEMS_BSP}" \
-  "${srcdir}/startup/linkcmds.${RTEMS_BSP_FAMILY}" \
-  "${srcdir}/startup/linkcmds";
-do
-  AS_IF([test -f "$f"],[
-    LINKCMDS="$f"
-    break])
-done
-
-AS_IF([test -z "${LINKCMDS}"],[
-  AC_MSG_ERROR([can not determine linkcmds])])
-
-AC_CONFIG_LINKS([startup/linkcmds:${LINKCMDS}])
-])

c/src/aclocal/bspopts.m4

@@ -29,7 +29,7 @@ dnl appropriate /bin/sh-magic to "configure" to have VAR set up.
 AC_DEFUN([RTEMS_BSPOPTS_HELP],[
 RTEMS_ARG_VAR([$1],[$2])
 m4_ifdef([_$1],[
-case "${RTEMS_BSP}" in
+case ${RTEMS_BSP} in
 _$1[]dnl
 esac],[])
 if test -n "[$]{$1}"; then[]dnl

c/src/aclocal/canonical-target-name.m4

@@ -13,13 +13,33 @@ AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
 AC_CANONICAL_HOST
 AC_MSG_CHECKING(rtems target cpu)
 case "${host}" in
+  # hpux unix port should go here
+  i[[34567]]86-*linux*)		# unix "simulator" port
+	RTEMS_CPU=unix
+        RTEMS_HOST=Linux
+	;;
+  i[[34567]]86-*freebsd*) 	# unix "simulator" port
+	RTEMS_CPU=unix
+        RTEMS_HOST=FreeBSD
+	;;
+  i[[34567]]86-pc-cygwin*) 	# Cygwin is just enough unix like :)
+	RTEMS_CPU=unix
+        RTEMS_HOST=Cygwin
+	;;
   no_cpu-*rtems*)
         RTEMS_CPU=no_cpu
+	RTEMS_HOST=$host_os
+	;;
+  sparc-sun-solaris*)           # unix "simulator" port
+	RTEMS_CPU=unix
+        RTEMS_HOST=Solaris
 	;;
   *) 
 	RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
+	RTEMS_HOST=$host_os
 	;;
 esac
 AC_SUBST(RTEMS_CPU)
+AC_SUBST(RTEMS_HOST)
 AC_MSG_RESULT($RTEMS_CPU)
 ])

c/src/aclocal/check-custom-bsp.m4

@@ -1,20 +1,22 @@
 dnl $Id$
 
 AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
-AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
-AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
-  $2=
-  for i in \
-    `ls "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1 2>/dev/null`;
+  for i in "${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}"/*/cfg/$1 \
+    ${srcdir}/${RTEMS_TOPdir}/make/custom/$1;
   do
+    AC_MSG_CHECKING([for $i])
     AS_IF([test -r $i],[
       $2="$i"
-      break
+      AC_MSG_RESULT([yes])
+      break;
+    ],[
+      AC_MSG_RESULT([no])
     ])
   done
 ])
 
 AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
+  AC_REQUIRE([RTEMS_TOP])
   _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
   AS_IF([test -z "$BSP_FOUND"],[
     AC_MSG_ERROR([missing [$]$1.cfg])

c/src/aclocal/check-networking.m4

@@ -9,7 +9,7 @@ AC_CACHE_CHECK([whether BSP supports networking],
   rtems_cv_HAS_NETWORKING,
   [dnl
     case "$RTEMS_CPU" in
-    avr*|m32c*)       # do not have address space to hold BSD TCP/IP stack
+    unix*)
       rtems_cv_HAS_NETWORKING="no"
       ;;
     *)

c/src/aclocal/check-posix.m4

@@ -9,6 +9,9 @@ AC_CACHE_CHECK([whether CPU supports libposix],
   rtems_cv_HAS_POSIX_API,
   [dnl
     case "$RTEMS_CPU" in
+    unix*)
+      rtems_cv_HAS_POSIX_API="no"
+      ;;
     *)
       if test "${RTEMS_HAS_POSIX_API}" = "yes"; then
         rtems_cv_HAS_POSIX_API="yes";

c/src/aclocal/enable-posix.m4

@@ -13,9 +13,19 @@ AC_ARG_ENABLE(posix,
 esac],[RTEMS_HAS_POSIX_API=yes]) 
 
 case "${host}" in
+  # hpux unix port should go here
+  i[[34567]]86-pc-linux*)         # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
+  i[[34567]]86-*freebsd*) # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
   no_cpu-*rtems*)
 	RTEMS_HAS_POSIX_API=no
 	;;
+  sparc-sun-solaris*)             # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
   *) 
 	;;
 esac

c/src/aclocal/env-rtemsbsp.m4

@@ -27,6 +27,8 @@ RTEMS_BSP="$rtems_cv_RTEMS_BSP"
 AC_MSG_RESULT(${RTEMS_BSP})
 AC_SUBST(RTEMS_BSP)
 
+AM_CONDITIONAL([MULTILIB],[false])
+
 includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
 libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
 

c/src/aclocal/prog-cc.m4

@@ -35,6 +35,12 @@ GCCSPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
 
+AS_IF([test "$GCC" = yes],[
+RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
+m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
+])
+AC_SUBST(RTEMS_CFLAGS)
+
 AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[
   RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[
   RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
@@ -42,7 +48,7 @@ AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[
 AC_SUBST(RTEMS_CPPFLAGS)
 
 AS_IF([test "$GCC" = yes],[
-  RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r"
+  RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -Wl,-r"
 ])
 AC_SUBST(RTEMS_RELLDFLAGS)
 ])

c/src/aclocal/rtems-cpu-subdirs.m4

@@ -14,16 +14,16 @@ _RTEMS_CPU_SUBDIR([arm],[$1]);;
 _RTEMS_CPU_SUBDIR([bfin],[$1]);;
 _RTEMS_CPU_SUBDIR([avr],[$1]);;
 _RTEMS_CPU_SUBDIR([h8300],[$1]);;
+_RTEMS_CPU_SUBDIR([hppa1.1],[$1]);;
 _RTEMS_CPU_SUBDIR([i386],[$1]);;
-_RTEMS_CPU_SUBDIR([lm32],[$1]);;
-_RTEMS_CPU_SUBDIR([m32c],[$1]);;
-_RTEMS_CPU_SUBDIR([m32r],[$1]);;
 _RTEMS_CPU_SUBDIR([m68k],[$1]);;
 _RTEMS_CPU_SUBDIR([mips],[$1]);;
 _RTEMS_CPU_SUBDIR([no_cpu],[$1]);;
+_RTEMS_CPU_SUBDIR([or32],[$1]);;
 _RTEMS_CPU_SUBDIR([powerpc],[$1]);;
 _RTEMS_CPU_SUBDIR([sh],[$1]);;
 _RTEMS_CPU_SUBDIR([sparc],[$1]);;
+_RTEMS_CPU_SUBDIR([unix],[$1]);;
 *) AC_MSG_ERROR([Invalid RTEMS_CPU <[$]{RTEMS_CPU}>])
 esac
 ])

c/src/aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.10.2]))
+m4_define([_RTEMS_VERSION],[4.9.0]))
 
-m4_define([RTEMS_API],[4.10])
+m4_define([RTEMS_API],[4.9])

c/src/ada-tests/ChangeLog

@@ -1,149 +1,3 @@
-2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Require autoconf-2.68, automake-1.11.1.
-
-2009-12-14	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* mptests/mp01/node1/mp01_node1.adb, mptests/mp01/node2/mp01_node2.adb,
-	mptests/mp02/node1/mp02_node1.adb, mptests/mp02/node2/mp02_node2.adb,
-	mptests/mp03/node1/mp03_node1.adb, mptests/mp03/node2/mp03_node2.adb,
-	mptests/mp04/node1/mp04_node1.adb, mptests/mp04/node2/mp04_node2.adb,
-	mptests/mp05/mptest.adb, mptests/mp05/node1/mp05_node1.adb,
-	mptests/mp05/node2/mp05_node2.adb, mptests/mp06/node1/mp06_node1.adb,
-	mptests/mp06/node2/mp06_node2.adb, mptests/mp07/node1/mp07_node1.adb,
-	mptests/mp07/node2/mp07_node2.adb, mptests/mp08/node1/mp08_node1.adb,
-	mptests/mp08/node2/mp08_node2.adb, mptests/mp09/node1/mp09_node1.adb,
-	mptests/mp09/node2/mp09_node2.adb, mptests/mp10/node1/mp10_node1.adb,
-	mptests/mp10/node2/mp10_node2.adb, mptests/mp11/node1/mp11_node1.adb,
-	mptests/mp11/node2/mp11_node2.adb, mptests/mp12/node1/mp12_node1.adb,
-	mptests/mp12/node2/mp12_node2.adb, mptests/mp13/node1/mp13_node1.adb,
-	mptests/mp13/node2/mp13_node2.adb, mptests/mp14/mptest.adb,
-	mptests/mp14/node1/mp14_node1.adb, mptests/mp14/node2/mp14_node2.adb,
-	sptests/sp09/sptest.adb, sptests/sp11/sptest.adb,
-	sptests/sp13/sptest.adb, sptests/sp16/sptest.adb,
-	support/test_support.adb: Lines are now all less than 80 columns.
-
-2009-12-14	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* samples/base_sp/sptest.adb, samples/hello/sptest.adb,
-	samples/nsecs/sptest.adb, samples/ticker/sptest.adb,
-	sptests/sp01/sptest.adb, sptests/sp02/sptest.adb,
-	sptests/sp03/sptest.adb, sptests/sp04/sptest.adb,
-	sptests/sp05/sptest.adb, sptests/sp06/sptest.adb,
-	sptests/sp07/sptest.adb, sptests/sp08/sptest.adb,
-	sptests/sp09/sptest.adb, sptests/sp11/sptest.adb,
-	sptests/sp12/sptest.adb, sptests/sp13/sptest.adb,
-	sptests/sp14/sptest.adb, sptests/sp15/sptest.adb,
-	sptests/sp16/sptest.adb, sptests/sp17/sptest.adb,
-	sptests/sp19/sptest.adp, sptests/sp20/sptest.adb,
-	sptests/sp22/sptest.adb, sptests/sp23/sptest.adb,
-	sptests/sp24/sptest.adb, sptests/sp25/sptest.adb,
-	sptests/spname01/spname01.adb, sptests/spname01/sptest.adb,
-	sptests/spname01/sptest.ads, support/address_io.adb, support/init.c,
-	support/test_support.adb, support/test_support.ads,
-	support/time_test_support.adb, support/timer_driver.adb,
-	tmtests/tm01/tmtest.adb, tmtests/tm01/tmtest.ads,
-	tmtests/tm02/tmtest.adb, tmtests/tm02/tmtest.ads,
-	tmtests/tm03/tmtest.adb, tmtests/tm03/tmtest.ads,
-	tmtests/tm04/tmtest.adb, tmtests/tm04/tmtest.ads,
-	tmtests/tm05/tmtest.adb, tmtests/tm05/tmtest.ads,
-	tmtests/tm06/tmtest.adb, tmtests/tm06/tmtest.ads,
-	tmtests/tm07/tmtest.adb, tmtests/tm07/tmtest.ads,
-	tmtests/tm08/tmtest.adb, tmtests/tm08/tmtest.ads,
-	tmtests/tm09/tmtest.adb, tmtests/tm09/tmtest.ads,
-	tmtests/tm10/tmtest.adb, tmtests/tm10/tmtest.ads,
-	tmtests/tm11/tmtest.adb, tmtests/tm11/tmtest.ads,
-	tmtests/tm12/tmtest.adb, tmtests/tm12/tmtest.ads,
-	tmtests/tm13/tmtest.adb, tmtests/tm13/tmtest.ads,
-	tmtests/tm14/tmtest.adb, tmtests/tm14/tmtest.ads,
-	tmtests/tm15/tmtest.adb, tmtests/tm15/tmtest.ads,
-	tmtests/tm16/tmtest.adb, tmtests/tm16/tmtest.ads,
-	tmtests/tm17/tmtest.adb, tmtests/tm17/tmtest.ads,
-	tmtests/tm18/tmtest.adb, tmtests/tm18/tmtest.ads,
-	tmtests/tm19/tmtest.adb, tmtests/tm19/tmtest.ads,
-	tmtests/tm20/tmtest.adb, tmtests/tm20/tmtest.ads,
-	tmtests/tm21/tmtest.adb, tmtests/tm21/tmtest.ads,
-	tmtests/tm22/tmtest.adb, tmtests/tm22/tmtest.ads,
-	tmtests/tm23/tmtest.adb, tmtests/tm23/tmtest.ads,
-	tmtests/tm24/tmtest.adb, tmtests/tm24/tmtest.ads,
-	tmtests/tm25/tmtest.adb, tmtests/tm25/tmtest.ads,
-	tmtests/tm28/tmtest.adb, tmtests/tm28/tmtest.ads,
-	tmtests/tm29/tmtest.adb, tmtests/tm29/tmtest.ads,
-	tmtests/tmck/tmtest.adb, tmtests/tmck/tmtest.ads,
-	tmtests/tmoverhd/dummy_rtems.adb, tmtests/tmoverhd/tmtest.adb,
-	tmtests/tmoverhd/tmtest.ads: Remove many warnings.
-
-2009-12-14	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
-	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
-	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
-	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
-	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
-	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
-	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
-	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
-	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
-	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
-	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
-	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
-	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
-	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am,
-	samples/base_mp/Makefile.am, samples/base_mp/node1/Makefile.am,
-	samples/base_mp/node2/Makefile.am, samples/base_sp/Makefile.am,
-	samples/hello/Makefile.am, samples/nsecs/Makefile.am,
-	samples/ticker/Makefile.am, sptests/sp01/Makefile.am,
-	sptests/sp02/Makefile.am, sptests/sp03/Makefile.am,
-	sptests/sp04/Makefile.am, sptests/sp05/Makefile.am,
-	sptests/sp06/Makefile.am, sptests/sp07/Makefile.am,
-	sptests/sp08/Makefile.am, sptests/sp09/Makefile.am,
-	sptests/sp11/Makefile.am, sptests/sp12/Makefile.am,
-	sptests/sp13/Makefile.am, sptests/sp14/Makefile.am,
-	sptests/sp15/Makefile.am, sptests/sp16/Makefile.am,
-	sptests/sp17/Makefile.am, sptests/sp19/Makefile.am,
-	sptests/sp20/Makefile.am, sptests/sp22/Makefile.am,
-	sptests/sp23/Makefile.am, sptests/sp24/Makefile.am,
-	sptests/sp25/Makefile.am, sptests/spname01/Makefile.am,
-	tmtests/tm01/Makefile.am, tmtests/tm02/Makefile.am,
-	tmtests/tm03/Makefile.am, tmtests/tm04/Makefile.am,
-	tmtests/tm05/Makefile.am, tmtests/tm06/Makefile.am,
-	tmtests/tm07/Makefile.am, tmtests/tm08/Makefile.am,
-	tmtests/tm09/Makefile.am, tmtests/tm10/Makefile.am,
-	tmtests/tm11/Makefile.am, tmtests/tm12/Makefile.am,
-	tmtests/tm13/Makefile.am, tmtests/tm14/Makefile.am,
-	tmtests/tm15/Makefile.am, tmtests/tm16/Makefile.am,
-	tmtests/tm17/Makefile.am, tmtests/tm18/Makefile.am,
-	tmtests/tm19/Makefile.am, tmtests/tm20/Makefile.am,
-	tmtests/tm21/Makefile.am, tmtests/tm22/Makefile.am,
-	tmtests/tm23/Makefile.am, tmtests/tm24/Makefile.am,
-	tmtests/tm25/Makefile.am, tmtests/tm28/Makefile.am,
-	tmtests/tm29/Makefile.am, tmtests/tmck/Makefile.am,
-	tmtests/tmoverhd/Makefile.am: Update so all tests build.
-
-2008-09-29	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* support/timer_driver.adb, support/timer_driver.ads,
-	tmtests/tm01/tmtest.adb, tmtests/tm02/tmtest.adb,
-	tmtests/tm03/tmtest.adb, tmtests/tm04/tmtest.adb,
-	tmtests/tm05/tmtest.adb, tmtests/tm06/tmtest.adb,
-	tmtests/tm07/tmtest.adb, tmtests/tm08/tmtest.adb,
-	tmtests/tm09/tmtest.adb, tmtests/tm10/tmtest.adb,
-	tmtests/tm11/tmtest.adb, tmtests/tm12/tmtest.adb,
-	tmtests/tm13/tmtest.adb, tmtests/tm14/tmtest.adb,
-	tmtests/tm15/tmtest.adb, tmtests/tm16/tmtest.adb,
-	tmtests/tm17/tmtest.adb, tmtests/tm18/tmtest.adb,
-	tmtests/tm19/tmtest.adb, tmtests/tm20/config.h,
-	tmtests/tm20/tmtest.adb, tmtests/tm21/tmtest.adb,
-	tmtests/tm22/tmtest.adb, tmtests/tm23/tmtest.adb,
-	tmtests/tm24/tmtest.adb, tmtests/tm25/tmtest.adb,
-	tmtests/tm28/tmtest.adb, tmtests/tm29/tmtest.adb,
-	tmtests/tmck/tmtest.adb, tmtests/tmoverhd/tmtest.adb: Clean up.
-	Verified to run on psim with gcc 4.3.2.
-
-2008-09-10	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* support/timer_driver.ads: Switch to new names.
-
 2008-06-06	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* samples/hello/config.h, sptests/spname01/config.h: These needed

c/src/ada-tests/configure.ac

@@ -1,18 +1,18 @@
 ## Process this file with autoconf to produce a configure script.
-##
+## 
 ## $Id$
 
-AC_PREREQ([2.68])
+AC_PREREQ(2.59)
 AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([support])
 RTEMS_TOP([../../..],[])
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define foreign 1.11.1])
+AM_INIT_AUTOMAKE([no-define foreign 1.9])
 AM_MAINTAINER_MODE
 
-AC_CHECK_PROGS([M4],[gm4 m4])
+AC_CHECK_PROGS([M4],[gm4 m4]) 
 RTEMS_PROG_GNAT
 RTEMS_CANONICALIZE_TOOLS
 

c/src/ada-tests/mptests/mp01/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_ada_mp01_node1
-mp01_ada_mp01_node1_SOURCES = mp01_node1.adb ../mptest.adb config.h
-mp01_ada_mp01_node1_SOURCES += ../mptest.ads
-mp01_ada_mp01_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_ada_mp01_node1.exe
+mp01_ada_mp01_node1_exe_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
+mp01_ada_mp01_node1_exe_SOURCES += ../../../support/init.c
 
-mp01_ada_mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
+mp01_ada_mp01_node1.exe: mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP01_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP01_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp01/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_ada_mp01_node2
-mp01_ada_mp01_node2_SOURCES = mp01_node2.adb ../mptest.adb config.h
-mp01_ada_mp01_node2_SOURCES += ../mptest.ads
-mp01_ada_mp01_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_ada_mp01_node2.exe
+mp01_ada_mp01_node2_exe_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
+mp01_ada_mp01_node2_exe_SOURCES += ../../../support/init.c
 
-mp01_ada_mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
+mp01_ada_mp01_node2.exe: mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP01_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP01_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp02/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_ada_mp02_node1
-mp02_ada_mp02_node1_SOURCES = mp02_node1.adb ../mptest.adb config.h
-mp02_ada_mp02_node1_SOURCES += ../mptest.ads
-mp02_ada_mp02_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_ada_mp02_node1.exe
+mp02_ada_mp02_node1_exe_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
+mp02_ada_mp02_node1_exe_SOURCES += ../../../support/init.c
 
-mp02_ada_mp02_node1$(EXEEXT): mp02_node1.adb ../mptest.adb init.$(OBJEXT)
+mp02_ada_mp02_node1.exe: mp02_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP02_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP02_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp02/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_ada_mp02_node2
-mp02_ada_mp02_node2_SOURCES = mp02_node2.adb ../mptest.adb config.h
-mp02_ada_mp02_node2_SOURCES += ../mptest.ads
-mp02_ada_mp02_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_ada_mp02_node2.exe
+mp02_ada_mp02_node2_exe_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
+mp02_ada_mp02_node2_exe_SOURCES += ../../../support/init.c
 
-mp02_ada_mp02_node2$(EXEEXT): mp02_node2.adb ../mptest.adb init.$(OBJEXT)
+mp02_ada_mp02_node2.exe: mp02_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP02_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP02_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp03/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_ada_mp03_node1
-mp03_ada_mp03_node1_SOURCES = mp03_node1.adb ../mptest.adb config.h
-mp03_ada_mp03_node1_SOURCES += ../mptest.ads
-mp03_ada_mp03_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_ada_mp03_node1.exe
+mp03_ada_mp03_node1_exe_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
+mp03_ada_mp03_node1_exe_SOURCES += ../../../support/init.c
 
-mp03_ada_mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
+mp03_ada_mp03_node1.exe: mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP03_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP03_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp03/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_ada_mp03_node2
-mp03_ada_mp03_node2_SOURCES = mp03_node2.adb ../mptest.adb config.h
-mp03_ada_mp03_node2_SOURCES += ../mptest.ads
-mp03_ada_mp03_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_ada_mp03_node2.exe
+mp03_ada_mp03_node2_exe_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
+mp03_ada_mp03_node2_exe_SOURCES += ../../../support/init.c
 
-mp03_ada_mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
+mp03_ada_mp03_node2.exe: mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP03_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP03_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp04/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_ada_mp04_node1
-mp04_ada_mp04_node1_SOURCES = mp04_node1.adb ../mptest.adb config.h
-mp04_ada_mp04_node1_SOURCES += ../mptest.ads
-mp04_ada_mp04_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_ada_mp04_node1.exe
+mp04_ada_mp04_node1_exe_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
+mp04_ada_mp04_node1_exe_SOURCES += ../../../support/init.c
 
-mp04_ada_mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
+mp04_ada_mp04_node1.exe: mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP04_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP04_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp04/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_ada_mp04_node2
-mp04_ada_mp04_node2_SOURCES = mp04_node2.adb ../mptest.adb config.h
-mp04_ada_mp04_node2_SOURCES += ../mptest.ads
-mp04_ada_mp04_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_ada_mp04_node2.exe
+mp04_ada_mp04_node2_exe_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
+mp04_ada_mp04_node2_exe_SOURCES += ../../../support/init.c
 
-mp04_ada_mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
+mp04_ada_mp04_node2.exe: mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP04_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP04_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp05/mptest.adb

@@ -204,7 +204,7 @@ package body MPTEST is
 
             exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
 
-            exit when not RTEMS.ARE_STATUSES_EQUAL(STATUS, RTEMS.NOT_DEFINED);
+            exit when not RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.NOT_DEFINED );
    
          end loop;
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" );

c/src/ada-tests/mptests/mp05/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_ada_mp05_node1
-mp05_ada_mp05_node1_SOURCES = mp05_node1.adb ../mptest.adb config.h
-mp05_ada_mp05_node1_SOURCES += ../mptest.ads
-mp05_ada_mp05_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_ada_mp05_node1.exe
+mp05_ada_mp05_node1_exe_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
+mp05_ada_mp05_node1_exe_SOURCES += ../../../support/init.c
 
-mp05_ada_mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
+mp05_ada_mp05_node1.exe: mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP05_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP05_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp05/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_ada_mp05_node2
-mp05_ada_mp05_node2_SOURCES = mp05_node2.adb ../mptest.adb config.h
-mp05_ada_mp05_node2_SOURCES += ../mptest.ads
-mp05_ada_mp05_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_ada_mp05_node2.exe
+mp05_ada_mp05_node2_exe_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
+mp05_ada_mp05_node2_exe_SOURCES += ../../../support/init.c
 
-mp05_ada_mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
+mp05_ada_mp05_node2.exe: mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP05_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP05_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp06/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_ada_mp06_node1
-mp06_ada_mp06_node1_SOURCES = mp06_node1.adb ../mptest.adb config.h
-mp06_ada_mp06_node1_SOURCES += ../mptest.ads
-mp06_ada_mp06_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_ada_mp06_node1.exe
+mp06_ada_mp06_node1_exe_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
+mp06_ada_mp06_node1_exe_SOURCES += ../../../support/init.c
 
-mp06_ada_mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
+mp06_ada_mp06_node1.exe: mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP06_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP06_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp06/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_ada_mp06_node2
-mp06_ada_mp06_node2_SOURCES = mp06_node2.adb ../mptest.adb config.h
-mp06_ada_mp06_node2_SOURCES += ../mptest.ads
-mp06_ada_mp06_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_ada_mp06_node2.exe
+mp06_ada_mp06_node2_exe_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
+mp06_ada_mp06_node2_exe_SOURCES += ../../../support/init.c
 
-mp06_ada_mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
+mp06_ada_mp06_node2.exe: mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP06_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP06_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp07/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_ada_mp07_node1
-mp07_ada_mp07_node1_SOURCES = mp07_node1.adb ../mptest.adb config.h
-mp07_ada_mp07_node1_SOURCES += ../mptest.ads
-mp07_ada_mp07_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_ada_mp07_node1.exe
+mp07_ada_mp07_node1_exe_SOURCES = mp07_node1.adb ../mptest.adb config.h ../mptest.ads
+mp07_ada_mp07_node1_exe_SOURCES += ../../../support/init.c
 
-mp07_ada_mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
+mp07_ada_mp07_node1.exe: mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP07_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP07_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp07/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_ada_mp07_node2
-mp07_ada_mp07_node2_SOURCES = mp07_node2.adb ../mptest.adb config.h
-mp07_ada_mp07_node2_SOURCES += ../mptest.ads
-mp07_ada_mp07_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_ada_mp07_node2.exe
+mp07_ada_mp07_node2_exe_SOURCES = mp07_node2.adb ../mptest.adb config.h ../mptest.ads
+mp07_ada_mp07_node2_exe_SOURCES += ../../../support/init.c
 
-mp07_ada_mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
+mp07_ada_mp07_node2.exe: mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP07_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP07_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp08/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_ada_mp08_node1
-mp08_ada_mp08_node1_SOURCES = mp08_node1.adb ../mptest.adb config.h
-mp08_ada_mp08_node1_SOURCES += ../mptest.ads
-mp08_ada_mp08_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_ada_mp08_node1.exe
+mp08_ada_mp08_node1_exe_SOURCES = mp08_node1.adb ../mptest.adb config.h ../mptest.ads
+mp08_ada_mp08_node1_exe_SOURCES += ../../../support/init.c
 
-mp08_ada_mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
+mp08_ada_mp08_node1.exe: mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP08_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP08_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp08/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_ada_mp08_node2
-mp08_ada_mp08_node2_SOURCES = mp08_node2.adb ../mptest.adb config.h
-mp08_ada_mp08_node2_SOURCES += ../mptest.ads
-mp08_ada_mp08_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_ada_mp08_node2.exe
+mp08_ada_mp08_node2_exe_SOURCES = mp08_node2.adb ../mptest.adb config.h ../mptest.ads
+mp08_ada_mp08_node2_exe_SOURCES += ../../../support/init.c
 
-mp08_ada_mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
+mp08_ada_mp08_node2.exe: mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP08_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP08_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp09/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_ada_mp09_node1
-mp09_ada_mp09_node1_SOURCES = mp09_node1.adb ../mptest.adb config.h
-mp09_ada_mp09_node1_SOURCES += ../mptest.ads
-mp09_ada_mp09_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_ada_mp09_node1.exe
+mp09_ada_mp09_node1_exe_SOURCES = mp09_node1.adb ../mptest.adb config.h ../mptest.ads
+mp09_ada_mp09_node1_exe_SOURCES += ../../../support/init.c
 
-mp09_ada_mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
+mp09_ada_mp09_node1.exe: mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP09_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP09_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp09/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_ada_mp09_node2
-mp09_ada_mp09_node2_SOURCES = mp09_node2.adb ../mptest.adb config.h
-mp09_ada_mp09_node2_SOURCES += ../mptest.ads
-mp09_ada_mp09_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_ada_mp09_node2.exe
+mp09_ada_mp09_node2_exe_SOURCES = mp09_node2.adb ../mptest.adb config.h ../mptest.ads
+mp09_ada_mp09_node2_exe_SOURCES += ../../../support/init.c
 
-mp09_ada_mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
+mp09_ada_mp09_node2.exe: mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP09_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP09_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp10/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_ada_mp10_node1
-mp10_ada_mp10_node1_SOURCES = mp10_node1.adb ../mptest.adb config.h 
-mp10_ada_mp10_node1_SOURCES += ../mptest.ads
-mp10_ada_mp10_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_ada_mp10_node1.exe
+mp10_ada_mp10_node1_exe_SOURCES = mp10_node1.adb ../mptest.adb config.h ../mptest.ads
+mp10_ada_mp10_node1_exe_SOURCES += ../../../support/init.c
 
-mp10_ada_mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
+mp10_ada_mp10_node1.exe: mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP10_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP10_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp10/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_ada_mp10_node2
-mp10_ada_mp10_node2_SOURCES = mp10_node2.adb ../mptest.adb config.h
-mp10_ada_mp10_node2_SOURCES += ../mptest.ads
-mp10_ada_mp10_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_ada_mp10_node2.exe
+mp10_ada_mp10_node2_exe_SOURCES = mp10_node2.adb ../mptest.adb config.h ../mptest.ads
+mp10_ada_mp10_node2_exe_SOURCES += ../../../support/init.c
 
-mp10_ada_mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
+mp10_ada_mp10_node2.exe: mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP10_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP10_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp11/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_ada_mp11_node1
-mp11_ada_mp11_node1_SOURCES = mp11_node1.adb ../mptest.adb config.h
-mp11_ada_mp11_node1_SOURCES += ../mptest.ads
-mp11_ada_mp11_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_ada_mp11_node1.exe
+mp11_ada_mp11_node1_exe_SOURCES = mp11_node1.adb ../mptest.adb config.h ../mptest.ads
+mp11_ada_mp11_node1_exe_SOURCES += ../../../support/init.c
 
-mp11_ada_mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
+mp11_ada_mp11_node1.exe: mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP11_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP11_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp11/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_ada_mp11_node2
-mp11_ada_mp11_node2_SOURCES = mp11_node2.adb ../mptest.adb config.h
-mp11_ada_mp11_node2_SOURCES += ../mptest.ads
-mp11_ada_mp11_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_ada_mp11_node2.exe
+mp11_ada_mp11_node2_exe_SOURCES = mp11_node2.adb ../mptest.adb config.h ../mptest.ads
+mp11_ada_mp11_node2_exe_SOURCES += ../../../support/init.c
 
-mp11_ada_mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
+mp11_ada_mp11_node2.exe: mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP11_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP11_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp12/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_ada_mp12_node1
-mp12_ada_mp12_node1_SOURCES = mp12_node1.adb ../mptest.adb config.h
-mp12_ada_mp12_node1_SOURCES += ../mptest.ads
-mp12_ada_mp12_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_ada_mp12_node1.exe
+mp12_ada_mp12_node1_exe_SOURCES = mp12_node1.adb ../mptest.adb config.h ../mptest.ads
+mp12_ada_mp12_node1_exe_SOURCES += ../../../support/init.c
 
-mp12_ada_mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
+mp12_ada_mp12_node1.exe: mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP12_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP12_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp12/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_ada_mp12_node2
-mp12_ada_mp12_node2_SOURCES = mp12_node2.adb ../mptest.adb config.h
-mp12_ada_mp12_node2_SOURCES += ../mptest.ads
-mp12_ada_mp12_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_ada_mp12_node2.exe
+mp12_ada_mp12_node2_exe_SOURCES = mp12_node2.adb ../mptest.adb config.h ../mptest.ads
+mp12_ada_mp12_node2_exe_SOURCES += ../../../support/init.c
 
-mp12_ada_mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
+mp12_ada_mp12_node2.exe: mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP12_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP12_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp13/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_ada_mp13_node1
-mp13_ada_mp13_node1_SOURCES = mp13_node1.adb ../mptest.adb config.h
-mp13_ada_mp13_node1_SOURCES += ../mptest.ads
-mp13_ada_mp13_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_ada_mp13_node1.exe
+mp13_ada_mp13_node1_exe_SOURCES = mp13_node1.adb ../mptest.adb config.h ../mptest.ads
+mp13_ada_mp13_node1_exe_SOURCES += ../../../support/init.c
 
-mp13_ada_mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
+mp13_ada_mp13_node1.exe: mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP13_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP13_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp13/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_ada_mp13_node2
-mp13_ada_mp13_node2_SOURCES = mp13_node2.adb ../mptest.adb config.h
-mp13_ada_mp13_node2_SOURCES += ../mptest.ads
-mp13_ada_mp13_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_ada_mp13_node2.exe
+mp13_ada_mp13_node2_exe_SOURCES = mp13_node2.adb ../mptest.adb config.h ../mptest.ads
+mp13_ada_mp13_node2_exe_SOURCES += ../../../support/init.c
 
-mp13_ada_mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
+mp13_ada_mp13_node2.exe: mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP13_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP13_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp14/mptest.adb

@@ -58,7 +58,7 @@ package body MPTEST is
       pragma Import (C, BSP_MPCI_PRINT_STATISTICS, "MPCI_Print_statistics" );
    begin
  
-      RTEMS.TASK_MODE(RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, STATUS);
+      RTEMS.TASK_MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
 
       BSP_MPCI_PRINT_STATISTICS;
@@ -101,8 +101,7 @@ package body MPTEST is
 
       RTEMS.TIMER_FIRE_AFTER(
          MPTEST.STOP_TIMER_ID,
-         TEST_SUPPORT.MAXIMUM_LONG_TEST_DURATION *
-            TEST_SUPPORT.TICKS_PER_SECOND,
+         TEST_SUPPORT.MAXIMUM_LONG_TEST_DURATION * TEST_SUPPORT.TICKS_PER_SECOND,
          MPTEST.STOP_TEST_TSR'ACCESS,
          RTEMS.NULL_ADDRESS,
          STATUS

c/src/ada-tests/mptests/mp14/node1/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_ada_mp14_node1
-mp14_ada_mp14_node1_SOURCES = mp14_node1.adb ../mptest.adb config.h
-mp14_ada_mp14_node1_SOURCES += ../mptest.ads
-mp14_ada_mp14_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_ada_mp14_node1.exe
+mp14_ada_mp14_node1_exe_SOURCES = mp14_node1.adb ../mptest.adb config.h ../mptest.ads
+mp14_ada_mp14_node1_exe_SOURCES += ../../../support/init.c
 
-mp14_ada_mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
+mp14_ada_mp14_node1.exe: mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP14_NODE1 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP14_NODE1 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/mptests/mp14/node2/Makefile.am

@@ -7,12 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_ada_mp14_node2
-mp14_ada_mp14_node2_SOURCES = mp14_node2.adb ../mptest.adb config.h
-mp14_ada_mp14_node2_SOURCES += ../mptest.ads
-mp14_ada_mp14_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_ada_mp14_node2.exe
+mp14_ada_mp14_node2_exe_SOURCES = mp14_node2.adb ../mptest.adb config.h ../mptest.ads
+mp14_ada_mp14_node2_exe_SOURCES += ../../../support/init.c
 
-mp14_ada_mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
+mp14_ada_mp14_node2.exe: mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)

c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb

@@ -3,8 +3,7 @@
 --
 --  DESCRIPTION:
 --
---  This is the entry point for Test MP14_NODE2 of the Multiprocessor
---  Test Suite.
+--  This is the entry point for Test MP14_NODE2 of the Single Processor Test Suite.
 --
 --  DEPENDENCIES: 
 --

c/src/ada-tests/samples/base_mp/Makefile.am

@@ -6,7 +6,7 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 SUBDIRS = node1 node2
 #include $(top_srcdir)/ada.am
 
-#mptest$(EXEEXT): mptest.adb
+#mptest.exe: mptest.adb
 #	$(GNATCOMPILE) -margs -a $< -o $@
 
 #if EXPADA