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

Sprout from rtems-4-7-branch 2007-03-05 20:53:27 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2007-03-05	Joel Sherrill <joel@OARcorp.com>'
Delete:
    Makefile.maint
    contrib/apt-conf/.cvsignore
    contrib/apt-conf/COPYING
    contrib/apt-conf/ChangeLog
    contrib/apt-conf/INSTALL
    contrib/apt-conf/Makefile.am
    contrib/apt-conf/README
    contrib/apt-conf/configure.ac
    contrib/apt-conf/gpg/gpg-pubkey-eac29b6f-3fe1f458
    contrib/apt-conf/rtems-apt-conf.spec.in
    contrib/apt-conf/sources.list.d/rtems-4.6.list
    contrib/apt-conf/sources.list.d/rtems-4.7.list
    contrib/apt-conf/vendors.list.d/rtems.list
    contrib/crossrpms/.cvsignore
    contrib/crossrpms/AUTHORS
    contrib/crossrpms/COPYING
    contrib/crossrpms/ChangeLog
    contrib/crossrpms/Makefile.am
    contrib/crossrpms/NEWS
    contrib/crossrpms/README
    contrib/crossrpms/TODO
    contrib/crossrpms/acinclude.m4
    contrib/crossrpms/autotools/.cvsignore
    contrib/crossrpms/autotools/Makefile.am
    contrib/crossrpms/autotools/autoconf.add
    contrib/crossrpms/autotools/autoconf.am
    contrib/crossrpms/autotools/automake.add
    contrib/crossrpms/autotools/automake.am
    contrib/crossrpms/autotools/target-autoconf.add
    contrib/crossrpms/autotools/target-automake.add
    contrib/crossrpms/binutils/.cvsignore
    contrib/crossrpms/binutils/base-binutils.add
    contrib/crossrpms/binutils/binutils.add
    contrib/crossrpms/binutils/build.add
    contrib/crossrpms/binutils/install.add
    contrib/crossrpms/binutils/prep.add
    contrib/crossrpms/binutils/rpm-install.add
    contrib/crossrpms/binutils/target-binutils.add
    contrib/crossrpms/bootstrap
    contrib/crossrpms/common/clean.add
    contrib/crossrpms/common/common.add
    contrib/crossrpms/configure.ac
    contrib/crossrpms/gcc/base-g77.add
    contrib/crossrpms/gcc/base-gcc.add
    contrib/crossrpms/gcc/base-gcj.add
    contrib/crossrpms/gcc/base-gfortran.add
    contrib/crossrpms/gcc/base-gnat.add
    contrib/crossrpms/gcc/base-newlib.add
    contrib/crossrpms/gcc/build.add
    contrib/crossrpms/gcc/gccnewlib.add
    contrib/crossrpms/gcc/install.add
    contrib/crossrpms/gcc/prep.add
    contrib/crossrpms/gcc/rpm-install.add
    contrib/crossrpms/gcc/target-c++.add
    contrib/crossrpms/gcc/target-g77.add
    contrib/crossrpms/gcc/target-gcc.add
    contrib/crossrpms/gcc/target-gcj.add
    contrib/crossrpms/gcc/target-gfortran.add
    contrib/crossrpms/gcc/target-gnat.add
    contrib/crossrpms/gcc/target-newlib.add
    contrib/crossrpms/gcc/target-objc.add
    contrib/crossrpms/gdb/base-gdb.add
    contrib/crossrpms/gdb/build.add
    contrib/crossrpms/gdb/gdb.add
    contrib/crossrpms/gdb/install.add
    contrib/crossrpms/gdb/prep.add
    contrib/crossrpms/gdb/rpm-install.add
    contrib/crossrpms/gdb/target-gdb.add
    contrib/crossrpms/mkspec.am
    contrib/crossrpms/patches/binutils-2.16.1-rtems-20050708.diff
    contrib/crossrpms/patches/binutils-2.17-rtems4.7-20061021.diff
    contrib/crossrpms/patches/gcc-core-4.0.3-rtems-20060822.diff
    contrib/crossrpms/patches/gcc-core-4.1.1-rtems-20060720.diff
    contrib/crossrpms/patches/gcc-core-4.1.1-rtems-20060908.diff
    contrib/crossrpms/patches/gcc-core-4.1.1-rtems-20060909.diff
    contrib/crossrpms/patches/gcc-core-4.1.1-rtems4.7-20070102.diff
    contrib/crossrpms/patches/gcc-core-4.1.2-rtems4.7-20070216.diff
    contrib/crossrpms/patches/gdb-6.4-rtems-20060311.diff
    contrib/crossrpms/patches/gdb-6.4-rtems-20060712.diff
    contrib/crossrpms/patches/gdb-6.5-rtems-20060713.diff
    contrib/crossrpms/patches/gdb-6.6-rtems4.7-20070218.diff
    contrib/crossrpms/patches/gdb-6.6-rtems4.7-20070222.diff
    contrib/crossrpms/patches/newlib-1.14.0-rtems4.7-20061019.diff
    contrib/crossrpms/patches/newlib-1.15.0-rtems4.7-20070208.diff
    contrib/crossrpms/rtems4.7/.cvsignore
    contrib/crossrpms/rtems4.7/Makefile.am
    contrib/crossrpms/rtems4.7/arm/.cvsignore
    contrib/crossrpms/rtems4.7/arm/Makefile.am
    contrib/crossrpms/rtems4.7/arm/binutils-sources.add
    contrib/crossrpms/rtems4.7/arm/gcc-sources.add
    contrib/crossrpms/rtems4.7/arm/gdb-sources.add
    contrib/crossrpms/rtems4.7/avr/.cvsignore
    contrib/crossrpms/rtems4.7/avr/Makefile.am
    contrib/crossrpms/rtems4.7/avr/binutils-sources.add
    contrib/crossrpms/rtems4.7/avr/gcc-sources.add
    contrib/crossrpms/rtems4.7/avr/gdb-sources.add
    contrib/crossrpms/rtems4.7/binutils.am
    contrib/crossrpms/rtems4.7/gcc-prep.add
    contrib/crossrpms/rtems4.7/gcc.am
    contrib/crossrpms/rtems4.7/gdb.am
    contrib/crossrpms/rtems4.7/h8300/.cvsignore
    contrib/crossrpms/rtems4.7/h8300/Makefile.am
    contrib/crossrpms/rtems4.7/h8300/binutils-sources.add
    contrib/crossrpms/rtems4.7/h8300/gcc-sources.add
    contrib/crossrpms/rtems4.7/h8300/gdb-sources.add
    contrib/crossrpms/rtems4.7/i386/.cvsignore
    contrib/crossrpms/rtems4.7/i386/Makefile.am
    contrib/crossrpms/rtems4.7/i386/binutils-sources.add
    contrib/crossrpms/rtems4.7/i386/gcc-sources.add
    contrib/crossrpms/rtems4.7/i386/gdb-sources.add
    contrib/crossrpms/rtems4.7/m68k/.cvsignore
    contrib/crossrpms/rtems4.7/m68k/Makefile.am
    contrib/crossrpms/rtems4.7/m68k/binutils-sources.add
    contrib/crossrpms/rtems4.7/m68k/gcc-sources.add
    contrib/crossrpms/rtems4.7/m68k/gdb-sources.add
    contrib/crossrpms/rtems4.7/mips/.cvsignore
    contrib/crossrpms/rtems4.7/mips/Makefile.am
    contrib/crossrpms/rtems4.7/mips/binutils-sources.add
    contrib/crossrpms/rtems4.7/mips/gcc-sources.add
    contrib/crossrpms/rtems4.7/mips/gdb-sources.add
    contrib/crossrpms/rtems4.7/mipstx39/.cvsignore
    contrib/crossrpms/rtems4.7/mipstx39/Makefile.am
    contrib/crossrpms/rtems4.7/mipstx39/gdb-sources.add
    contrib/crossrpms/rtems4.7/powerpc/.cvsignore
    contrib/crossrpms/rtems4.7/powerpc/Makefile.am
    contrib/crossrpms/rtems4.7/powerpc/binutils-sources.add
    contrib/crossrpms/rtems4.7/powerpc/gcc-sources.add
    contrib/crossrpms/rtems4.7/powerpc/gdb-sources.add
    contrib/crossrpms/rtems4.7/sh/.cvsignore
    contrib/crossrpms/rtems4.7/sh/Makefile.am
    contrib/crossrpms/rtems4.7/sh/binutils-sources.add
    contrib/crossrpms/rtems4.7/sh/gcc-sources.add
    contrib/crossrpms/rtems4.7/sh/gdb-sources.add
    contrib/crossrpms/rtems4.7/sparc/.cvsignore
    contrib/crossrpms/rtems4.7/sparc/Makefile.am
    contrib/crossrpms/rtems4.7/sparc/binutils-sources.add
    contrib/crossrpms/rtems4.7/sparc/gcc-sources.add
    contrib/crossrpms/rtems4.7/sparc/gdb-sources.add
    contrib/crossrpms/specstrip
    contrib/mingw/.cvsignore
    contrib/mingw/AUTHORS
    contrib/mingw/COPYING
    contrib/mingw/ChangeLog
    contrib/mingw/README
    contrib/mingw/build-exes.sh
    contrib/mingw/build-rpms.sh
    contrib/mingw/build.sh
    contrib/mingw/rtems-license.rtf
    contrib/mingw/rtems-tools.nsi
    contrib/mingw/rtems.ini
    contrib/mingw/rtems_logo.bmp
    contrib/mingw/targets
    contrib/repo-conf/.cvsignore
    contrib/repo-conf/AUTHORS
    contrib/repo-conf/COPYING
    contrib/repo-conf/ChangeLog
    contrib/repo-conf/INSTALL
    contrib/repo-conf/Makefile.am
    contrib/repo-conf/NEWS
    contrib/repo-conf/README
    contrib/repo-conf/aclocal/version.m4
    contrib/repo-conf/apt/sources.list.d/.cvsignore
    contrib/repo-conf/apt/sources.list.d/rtems.list.in
    contrib/repo-conf/apt/vendors.list.d/rtems.list
    contrib/repo-conf/configure.ac
    contrib/repo-conf/gpg/gpg-pubkey-69ce4a83-44cc2b30
    contrib/repo-conf/gpg/gpg-pubkey-eac29b6f-3fe1f458
    contrib/repo-conf/rtems-repo-conf.spec.in
    contrib/repo-conf/yum.repos.d/.cvsignore
    contrib/repo-conf/yum.repos.d/rtems.repo.in
    contrib/rtemsrpms/.cvsignore
    contrib/rtemsrpms/AUTHORS
    contrib/rtemsrpms/COPYING
    contrib/rtemsrpms/ChangeLog
    contrib/rtemsrpms/INSTALL
    contrib/rtemsrpms/Makefile.am
    contrib/rtemsrpms/NEWS
    contrib/rtemsrpms/README
    contrib/rtemsrpms/bootstrap
    contrib/rtemsrpms/configure.ac
    contrib/rtemsrpms/rtems.spec.in
    testsuites/samples/base_sp/.cvsignore

.cvsignore

@@ -1,5 +1,6 @@
 aclocal.m4
 autom4te*.cache
+compile
 config.cache
 config.guess
 config.log
@@ -13,5 +14,4 @@ Makefile
 Makefile.in
 mdate-sh
 missing
-mkinstalldirs
 texinfo.tex

ChangeLog

@@ -1,3 +1,574 @@
+2007-02-22	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Use MKDIR_P instead of mkdir_p.
+
+2007-02-21	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.maint: Added TOOL_VERSIONS stanza and fixed typo.
+
+2007-02-14	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* VERSION: sync with */version.m4.
+
+2007-01-08	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* acinclude.m4, configure.ac: AC_PREREQ(2.60).
+
+2007-01-08	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* ampolish3: Use MKDIR_P instead of mkdir_p.
+
+2007-01-08	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Remove scripts/.
+
+2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: New BUG-REPORT address.
+
+2006-11-20	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Add ampolish3.
+	* bootstrap: Add -r (autoreconf).
+
+2006-11-18	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* bootstrap: Add -p (regenerate preinstall.ams).
+
+2006-11-15	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* ampolish3: New.
+
+2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Requires automake-1.10. Require autoconf-2.60.
+	* aclocal/rtems-top.m4, aclocal/version.m4: 
+	Adaptions to automake-1.10.
+
+2006-09-13	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* bspkit: Remove.
+
+2006-08-09	Kolja Waschk <waschk@telos.de>
+
+	* config-ml.in: New port to Altera NIOS II.
+
+2006-07-09      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+	* aclocal/bsp-alias.m4: (PR1117) Add brs5l as alias for gen5200
+	* aclocal/check-bsps.m4: (PR1117) Add brs5l as alias for gen5200
+	
+2006-06-23	Worth Burruss <worth@motioncontrol.org>
+
+	* README.configure: Add mcf5235.
+
+2006-04-18	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-4.6.99.3.
+
+2006-04-18  Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-4.6.99.3.
+
+2006-04-18	Joel Sherrill <joel@OARcorp.com>
+
+	* release_support: Fix typos.
+
+2006-04-18	Joel Sherrill <joel@OARcorp.com>
+
+	* ChangeLog, release_support: Fix typos.
+
+2006-03-09	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* acinclude.m4: Requires autoconf-2.59.
+
+2006-03-07	Joel Sherrill <joel@OARcorp.com>
+
+	PR 694/rtems
+	* release_support: Do not include .cvsignore files in release tarballs.
+
+2006-02-01	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	PR 882/make_build
+	* bootstrap: Only remove bspopts.h.in instead of bspopts.h*.
+
+2006-01-12	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* aclocal/bsp-alias.m4: Revert Joel's 2006-01-10 change.
+	Alpha-sort the aliases list.
+	* automake/host.am, automake/local.am, automake/subdirs.am:
+	Remove depend-am, depend-recursive.
+
+2006-01-10	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/bsp-alias.m4: Add sis as alias of erc32.
+
+2006-01-09	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* aclocal/bsp-alias.m4: Remove brs5l. Remove leon2.
+	Alias leon1 to leon2. Add sis.
+	* aclocal/check_bsps.m4: Remove brs5l.
+	Remove leon. Add leon2. Add sis to erc32 family.
+
+2005-11-31	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	PR 851/bsps
+	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Add gen5200 BSP
+	family.
+
+2005-11-03	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* aclocal/check-bsps.m4: Add the plethora of mbx* BSP.
+
+2005-09-02	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-4.6.99.2.
+
+2005-09-02  Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-4.6.99.2.
+
+2005-07-06      Philippe Simons
+
+	* MAINTAINERS: Added me as arm/gp32 bsp maintainer.
+
+2005-04-28	Joel Sherrill <joel@OARcorp.com>
+
+	* README.configure: Updated to account for removal of dmv177 and
+	ppcn_60x as well as other additions and deletions.
+
+2005-02-04	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* aclocal/enable-itron.m4: Allow unix.
+
+2005-01-02	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Remove ACLOCAL_FILES.
+
+2004-11-16	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/check-bsps.m4: Use ls instead of globs to pickup
+	bsp_specs.
+
+2004-11-12	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/check-bsps.m4: Add MVME2100 BSP as alias of
+	motorola_shared.
+
+2004-11-10	Joel Sherrill <joel@oarcorp.com>
+
+	* aclocal/bsp-alias.m4: Add MVME2100 BSP as alias of motorola_shared.
+
+2004-10-22	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* alocal/check-custom-bsp.m4: Reflect new location of bspkit*cfg.
+
+2004-10-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/check-bsps.m4: Add bspkit support. Don't check for
+	presence of *.cfg.
+	* aclocal/check-custom-bsp.m4: Add bspkit support.
+
+2004-10-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/enable-bare.m4: Remove.
+
+2004-09-29	Joel Sherrill <joel@OARcorp.com>
+
+	* MAINTAINERS, README.configure, c/ACKNOWLEDGEMENTS,
+	c/TOOL_TARGETS: i960 obsoleted and all references removed.
+
+2004-09-24	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* configure.ac: Require automake > 1.9.
+
+2004-09-24	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/rtems-cpu-subdirs.m4: Remove (unused).
+
+2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	PR 673/make_build
+	* config-ml.in: Quote 'cd "${ml_origdir}"'.
+	Quote 'cd "${ML_POPDIR}"'.
+
+2004-08-17	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	PR 673/make_build
+	* acinclude.m4 (_RTEMS_CONFIG_SUBDIR): Quote ac_popdir uses.
+
+2004-07-14      Joel Sherrill <joel@OARcorp.com>
+
+        * MAINTAINERS: Added Jay Monkman as ARM architecture maintainer
+
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/rtems-top.m4: Remove ENDIF. 
+	Remove with_target_subdir defaulting to '.'.
+	* acinclude.m4: Add --includedir to sub_configure_args.
+
+2004-02-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: DIST_SUBDIRS = $(SUBDIRS).
+	Rework dist-hook.
+	* configure.ac: Reflect changes to RTEMS_ENABLE_RTEMSBSP.
+	* aclocal/enable-rtemsbsp.m4: Add support for --disable-rtemsbsp.
+
+2004-02-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: RTEMS_BUILD_CONFIG_SUBDIRS([testsuites/tools]).
+
+2004-02-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove AUTOMAKE_FILES.
+	Cleanup duplicate ACLOCAL_FILES.
+	EXTRA_DIST += config-ml.in.
+	DIST_SUBDIRS += make.
+	Add dist-hook.
+	* configure.ac: Add dist-bzip2 no-dist-gzip to AUTOMAKE_OPTIONS.
+
+2004-02-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bootstrap: RTEMS_CHECK_BSPDIR(RTEMS_BSP_FAMILY).
+
+2004-02-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* VERSION: 4.6.99.0.
+	* aclocal/version.m4: 4.6.99.0.
+
+2004-02-06	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/bsp-alias.m4: Readd aliases for p4600 and p4650
+	which were accidentally removed when purging the mips64orion.
+
+2004-02-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/rpm.m4: Make osversions the default.
+	* aclocal/rtems-top.m4: Remove check for version.m4 (Breaks make
+	distcheck).
+
+2004-02-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/rpm.m4: New (extracted from scripts/configure.ac).
+
+2004-01-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require automake >= 1.8.2.
+	* aclocal/check-bsps.m4: Also test for make/custom/*.cfg.
+
+2004-01-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Requires automake >= 1.8.1.
+
+2004-01-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* .cvsignore: Remove mkinstalldirs.
+	* bootstrap: Remove compile during "clean".
+
+2004-01-08	Joel Sherrill <joel@OARcorp.com>
+
+	* .cvsignore: Add compile.
+
+2004-01-07	Joel Sherrill <joel@OARcorp.com>
+
+	* README.configure: Remove efi68k and efi332 references as they are no
+	longer in the tree.
+
+2004-01-07	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/bsp-alias.m4, aclocal/rtems-cpu-subdirs.m4: mips64orion port
+	removed as mips port more completely covers the MIPS family.
+
+2003-12-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* README.configure: Reflect requireing autoconf-2.59 and
+	automake-1.8.
+
+2003-12-17	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-20031217-test.
+
+2003-12-17  Joel Sherrill <joel@OARcorp.com>
+
+    * aclocal/version.m4: Updated to rtems-20031217-test.
+
+2003-12-17	Joel Sherrill <joel@OARcorp.com>
+
+	* release_support: Correct method used to find ChangeLog associated 
+        with the version.m4 files.  Keep going until I can get a tarball cut.
+
+2003-12-17	Joel Sherrill <joel@OARcorp.com>
+
+	* release_support: Use dirname not basedir.  Keep going until I
+	can get a tarball cut.
+
+2003-12-17	Joel Sherrill <joel@OARcorp.com>
+
+	* release_support: New file -- assistant to new cut_release script.
+
+2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove automake/compile.am
+
+2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/compile.am: Remove (Unused).
+
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/lib.am: Remove (Unused).
+
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require automake >= 1.8, autoconf >= 2.59.
+
+2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove make/custom/Makefile.
+	* Makefile.am: Cosmetics.
+	* automake/compile.am: Remove compilation rules.
+	Remove $(ARCH) directory generation.
+
+2003-11-26	Joel Sherrill <joel@OARcorp.com>
+
+	* MAINTAINERS: New file.
+
+2003-11-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/bsp-alias.m4, aclocal/canonical-target-name.m4,
+	aclocal/check-bsps.m4, aclocal/check-custom-bsp.m4,
+	aclocal/enable-bare.m4, aclocal/enable-cxx.m4,
+	aclocal/enable-inlines.m4, aclocal/enable-itron.m4,
+	aclocal/enable-multiprocessing.m4, aclocal/enable-networking.m4,
+	aclocal/enable-posix.m4, aclocal/enable-rdbg.m4,
+	aclocal/enable-rtems-debug.m4, aclocal/enable-rtemsbsp.m4,
+	aclocal/enable-tests.m4, aclocal/multilib.m4,
+	aclocal/path-ksh.m4, aclocal/project-root.m4,
+	aclocal/rtems-top.m4, aclocal/tool-paths.m4,
+	acinclude.m4:
+	Fix underquoting to silence automake-1.8.
+
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* config-ml.in: Don't built multilib variant normal (-mn) for
+	h8300-*-rtems*.
+
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/config-subdirs.m4: Remove.
+	* Makefile.am: Reflect changes above.
+
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/canonical-host.m4: Remove.
+	* Makefile.am: Reflect changes above.
+
+2003-10-20	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bootstrap: Use $RTEMS_BSP_FAMILY instead of RTEMS_BSP_ALIAS in
+	c/src/lib/libbsp/*/acinclude.m4.
+
+2003-10-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/check-cpu.m4: Remove.
+	* Makefile.am: Remove reference to aclocal/check-cpu.m4.
+	* acinclude.m4 (RTEMS_TARGET_CONFIG_SUBDIR): Check for presence of
+	$1 in $srcdir before adding dir to SUBDIRS.
+
+2003-09-26  Joel Sherrill <joel@OARcorp.com>
+
+	* README.configure, aclocal/rtems-cpu-subdirs.m4: Removing HPPA port.
+
+2003-08-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/enable-rtems-debug.m4: New (Missed in yesterday's
+	patches).
+	* aclocal/enable-tests.m4: Change to support
+	--enable-tests=no|yes|samples, default is samples.
+
+2003-08-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Correct bogus ACLOCAL_FILES.
+
+2003-08-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/bsp-arg-enable.m4, aclocal/bsp-configure.m4,
+	aclocal/bspopts.m4, aclocal/canonicalize-tools.m4,
+	aclocal/check-bsp-cache.m4, aclocal/check-cxx.m4,
+	aclocal/check-itron.m4, aclocal/check-multiprocessing.m4,
+	aclocal/check-networking.m4, aclocal/check-newlib.m4,
+	aclocal/check-posix.m4, aclocal/check-rdbg.m4,
+	aclocal/check-tool.m4, aclocal/env-rtemsbsp.m4,
+	aclocal/gcc-isystem.m4, aclocal/gcc-pipe.m4,
+	aclocal/gcc-specs.m4, aclocal/i386-gas-code16.m4,
+	aclocal/path-perl.m4, aclocal/ppc.m4,
+	aclocal/prog-cc.m4, aclocal/prog-ccas.m4,
+	aclocal/prog-cxx.m4, aclocal/prog-gnat.m4,
+	aclocal/rtems-debug.m4, aclocal/rtems-flags.m4,
+	aclocal/rtems-test-no-pause.m4, aclocal/target.m4:
+	Remove (Unused).
+	* automake/leaf.am, automake/force-preinstall.am:
+	Remove (Unused).
+	* Makefile.am: Reflect changes above.
+
+2003-08-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/local.am, automake/host.am: Remove "debug".
+
+2003-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Use rtems-bugs@rtems.com as bug report email address.
+
+2003-07-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* config-ml.in: Partial sync with gcc-3.4's config-ml.in.
+	Add "autoconf-2.5x unquoting" hack.
+
+2003-07-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* config.sub: Remove (Automatically added by automake, again).
+	* bootstrap: Reflect change above.
+	* configure.ac: Require automake >= 1.7.6.
+
+2003-07-03	Joel Sherrill <joel@OARcorp.com>
+
+	* SUPPORT: Fix Mark Johannes' email address.
+
+2003-07-03	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-ss-20030703.
+
+2003-07-03	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-ss-20030703.
+
+2003-06-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bootstrap: Reflect having added config.sub. 
+	* config.sub: New from subversions to accomodate c4x/tic4x.
+
+2003-06-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	PR 412/make_build
+	* configure.ac: Remove "BLEEDING EDGE" warning.
+	Put docs into RTEMS_BUILD_CONFIG_SUBDIRS.
+	* acinclude.m4: Add AC_PREREQ(2.57).  Major overhaul.
+	* aclocal/prog-cc.m4: Add RTEMS_GCC_ISYSTEM.
+	* aclocal/gcc-isystem.m4: New.
+	* Makefile.am: Add aclocal/gcc-isystem.m4.
+
+2003-06-06      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/local.am: Remove $(ARCH), clean-local.
+
+2003-05-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	PR 321:
+	* aclocal/check-bsp-cache.m4: Remove support for profile-variant.
+	* aclocal/env-rtemsbsp.m4
+	* automake/compile.am
+	* automake/host.am
+	* automake/local.am
+
+2003-05-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/check-cxx.m4: Remove LIBSUFFIX_VA.
+	* automake/compile.am: Remove LIBSUFFIX_VA.
+	Merger from rtems-4-6-branch.
+
+2003-04-17	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-ss-20030417.
+
+2003-04-17	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-ss-20030417.
+
+2003-04-11	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-ss-20030411.
+
+2003-04-11	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-ss-20030411.
+
+2003-04-11	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-ss-20020411.
+
+2003-04-11	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-ss-20020411.
+
+2003-03-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* acinclude.m4: Reformat build_* handling.
+	Preset *_alias if empty.
+	* configure.ac: Change tools/build to build-config dirs.
+	Conditionally build tools/build as host-config dirs.
+
+2003-03-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* acinclude.m4: Fix broken comments.
+	Add hidden option --enable-experimental.
+	* README.cdn-X: Update.
+	* configure.ac:	Build tools/build as host and build-host tools to
+	accomodate those BSPs applying packhex in <BSP>.cfg.
+	Build tools/cpu as build-host tools.
+
+2003-03-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* tools/Makefile.am: Remove.
+	* configure.ac: Remove tools.
+	* acinclude.m4: Fix build_subdir handling.
+	* Makefile.am: Remove tools from SUBDIRS.
+	Rename HOST|BUILD|TARGET_SUBDIRS into host|build|target_SUBDIRS.
+
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+	* alocal/rtems-top.a4: Add AC_CONFIG_AUX_DIR.
+
+2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bootstrap: Add ACLOCAL, AUTOHEADER.
+	Don't check for auto*tool-versions.
+
+2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* config-ml.in: Don't build sh-rtems ml and ml/m2 multilib variants.
+
+2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/compile.am: Introduce depend-gcc.
+	* automake/lib.am: Remove stray comment.
+	* automake/local.am: Introduce depend-gcc.
+
+2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* config-ml.in: Don't build arm-rtems/*fpu* multilib variants.
+
+2003-02-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/rtems-top.m4: Set PROJECT_ROOT unconditionally.
+	* automake/local.am: Remove $(ARCH), clean-local.
+	* automake/compile.am: Add $(ARCH), clean-local.
+	Set CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS).
+
+2003-02-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove references to obsoleted files
+	aclocal/enable-gcc28.m4, aclocal/enable-libcdir.m4.
+
+2003-02-14	Joel Sherrill <joel@OARcorp.com>
+
+	* README.configure, aclocal/rtems-cpu-subdirs.m4: Remove a29k
+	references.
+
+2003-02-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/canonical-target-name.m4: Transform tic4x -> RTEMS_CPU=c4x.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bootstrap: Remove attempts to detect autoconf and automake using

MAINTAINERS

@@ -0,0 +1,55 @@
+Note
+====
+
+This file contains information about people who are permitted to make
+changes to various parts of RTEMS and its associated components and
+add-ons.
+
+Please do not contact the people in this file directly to report
+problems with RTEMS.
+
+For general information about RTEMS, please visit:
+
+  http://www.rtems.com
+
+To report problems in RTEMS, please visit:
+
+  http://www.rtems.com/bugs.html
+
+Maintainers
+===========
+
+		Blanket Write Privileges (alphabetical order)
+
+Jennifer Averett				jennifer@oarcorp.com
+Ralf Corsepius					ralf.corsepius@rtems.org
+Chris Johns					chris.johns@rtems.com
+Eric Norum					eric.norum@rtems.com
+Joel Sherrill					joel.sherrill@oarcorp.com
+
+		Various Component Maintainers
+
+Networking		NAME-TBD		EMAIL-TBD
+
+			CPU Port Maintainers	(CPU alphabetical order)
+
+arm			Jay Monkman		jtm@lopingdog.com
+avr			Ralf Corsepius		ralf.corsepius@rtems.org
+c4x			Joel Sherrill		joel.sherrill@OARcorp.com
+h8300			NAME-TBD		EMAIL-TBD
+i386			NAME-TBD		EMAIL-TBD
+m68k			NAME-TBD		EMAIL-TBD
+mips			NAME-TBD		EMAIL-TBD
+no_cpu			NAME-TBD		EMAIL-TBD
+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)
+
+CPU/BSP			NAME-TBD		EMAIL-TBD
+arm/edb7312  		Jay Monkman		jtm@lopingdog.com
+arm/gp32		Philippe Simons		loki_666@fastmail.fm
+

Makefile.am

@@ -1,41 +1,44 @@
 #
 # top level directory for RTEMS build tree
 #
-## The target's toplevel Makefile now is in c/src
 ##
 ## $Id$
 ##
 
 ACLOCAL_AMFLAGS = -I aclocal
 
-SUBDIRS = tools make $(BUILD_SUBDIRS) $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
-
-AUTOMAKE_FILES = automake/compile.am automake/host.am automake/lib.am \
-    automake/local.am automake/subdirs.am \
-    automake/leaf.am automake/force-preinstall.am
-
-ACLOCAL_FILES = aclocal/bsp-alias.m4 aclocal/canonical-host.m4 \
-    aclocal/canonical-target-name.m4 aclocal/canonicalize-tools.m4 \
-    aclocal/check-bsp-cache.m4 aclocal/check-bsps.m4 aclocal/check-cpu.m4 \
-    aclocal/check-cxx.m4 aclocal/check-itron.m4 \
-    aclocal/check-multiprocessing.m4 aclocal/check-networking.m4 \
-    aclocal/check-newlib.m4 aclocal/check-posix.m4 aclocal/check-rdbg.m4 \
-    aclocal/enable-bare.m4 aclocal/enable-cxx.m4 aclocal/enable-gcc28.m4 \
-    aclocal/enable-inlines.m4 aclocal/enable-itron.m4 aclocal/enable-libcdir.m4 \
-    aclocal/enable-multiprocessing.m4 aclocal/enable-networking.m4 \
-    aclocal/enable-posix.m4 aclocal/enable-rdbg.m4 aclocal/enable-rtemsbsp.m4 \
-    aclocal/enable-tests.m4 aclocal/gcc-pipe.m4 aclocal/gcc-specs.m4 \
-    aclocal/i386-gas-code16.m4 aclocal/multilib.m4 aclocal/path-ksh.m4 \
-    aclocal/path-perl.m4 aclocal/prog-cc.m4 aclocal/prog-cxx.m4 \
-    aclocal/project-root.m4 aclocal/rtems-debug.m4 \
-    aclocal/rtems-test-no-pause.m4 aclocal/rtems-top.m4 \
-    aclocal/target.m4 aclocal/tool-paths.m4 aclocal/bspopts.m4 \
-    aclocal/ppc.m4 aclocal/bsp-configure.m4
+SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
+DIST_SUBDIRS = $(SUBDIRS)
 
 noinst_SCRIPTS = bootstrap
 
-EXTRA_DIST = $(AUTOMAKE_FILES) $(ACLOCAL_FILES) README.configure SUPPORT \
-    VERSION LICENSE $(noinst_SCRIPTS)
+EXTRA_DIST = README.configure SUPPORT VERSION LICENSE $(noinst_SCRIPTS)
+EXTRA_DIST += config-ml.in
+EXTRA_DIST += ampolish3
+
+dist-hook:
+	@files=`(cd $(srcdir); find doc cpukit c testsuites tools \
+	   -name configure.ac -print | sed 's,/configure.ac,,' | sort)`; \
+	for i in $$files; do \
+	  if test -f $(distdir)/$$i/configure.ac; then : ; \
+	  else \
+	    d=`dirname $(distdir)/$$i`; \
+	    $(MKDIR_P) $$d;\
+	    echo "cp -pR $(srcdir)/$$i $(distdir)/$$i"; \
+	    cp -pR $(srcdir)/$$i $(distdir)/$$i; \
+	  fi; \
+	done
+	rm -rf `find $(distdir) -name 'autom4te*'`
+	rm -rf `find $(distdir) -name CVS`
+	rm -f `find $(distdir) \( -name .cvsignore \
+	  -o -name config.status \
+	  -o -name config.log \)`
+	rm -f `find $(distdir) \( -name '*.bak' \
+	  -o -name 'changes' -o -name 'diff' -o -name 'tmp' -o -name 'log' \
+	  -o -name '*~' -o -name '.*~' -o -name '.#*' \)`
+	find $(distdir) -name '*.in' -print | while read a; do \
+	  f=`echo $$a | sed 's,\.in$$,,'`; \
+	  if test -f $$f; then echo "rm $$f"; rm $$f; fi; done
 
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/host.am

README.cdn-X

@@ -38,7 +38,7 @@ mkdir build
 cd build
 <path>/rtems/configure [options] \
 --target=sparc-rtems \
---prefix=/opt/cygwin/rtems/sparc-rtems
+--prefix=/opt/cygwin
 make
 make install
 
@@ -56,11 +56,11 @@ cd host
 --target=sparc-rtems \
 --build=`<path>/rtems/config.guess` \
 --host=i386-cygwin \
---prefix=/opt/cygwin/rtems
+--prefix=/opt/cygwin
 make
 make install
 
-This will build RTEMS host-tools for i386-cygwin and install it to the given
+This will build RTEMS host-tools for i386-cygwin and install them to the given
 PREFIX.
 
 
@@ -70,16 +70,4 @@ PREFIX.
 * At present time, building RTEMS Canadian Cross is known to be immature, and
 to require additional work. Do not expect this to work.
 
-* The configure scripts expect to find a native c-compiler called "cc". If
-your host doesn't have such a "cc" (e.g. Cygwin) or has a non-functional
-"cc" (eg. Solaris) try introducing a symlink <functional-cc> -> cc
-(E.g.: ln -s <path-to>/gcc /opt/rtems/bin/cc) and make sure this cc can be
-found on $PATH.
-
-* It will *not* work for all BSPs requiring BSP-specific host-tools 
-(Unfortunately, this comprizes i386-rtems/pcx86 and all powerpc BSPs).
-
-* Incomplete support for *_FOR_TARGET, *_FOR_HOST, *_FOR_BUILD environment
-variables.
-
 * The <toplevel>/make/ directory hierarchy is not treated correctly.

README.configure

@@ -11,7 +11,7 @@ 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.57 and automake-1.7.2 are required.
+autoconf-2.59 and automake-1.8 are required.
 
 2. Installation
 ===============
@@ -91,16 +91,14 @@ The following targets are supported:
 	(none)			will build the host-based version on Linux,
 				Solaris and HPUX.
 
-	a29k-rtems		only standalone, uses non-gnu compiler
         arm-rtems
+        c4x-rtems
         h8300-rtems
 	i386-rtems
-	i960-rtems
-	hppa1.1-rtems
 	m68k-rtems
 	mips-rtems
-	mips64orion-rtems
         no_cpu-rtems
+        or32-rtems
 	powerpc-rtems
 	sh-rtems
 	sparc-rtems
@@ -120,13 +118,13 @@ BSPs to build only works from the top level build directory.
 
 Installation is done under $(prefix)/rtems.
 
-As an example, to build and install the mvme136 and dmv152 bsps for m68k do:
+As an example, to build and install the mvme136 and mvme162 bsps for m68k do:
 
 	(path_to_rtems_src)/configure --target=m68k-rtems
 
-	make RTEMS_BSP="mvme136 dmv152"
+	make RTEMS_BSP="mvme136 mvme162"
 	
-	make install RTEMS_BSP="mvme136 dmv152"
+	make install RTEMS_BSP="mvme136 mvme162"
 
 The sample tests are built by 'make all', do a 'make test' to build the full
 test suite.
@@ -178,9 +176,9 @@ The following bsps are supported:
 
 host-based	: posix (on Linux, FreeBSD, Cygwin, Solaris, and HPUX)
 
-arm             : arm_bare_bsp armulator edb7312 vegaplus
+arm             : arm_bare_bsp armulator csb336 csb337 edb7312 gp32 vegaplus
 
-c4x             : c4xsim
+c4x             : c3xsim c4xsim
 
 h8300           : h8sim
 
@@ -189,21 +187,18 @@ i386		: i386ex pc386 pc386dx pc486 pc586 pc686 pck6 ts_386ex
                         variety of PC configurations including PC-104
                         based solutions.
 
-i960		: cvme961 i960sim rxgen960
-
-m68k		: dmv152 efi332 efi68k gen68302 gen68340 gen68360 
-                  gen68360_040 idp mcf5206elite mrm332 mvme136 mvme147
-                  mvme147s mvme162 mvme162lx ods68302
+m68k		: av5282 csb360 dmv152 gen68302 gen68340 gen68360 gen68360_040 
+                  idp mcf5206elite mcf5235 mrm332 mvme136 mvme147 mvme147s
+                  mvme162 mvme162lx ods68302 sim68000 simcpu32 uC5282
 
 no_cpu          : no_bsp  (porting example)
 
-mips            : p4600 p4650 (p4000 port with either R4600 or R4650)
-                  jmr3904 genmongoosev
+mips            : csb350 genmongoosev
+                  p4600 p4650 (p4000 port with either R4600 or R4650)
+                  jmr3904
 
-or32:           : orp
-
-powerpc		: dmv177 eth_comm gen405 helas403 mcp750 mbx8xx mtx603e
-                  mvme230x ppcn_60x psim score603e
+powerpc		: ep1a gen405 helas403 mcp750 mbx8xx mtx603e
+                  mpc8260ads mvme230x mvme5500 psim score603e ss555
 
                   NOTE: The "motorola_powerpc" BSP is a single BSP which
                   can be conditionally compiled to support most Motorola
@@ -215,19 +210,9 @@ sparc 		: erc32 erc32nfp leon1 leon2
 
 any             : bare
 
-The following ports are considered deprecated and will be removed in
-a future release:
+The following ports were considered obsoleted after the 4.6 releases
+and were removed: a29k, hppa, i960, mips64orion, and or32.
 
-a29k		: portsw
-
-hppa1.1		: simhppa
-
-mips64orion 	: (deprecated)
-                  p4600 p4650 (p4000 port with either R4600 or R4650)
-
-                  NOTE: MIPS support is NOT being dropped.  This is a clean up
-                        effort and the mips64orion BSPs and CPUs will be
-                        supported by the mips port.
 
 5. Makefile structure
 =====================
@@ -261,7 +246,6 @@ The native (posix) ports have been built and run only on Linux.
 The following configurations have NOT been tested:
 
     + Anything on Nextstep, HPUX and Irix.
-    + The a29k port
     + The C4x and OR32 ports (requires specially patched toolchain)
 
 8. Prerequisites

SUPPORT

@@ -8,7 +8,7 @@ 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 Mark Johannes at mark@OARcorp.com 
+For more information, email Mark Johannes at mark.johannes@OARcorp.com 
 or contact OAR at:
 
 On-Line Applications Research Corporation

VERSION

@@ -4,4 +4,4 @@
 #  $Id$
 #
 
-RTEMS Version ss-20030128
+RTEMS Version 4.7.0

acinclude.m4

@@ -3,6 +3,7 @@
 ## ${TARGET_CONFIGDIRS_LIST} is directories we build using the target tools.
 ## ${BUILD_CONFIGDIRS_LIST} is directories we build using the build tools
 
+AC_PREREQ(2.60)
 
 dnl RTEMS_ARG_VAR(VAR,HELP-STRING)
 dnl An internal macros to have help strings pretty
@@ -23,68 +24,96 @@ AC_DEFUN([_RTEMS_SUBST_IFNOT],
   [AC_SUBST([$1],["[$]$1 $2"])])
 ])
 
+AC_DEFUN([_RTEMS_TOOLS],
+[
+m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
+[
+_RTEMS_ARG_VAR([CC_FOR_$2],
+  [c-compiler to be used for $1 subdirs (default: auto-detected)])
+_RTEMS_ARG_VAR([CFLAGS_FOR_$2],
+  [c-flags to be used for $1 subdirs (default: provided by autoconf)])
+_RTEMS_ARG_VAR([CXX_FOR_$2],
+  [c++-compiler to be used for $1 subdirs (default: auto-detected)])
+_RTEMS_ARG_VAR([CXXFLAGS_FOR_$2],
+  [c++-flags to be used for $1 subdirs (default: provided by autoconf)])
+])
+])
+
 AC_DEFUN([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS],
 [
 AC_CONFIG_COMMANDS_PRE([
+
+if test -z "${build_alias}"; then
+# build_alias is empty
+  if test -z "${host_alias}"; then
+  # host_alias is empty
+    if test -z "${target_alias}"; then
+    : target_alias is empty
+    else
+    : target_alias is not empty
+    fi
+  else
+  # host_alias is not empty
+    if test -z "${target_alias}"; then
+    : target_alias is empty
+    target_alias="${host_alias}"
+    else
+    : target_alias is not empty
+    fi
+  fi
+else
+# build_alias is not empty
+  if test -z "${host_alias}"; then
+  # host_alias is empty
+    if test -z "${target_alias}"; then
+    : target_alias is empty
+    else
+    : target_alias is not empty
+    fi
+  else
+  # host_alias is not empty
+    if test -z "${target_alias}"; then
+    : target_alias is empty
+    target_alias="${host_alias}"
+    else
+    : target_alias is not empty
+    fi
+  fi
+fi
+
 _RTEMS_BUILD_CONFIG_PREPARE
 _RTEMS_HOST_CONFIG_PREPARE
 _RTEMS_TARGET_CONFIG_PREPARE
 
-AS_IF([test $build = $host],
-[
-  AS_IF([test $host = $target],
-  [dnl b=h, h=t, t=b
-    BUILD_SUBDIRS="${build_configdirs}"
-    build_configdirs="${build_configdirs}"
-    HOST_SUBDIRS=""
-    host_configdirs=""
-    TARGET_SUBDIRS=""
-    target_configdirs=""],
-  [dnl b=h, h!=t, t!=b
-    BUILD_SUBDIRS="${build_configdirs}"
-    build_configdirs="${build_configdirs}"
-    HOST_SUBDIRS=""
-    host_configdirs=""
-    TARGET_SUBDIRS=`echo "${target_configdirs}" | \
-      sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
-    target_configdirs="${target_configdirs}"
-  ])
-],[
-  AS_IF([test $host = $target],
-  [ dnl b!=h, h=t, b!=t
-    BUILD_SUBDIRS="${build_configdirs}"
-    build_configdirs="${build_configdirs}"
-    HOST_SUBDIRS=`echo "${host_configdirs}" | \
-      sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
-    host_configdirs="${host_configdirs}"
-    TARGET_SUBDIRS=""
-    target_configdirs=""],
-  [
-    AS_IF([test $build = $target],
-    [dnl b!=h, h!=t, b=t
-      BUILD_SUBDIRS="${build_configdirs}"
-      build_configdirs="${build_configdirs}"
-      HOST_SUBDIRS=`echo "${host_configdirs}" | \
-        sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
-      host_configdirs="${host_configdirs}"
-      TARGET_SUBDIRS=""
-      target_configdirs=""],
-    [dnl b!=h, h!=t, b!=t
-      BUILD_SUBDIRS="${build_configdirs}"
-      build_configdirs="${build_configdirs}"
-      HOST_SUBDIRS=`echo "${host_configdirs}" | \
-        sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
-      host_configdirs="${host_configdirs}"
-      TARGET_SUBDIRS=`echo "${target_configdirs}" | \
-        sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
-      target_configdirs="${target_configdirs}"
-    ])
-  ])
+build_subdir="."
+build_SUBDIRS="${build_configdirs}"
+build_configdirs="${build_configdirs}"
+
+AS_IF([test $build != $host],
+[dnl
+  host_subdir="${host_alias-$host}"
+  host_SUBDIRS=`echo "${host_configdirs}" | \
+        sed -e "s%\([[^ ]][[^ ]]*\)%$host_subdir/\1%g"`
+  host_configdirs="${host_configdirs}"
+],[dnl
+  host_SUBDIRS="${host_configdirs}"
+  host_configdirs="${host_configdirs}"
 ])
 
-AC_SUBST(HOST_SUBDIRS)
-AC_SUBST(TARGET_SUBDIRS)
-AC_SUBST(BUILD_SUBDIRS)
+AS_IF([test $build != $target],
+[dnl
+  target_subdir="${target_alias-$target}"
+  target_SUBDIRS=`echo "${target_configdirs}" | \
+      sed -e "s%\([[^ ]][[^ ]]*\)%$target_subdir/\1%g"`
+  target_configdirs="${target_configdirs}"
+],[dnl
+  target_SUBDIRS="${target_configdirs}"
+  target_configdirs="${target_configdirs}"
+])
+
+AC_SUBST(host_SUBDIRS)
+AC_SUBST(target_SUBDIRS)
+AC_SUBST(build_SUBDIRS)
 ])
 
   AC_CONFIG_COMMANDS_POST([
@@ -160,33 +189,27 @@ dnl _RTEMS_OUTPUT_SUBDIRS([host|target|build],[HOST|TARGET|BUILD])
 AC_DEFUN([_RTEMS_OUTPUT_SUBDIRS],[
 m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
 [
-_RTEMS_ARG_VAR([CC_FOR_$2],
-  [c-compiler to be used for $1 subdirs (default: auto-detected)])
-_RTEMS_ARG_VAR([CFLAGS_FOR_$2],
-  [c-flags to be used for $1 subdirs (default: provided by autoconf)])
-_RTEMS_ARG_VAR([CXX_FOR_$2],
-  [c++-compiler to be used for $1 subdirs (default: auto-detected)])
-_RTEMS_ARG_VAR([CXXFLAGS_FOR_$2],
-  [c++-flags to be used for $1 subdirs (default: provided by autoconf)])
 if test "$no_recursion" != yes; then
 
- if test -n "${$2_SUBDIRS}"; then
+ if test -n "${$1_SUBDIRS}"; then
    ac_sub_configure_args="[$]$1args"
 
   # Always prepend --prefix to ensure using the same prefix
   # in subdir configurations.
   ac_sub_configure_args="'--prefix=$prefix' $ac_sub_configure_args"
 
+  # make sure that $1_subdir is not empty
+  test -n "$$1_subdir" || $1_subdir="."
+
   case "$$1_subdir" in
   "." ) ;;
   * )
-    ac_sub_configure_args="$ac_sub_configure_args '--with-target-subdir=$$1_subdir' '--exec-prefix=${prefix}/$$1_subdir'"
+    ac_sub_configure_args="$ac_sub_configure_args '--with-target-subdir=$$1_subdir'"
+    ac_sub_configure_args="$ac_sub_configure_args '--exec-prefix=${prefix}/$$1_subdir'"
+    ac_sub_configure_args="$ac_sub_configure_args '--includedir=${prefix}/$$1_subdir/include'"
     ;;
   esac
 
-  # make sure that $1_subdir is not empty
-  test -n "$$1_subdir" || $1_subdir="."
-
   ac_popdir=`pwd`
   for ac_dir in $$1_configdirs; do
 
@@ -240,25 +263,13 @@ if test "$no_recursion" != yes; then
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir])
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
  fi
 fi
 ])
 ])
 
-## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
-# subdirs to be built for the build environment
-AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
-m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
-dnl Always append to build_configdirs
-AC_SUBST(build_configdirs,"$build_configdirs $1")
-
-m4_divert_text([DEFAULTS],
-               [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
-m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
-])
-
 AC_DEFUN([_RTEMS_CONFIGURE_ARGS_PRUNE],
 [
 $1_prune()
@@ -311,20 +322,30 @@ $1_prune()
 }
 ])
 
-AC_DEFUN(_RTEMS_BUILD_CONFIG_PREPARE,[
+## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
+# subdirs to be built for the build environment
+AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
+m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
+dnl Always append to build_configdirs
+AC_SUBST(build_configdirs,"$build_configdirs $1")
+
+m4_divert_text([DEFAULTS],
+               [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
+m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
+])
+
+AC_DEFUN([_RTEMS_BUILD_CONFIG_PREPARE],[
 ## # Record the configure arguments in Makefile.
 m4_ifdef([_RTEMS_BUILD_CONFIGDIRS_LIST],
 [
+m4_expand_once([_RTEMS_TOOLS([build],[BUILD])])
 m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([buildargs])])
 eval buildargs_prune $ac_configure_args
-buildargs="'--host=${build}' '--build=${build}' ${buildargs}"
-test -n "${target_alias}" && \
-buildargs="${buildargs} --target='${target_alias}'"
-
-## AC_SUBST(buildargs)
-
-build_subdir="."
+buildargs="'--host=${build_alias-$build}' '--build=${build_alias-$build}' ${buildargs}"
+buildargs="${buildargs} '--target=${target_alias-$target}'"
 ],[])
+AC_SUBST(buildargs)
+AC_SUBST(build_subdir)
 ])
 
 ## PUBLIC: RTEMS_HOST_CONFIG_SUBDIRS(host_subdir)
@@ -332,75 +353,47 @@ build_subdir="."
 AC_DEFUN([RTEMS_HOST_CONFIG_SUBDIRS],[
 m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl
 
-if test $build = $host;
-then
-  AS_IF([test $host = $target],
-    [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
-    [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])]
-  )
-else
-  AS_IF([test $host = $target],
-    [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
-    [AS_IF([test $build = $target],
-      [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
-      [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])]
-    )]
-  )
-fi
+_RTEMS_SUBST_IFNOT([host_configdirs],[$1])
 
 m4_divert_text([DEFAULTS],
                [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
 m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
 ])
 
-AC_DEFUN(_RTEMS_HOST_CONFIG_PREPARE,[
+AC_DEFUN([_RTEMS_HOST_CONFIG_PREPARE],[
 m4_ifdef([_RTEMS_HOST_CONFIGDIRS_LIST],
 [
-## Record configure arguments in Makefile.
+m4_expand_once([_RTEMS_TOOLS([host],[HOST])])
 m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([hostargs])])
 eval hostargs_prune $ac_configure_args
-hostargs="'--host=${host_alias}' '--build=${build}' '--target=${target_alias}' ${hostargs}"
-## AC_SUBST(hostargs)
-
-host_subdir="${host_alias}"
+hostargs="'--host=${host_alias-$host}' '--build=${build_alias-$build}' '--target=${target_alias-$target}' ${hostargs}"
 ],[])
+AC_SUBST(hostargs)
+AC_SUBST(host_subdir)
 ])
 
 ## PUBLIC: RTEMS_TARGET_CONFIG_SUBDIRS(target_subdir)
 # subdirs to be build for the target environment
 AC_DEFUN([RTEMS_TARGET_CONFIG_SUBDIRS],[
+AS_IF([test -d ${srcdir}/$1],[
 m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1])
 
-if test $build = $host;
-then
-  AS_IF([test $host = $target],
-    [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
-    [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
-  )
-else
-  AS_IF([test $host = $target],
-    [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
-    [AS_IF([test $build = $target],
-      [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
-      [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
-    )]
-  )
-fi
+_RTEMS_SUBST_IFNOT([target_configdirs],[$1])
 
 m4_divert_text([DEFAULTS],
                [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
 m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
+  ])
 ])
 
-AC_DEFUN(_RTEMS_TARGET_CONFIG_PREPARE,[
+AC_DEFUN([_RTEMS_TARGET_CONFIG_PREPARE],[
 m4_ifdef([_RTEMS_TARGET_CONFIGDIRS_LIST],
 [
-## Record the configure arguments in Makefile.
+m4_expand_once([_RTEMS_TOOLS([target],[TARGET])])
 m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([targetargs])])
 eval targetargs_prune $ac_configure_args
-targetargs="'--host=${target_alias}' '--build=${build}' '--target=${target_alias}' ${targetargs}"
-## AC_SUBST(targetargs)
-
-target_subdir="${target_alias}"
+targetargs="'--host=${target_alias-$target}' '--build=${build_alias-$build}' '--target=${target_alias-$target}' ${targetargs}"
 ],[])
+AC_SUBST(targetargs)
+AC_SUBST(target_subdir)
 ])

aclocal/bsp-alias.m4

@@ -4,37 +4,40 @@ dnl
 
 dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN(_RTEMS_BSP_ALIAS,
+AC_DEFUN([_RTEMS_BSP_ALIAS],
 [# account for "aliased" bsps which share source code
   case $1 in
-    simcpu32)     $2=sim68000         ;; # BSVC CPU32 variant
+    bare*)        $2=bare             ;; # EXP: bare-aliases
     c3xsim)       $2=c4xsim           ;; # TI C3x Simulator in gdb
+    erc32nfp)     $2=erc32            ;; # erc32 without fpu
+    gen68360_040) $2=gen68360         ;; # m68k - 68360 in companion mode
+    leon1)     	  $2=leon2            ;; # leon without fpu
+    mbx8*)        $2=mbx8xx           ;; # MBX821/MBX860 board
     mcp750)       $2=motorola_powerpc ;; # Motorola PPC board variant
-    mvme2307)     $2=motorola_powerpc ;; # Motorola PPC board variant
     mtx603e)      $2=motorola_powerpc ;; # Motorola PPC board variant
     mvme162lx)    $2=mvme162          ;; # m68k - mvme162 board variant
-    gen68360_040) $2=gen68360         ;; # m68k - 68360 in companion mode
-    p4600)        $2=p4000            ;; # mips64orion - p4000 board w/IDT 4600
-    p4650)        $2=p4000            ;; # mips64orion - p4000 board w/IDT 4650
-    mbx8*)        $2=mbx8xx           ;; # MBX821/MBX860 board
+    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
-    bare*)        $2=bare             ;; # EXP: bare-aliases
-    erc32nfp)     $2=erc32            ;; # erc32 without fpu
-    leon1)     	  $2=leon             ;; # leon without fpu
-    leon2)     	  $2=leon             ;; # leon with fpu
+    brs5l*)       $2=gen5200          ;; # MPC5200 based board
+    pm520*)       $2=gen5200          ;; # MPC5200 based board
+    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
-AC_DEFUN(RTEMS_BSP_ALIAS,
+AC_DEFUN([RTEMS_BSP_ALIAS],
 [_RTEMS_BSP_ALIAS(m4_if([$1],,[$RTEMS_BSP],[$1]),
   m4_if([$2],,[RTEMS_BSP_FAMILY],[$2]))]
 )

aclocal/bsp-configure.m4

@@ -1,35 +0,0 @@
-dnl $Id$
-
-dnl RTEMS_BSP_CONFIGURE
-dnl Common macro to be included by all bsp-configure.acs
-AC_DEFUN([RTEMS_BSP_CONFIGURE],
-[
-  AC_PREREQ([2.52])
-  AM_MAINTAINER_MODE
-  RTEMS_ENV_RTEMSBSP
-
-  RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
-  RTEMS_CANONICAL_HOST
-  AM_CONFIG_HEADER([include/bspopts.tmp:include/bspopts.h.in],[
-echo "/* BSP dependent options file */"         >$tmp/config.h
-echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
-echo                                                  >>$tmp/config.h
-echo "#ifndef __BSP_OPTIONS_h"                        >>$tmp/config.h
-echo "#define __BSP_OPTIONS_h"                        >>$tmp/config.h
-echo                                                  >>$tmp/config.h
-sed -e '/.*PACKAGE.*/d' include/bspopts.tmp >> $tmp/config.h
-echo                                                  >>$tmp/config.h
-echo "#endif"                                         >>$tmp/config.h
-  AS_IF([cmp -s include/bspopts.h $tmp/config.h 2>/dev/null],[
-    AC_MSG_NOTICE([include/bspopts.h is unchanged])
-    rm -f $tmp/config.h],[
-    AC_MSG_NOTICE([creating include/bspopts.h])
-    rm -f include/bspopts.h
-    mv $tmp/config.h include/bspopts.h
-  ])
-])
-  RTEMS_PROJECT_ROOT
-
-  RTEMS_CHECK_MULTIPROCESSING
-])

aclocal/canonical-host.m4

@@ -1,25 +0,0 @@
-dnl $Id$
-
-AC_DEFUN(RTEMS_CANONICAL_HOST,
-[dnl
-AC_REQUIRE([AC_CANONICAL_HOST])
-RTEMS_HOST=$host_os
-case "${target}" in
-  # hpux unix port should go here
-  i[[34567]]86-*linux*)          # unix "simulator" port
-        RTEMS_HOST=Linux
-	;;
-  i[[34567]]86-*freebsd*)         # unix "simulator" port
-        RTEMS_HOST=FreeBSD
-	;;
-  i[[34567]]86-pc-cygwin*) 	# Cygwin is just enough unix like :)
-        RTEMS_HOST=Cygwin
-	;;
-  sparc-sun-solaris*)           # unix "simulator" port
-        RTEMS_HOST=Solaris
-	;;
-  *) 
-	;;
-esac
-AC_SUBST(RTEMS_HOST)
-])dnl

aclocal/canonical-target-name.m4

@@ -8,7 +8,7 @@ dnl target naming conventions "processor-vendor-os"
 dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
 dnl and we have to fix it for rtems ourselves 
 
-AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
+AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
 [
 AC_CANONICAL_TARGET
 AC_MSG_CHECKING(rtems target cpu)
@@ -29,6 +29,9 @@ case "${target}" in
   sparc-sun-solaris*)           # unix "simulator" port
 	RTEMS_CPU=unix
 	;;
+  tic4x-*rtems*)          	# gcc changed the name
+	RTEMS_CPU=c4x
+	;;
   *) 
 	RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
 	;;

aclocal/canonicalize-tools.m4

@@ -1,23 +0,0 @@
-dnl
-dnl $Id$
-dnl
-dnl Set target tools
-dnl
-
-AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
-[AC_REQUIRE([RTEMS_PROG_CC])dnl
-
-dnl FIXME: What shall be done if these tools are not available?
-  RTEMS_CHECK_TOOL(AR,ar,no)
-  RTEMS_CHECK_TOOL(AS,as,no)
-  RTEMS_CHECK_TOOL(LD,ld,no)
-  RTEMS_CHECK_TOOL(NM,nm,no)
-
-dnl special treatment of ranlib
-  RTEMS_CHECK_TOOL(RANLIB,ranlib,:)
-
-dnl NOTE: These may not be available if not using gnutools
-  RTEMS_CHECK_TOOL(OBJCOPY,objcopy,no)
-  RTEMS_CHECK_TOOL(SIZE,size,no)
-  RTEMS_CHECK_TOOL(STRIP,strip,:)
-])

aclocal/check-bsp-cache.m4

@@ -1,39 +0,0 @@
-dnl $Id$
-
-dnl RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-AC_DEFUN([RTEMS_CHECK_BSP_CACHE],
-[
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
-AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl set RTEMS_BSP
-AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
-
-AC_CACHE_CHECK([for RTEMS_CPU_MODEL], [rtems_cv_RTEMS_CPU_MODEL],
-[. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache])
-RTEMS_CPU_MODEL=$rtems_cv_RTEMS_CPU_MODEL
-AC_SUBST(RTEMS_CPU_MODEL)
-
-AC_CACHE_CHECK([for RTEMS_BSP_FAMILY],[rtems_cv_RTEMS_BSP_FAMILY],
-[. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache])
-RTEMS_BSP_FAMILY=$rtems_cv_RTEMS_BSP_FAMILY
-AC_SUBST(RTEMS_BSP_FAMILY)
-
-AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS],[rtems_cv_RTEMS_BSP_CFLAGS],
-[. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache])
-RTEMS_BSP_CFLAGS=$rtems_cv_RTEMS_BSP_CFLAGS
-AC_SUBST(RTEMS_BSP_CFLAGS)
-
-AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS_OPTIMIZE_V],[rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V],
-[. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache])
-RTEMS_BSP_CFLAGS_OPTIMIZE_V=$rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V
-AC_SUBST(RTEMS_BSP_CFLAGS_OPTIMIZE_V)
-
-AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS_DEBUG_V],[rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V],
-[. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache])
-RTEMS_BSP_CFLAGS_DEBUG_V=$rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V
-AC_SUBST(RTEMS_BSP_CFLAGS_DEBUG_V)
-
-AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS_PROFILE_V],[rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V],
-[. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache])
-RTEMS_BSP_CFLAGS_PROFILE_V=$rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V
-AC_SUBST(RTEMS_BSP_CFLAGS_PROFILE_V)
-])

aclocal/check-bsps.m4

@@ -1,33 +1,43 @@
 dnl $Id$
 
-dnl Report all available bsps for a target,
-dnl check if a bsp-subdirectory is present for all bsps found
+dnl Report all available bsps for a target within the source tree
 dnl
 dnl RTEMS_CHECK_BSPS(bsp_list)
-AC_DEFUN(RTEMS_CHECK_BSPS,
+AC_DEFUN([RTEMS_CHECK_BSPS],
 [
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
-AC_MSG_CHECKING([for bsps])
-    files=`ls $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU`
-    for file in $files; do
-      if test -r $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$file/bsp_specs; then
-        case $file in
+
+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$,,"`
+    case $bsp_family in
         # Now account for BSPs with build variants
-          c4xsim)            $1="[$]$1 c4xsim c3xsim";;
-          gen68360)          $1="[$]$1 gen68360 gen68360_040";;
-          p4000)             $1="[$]$1 p4600 p4650";;
-          mvme162)           $1="[$]$1 mvme162 mvme162lx";;
-          mbx8xx)            $1="[$]$1 mbx821_001 mbx860_002 mbx860_005b";;
-	  motorola_powerpc)  $1="[$]$1 mvme2307 mcp750 mtx603e";;
-	  pc386)             $1="[$]$1 pc386 pc386dx pc486 pc586 pc686 pck6";;
-	  erc32)             $1="[$]$1 erc32 erc32nfp";;
-	  leon)              $1="[$]$1 leon1 leon2";;
-	  sim68000)          $1="[$]$1 sim68000 simcpu32";;
-	  shsim)             $1="[$]$1 simsh7032 simsh7045";;
-	  *) 		     $1="[$]$1 $file";;
-        esac;
-      fi
-    done
-AC_MSG_RESULT([[$]$1 .. done])
+          c4xsim)            bsps="c4xsim c3xsim";;
+          gen68360)          bsps="gen68360 gen68360_040";;
+          p4000)             bsps="p4600 p4650";;
+          mvme162)           bsps="mvme162 mvme162lx";;
+          mbx8xx)            bsps="mbx821_001 mbx860_001b"
+                             bsps="$bsps mbx821_002 mbx821_002b"
+                             bsps="$bsps mbx860_1b"
+                             bsps="$bsps mbx860_002"
+                             bsps="$bsps mbx860_005b"
+                             ;;
+          gen5200)           bsps="pm520_cr825 pm520_ze30 brs5l";;
+	  motorola_powerpc)  bsps="mvme2307 mcp750 mtx603e mvme2100";;
+	  pc386)             bsps="pc386 pc386dx pc486 pc586 pc686 pck6";;
+          erc32)             bsps="erc32 erc32nfp sis";;
+	  leon2)             bsps="leon1 leon2";;
+	  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])],
+    [AC_MSG_RESULT([$]$1)])
 ])dnl

aclocal/check-cpu.m4

@@ -1,18 +0,0 @@
-dnl $Id$
-
-dnl check if RTEMS support a cpu
-AC_DEFUN(RTEMS_CHECK_CPU,
-[dnl
-AC_REQUIRE([RTEMS_TOP])
-AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
-
-# Is this a supported CPU?
-AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
-# FIXME: Temporary hack
-if test -d "$srcdir/$RTEMS_TOPdir/cpukit/score/cpu/$RTEMS_CPU"; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_ERROR(no)
-fi
-])dnl
-

aclocal/check-custom-bsp.m4

@@ -1,10 +1,24 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CHECK_CUSTOM_BSP,[
-AC_REQUIRE([RTEMS_TOP])
-
-AC_MSG_CHECKING([for make/custom/[$]$1.cfg])
-AS_IF([test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"],
-  [AC_MSG_RESULT([yes])],
-  [AC_MSG_ERROR([no])])
+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=
+  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],[
+  AC_REQUIRE([RTEMS_TOP])
+  _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
 ])

aclocal/check-cxx.m4

@@ -1,26 +0,0 @@
-dnl $Id$
-dnl
-AC_DEFUN(RTEMS_CHECK_CXX,
-[dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
-AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
-AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl
-AC_CACHE_CHECK([whether to build rtems++],
-  rtems_cv_HAS_CPLUSPLUS,
-  [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
-      if test -n "$CXX"; then
-        rtems_cv_HAS_CPLUSPLUS="yes"
-      else
-        rtems_cv_HAS_CPLUSPLUS="no"
-      fi
-    else
-      rtems_cv_HAS_CPLUSPLUS="no"
-    fi])
-HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
-AC_SUBST(HAS_CPLUSPLUS)dnl
-
-if test "$HAS_CPLUSPLUS" = "yes"; then
-CPLUS_LD_LIBS='$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)'
-fi
-AC_SUBST(CPLUS_LD_LIBS)
-])

aclocal/check-newlib.m4

@@ -1,30 +0,0 @@
-dnl $Id$
-
-AC_DEFUN(RTEMS_CHECK_NEWLIB,
-[dnl
-AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
-AC_REQUIRE([RTEMS_CANONICALIZE_TOOLS])dnl
-AC_CACHE_CHECK([for RTEMS newlib],
-  rtems_cv_use_newlib,
-  [
-dnl some versions of newlib provide not_required_by_rtems
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[extern void not_required_by_rtems() ;]], 
-        [[not_required_by_rtems()]])],
-      [rtems_cv_use_newlib="yes"],[])
-
-dnl some versions of newlib provide rtems_provides_crt0()
-    AS_IF([test -z "$rtems_cv_use_newlib"],
-      [AC_LINK_IFELSE(
-         [AC_LANG_PROGRAM([[extern void rtems_provides_crt0() ;]],
-           [[rtems_provides_crt0()]])],
-         [rtems_cv_use_newlib="yes"],[rtems_cv_use_newlib="no"])
-    ])
-  ])
-  RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"
-  AC_SUBST(RTEMS_USE_NEWLIB)
-
-  AS_IF([test x"${RTEMS_USE_NEWLIB}" = x"yes"],
-    [ AC_DEFINE_UNQUOTED(RTEMS_NEWLIB,1,[if using newlib])]
-  )
-])

aclocal/check-rdbg.m4

@@ -1,41 +0,0 @@
-dnl $Id$
-dnl
-AC_DEFUN(RTEMS_CHECK_RDBG,
-[dnl
-AC_REQUIRE([RTEMS_TOP])dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
-AC_REQUIRE([RTEMS_CHECK_NETWORKING])dnl
-AC_REQUIRE([RTEMS_ENABLE_RDBG])dnl
-AC_CACHE_CHECK([whether BSP supports librdbg],
-  rtems_cv_HAS_RDBG,
-  [
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/librdbg/src/${RTEMS_CPU}/${$1}";
-    then
-      rtems_cv_HAS_RDBG="yes" ;
-    elif test -d "$srcdir/${RTEMS_TOPdir}/c/src/librdbg/src/${RTEMS_CPU}/any"; 
-    then
-      rtems_cv_HAS_RDBG="yes" ;
-    elif test "${RTEMS_CPU}" = "powerpc"; 
-    then
-	A=`grep -l RTEMS_PPC_EXCEPTION_PROCESSING_MODEL $srcdir/${RTEMS_TOPdir}/make/custom/* 2>/dev/null`;
-	C=""
-	for i in ${A} ;
-	do
-	   B=`basename ${i} .cfg`;
-	   C="${C} ${B}";
-	done
-	rtems_cv_HAS_RDBG="no";
-	for j in ${C} ;
-	do
-		if test "${$1}" = "${j}" ;
-		then
-			rtems_cv_HAS_RDBG="yes";
-		fi
-	done
-    else
-      rtems_cv_HAS_RDBG="no";
-    fi
-  ])
-HAS_RDBG="$rtems_cv_HAS_RDBG"
-AC_SUBST(HAS_RDBG)
-])

aclocal/check-tool.m4

@@ -1,11 +0,0 @@
-dnl $Id$
-
-## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to
-## the un-prefixed version of PROG-TO-CHECK-FOR.
-dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(RTEMS_CHECK_TOOL,
-[
-  AS_IF([test "x$build_alias" != "x$host_alias"],
-    [rtems_tool_prefix=${ac_tool_prefix}])
-  AC_CHECK_PROG($1, ${rtems_tool_prefix}$2, ${rtems_tool_prefix}$2, $3, $4)
-])

aclocal/enable-bare.m4

@@ -1,21 +0,0 @@
-AC_DEFUN(RTEMS_ENABLE_BARE,
-[
-AC_ARG_ENABLE(bare-cpu-cflags,
-[AC_HELP_STRING([--enable-bare-cpu-cflags],
-[specify a particular cpu cflag (bare bsp specific)])],
-[case "${enableval}" in
-  no) BARE_CPU_CFLAGS="" ;;
-  *)    BARE_CPU_CFLAGS="${enableval}" ;;
-esac],
-[BARE_CPU_CFLAGS=""])
-
-AC_ARG_ENABLE(bare-cpu-model,
-[AC_HELP_STRING([--enable-bare-cpu-model],
-[specify a particular cpu model (bare bsp specific)])],
-[case "${enableval}" in
-  no)   BARE_CPU_MODEL="" ;;
-  *)    BARE_CPU_MODEL="${enableval}" ;;
-esac],
-[BARE_CPU_MODEL=""])
-])
-

aclocal/enable-cxx.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_CXX,
+AC_DEFUN([RTEMS_ENABLE_CXX],
 [
 AC_ARG_ENABLE(cxx,
 [AC_HELP_STRING([--enable-cxx],

aclocal/enable-inlines.m4

@@ -1,17 +1,11 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_INLINES,
+AC_DEFUN([RTEMS_ENABLE_INLINES],
 [AC_ARG_ENABLE(rtems-inlines,
-[AC_HELP_STRING([--enable-rtems-inlines],
-[enable RTEMS inline functions (default:enabled, disable to use macros)])],
+AC_HELP_STRING([--enable-rtems-inlines],[enable RTEMS inline functions (default:enabled, disable to use macros)]),
 [case "${enableval}" in
-  yes) RTEMS_USE_MACROS=no ;;
-  no) RTEMS_USE_MACROS=yes ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
-esac],[RTEMS_USE_MACROS=no])
-AC_SUBST(RTEMS_USE_MACROS)dnl
-
-AS_IF([test x"${RTEMS_USE_MACROS}" = x"yes"],
-  [AC_DEFINE_UNQUOTED(USE_MACROS,1,[if using macros])],
-  [AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines])])
+  yes) enable_rtems_inlines=yes ;;
+  no) enable_rtems_inlines=no ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-rtems-inlines option) ;;
+esac],[enable_rtems_inlines=yes])
 ])

aclocal/enable-itron.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_ITRON,
+AC_DEFUN([RTEMS_ENABLE_ITRON],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 
@@ -11,23 +11,4 @@ AC_ARG_ENABLE(itron,
   no) RTEMS_HAS_ITRON_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-itron option) ;;
 esac],[RTEMS_HAS_ITRON_API=yes]) 
-
-case "${host}" in
-  # hpux unix port should go here
-  i[[34567]]86-pc-linux*)         # unix "simulator" port
-	RTEMS_HAS_ITRON_API=no
-	;;
-  i[[34567]]86-*freebsd*) # unix "simulator" port
-	RTEMS_HAS_ITRON_API=no
-	;;
-  no_cpu-*rtems*)
-	RTEMS_HAS_ITRON_API=no
-	;;
-  sparc-sun-solaris*)             # unix "simulator" port
-	RTEMS_HAS_ITRON_API=no
-	;;
-  *) 
-	;;
-esac
-AC_SUBST(RTEMS_HAS_ITRON_API)
 ])

aclocal/enable-multiprocessing.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
+AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
 [AC_HELP_STRING([--enable-multiprocessing],

aclocal/enable-networking.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_NETWORKING,
+AC_DEFUN([RTEMS_ENABLE_NETWORKING],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 

aclocal/enable-posix.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_POSIX,
+AC_DEFUN([RTEMS_ENABLE_POSIX],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 

aclocal/enable-rdbg.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_RDBG,
+AC_DEFUN([RTEMS_ENABLE_RDBG],
 [
 AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
 

aclocal/enable-rtems-debug.m4

@@ -0,0 +1,12 @@
+## $Id$
+
+AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
+[
+AC_ARG_ENABLE(rtems-debug,
+AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
+[case "${enable_rtems_debug}" in
+  yes) enable_rtems_debug=yes ;;
+  no)  enable_rtems_debug=no ;;
+  *) AC_MSG_ERROR([bad value ${enable_rtems_debug} for RTEMS_DEBUG]) ;;
+esac],[enable_rtems_debug=no])
+])

aclocal/enable-rtemsbsp.m4

@@ -3,14 +3,15 @@ dnl $Id$
 dnl Override the set of BSPs to be built.
 dnl used by the toplevel configure script
 dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list)
-AC_DEFUN(RTEMS_ENABLE_RTEMSBSP,
+AC_DEFUN([RTEMS_ENABLE_RTEMSBSP],
 [
 AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
 AC_ARG_ENABLE(rtemsbsp,
 [AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
 [BSPs to include in build])],
-[case "${enableval}" in
-  yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp="bsp1 bsp2"]);;
-  *) $1=$enableval;;
-esac],[$1=""])
+[case "${enable_rtemsbsp}" in
+  yes ) enable_rtemsbsp="" ;;
+  no ) enable_rtemsbsp="no" ;;
+  *) enable_rtemsbsp="$enable_rtemsbsp" ;;
+esac],[enable_rtemsbsp=""])
 ])

aclocal/enable-tests.m4

@@ -1,15 +1,13 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_TESTS,
+AC_DEFUN([RTEMS_ENABLE_TESTS],
 [
-# If the tests are enabled, then find all the test suite Makefiles
-AC_MSG_CHECKING([if the test suites are enabled? ])
 AC_ARG_ENABLE(tests,
-[AC_HELP_STRING([--enable-tests],[enable tests (default:disabled)])],
+[AC_HELP_STRING([--enable-tests],[enable tests (default:samples)])],
   [case "${enableval}" in
-    yes) tests_enabled=yes ;;
-    no)  tests_enabled=no ;;
-    *)   AC_MSG_ERROR(bad value ${enableval} for tests option) ;;
-  esac], [tests_enabled=no])
-AC_MSG_RESULT([$tests_enabled])
+    samples) enable_tests=samples;;
+    yes) enable_tests=yes ;;
+    no)  enable_tests=no ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for --enable-tests]) ;;
+  esac], [enable_tests=samples])
 ])

aclocal/env-rtemsbsp.m4

@@ -1,57 +0,0 @@
-dnl $Id$
-
-dnl Pass a single BSP via an environment variable
-dnl used by per BSP configure scripts
-AC_DEFUN(RTEMS_ENV_RTEMSBSP,
-[dnl
-AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
-AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
-AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
-
-AC_ARG_VAR([CPU_CFLAGS],[CFLAGS specifying CPU-dependent features])
-AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[CFLAGS for building the OPTIMIZE variant])
-AC_ARG_VAR([CFLAGS_DEBUG_V],[CFLAGS for building the DEBUG variant])
-AC_ARG_VAR([CFLAGS_PROFILE_V],[CFLAGS for building the PROFILE variant])
-AC_ARG_VAR([RTEMS_BSP_FAMILY],[RTEMS's BSP directory])
-AC_ARG_VAR([RTEMS_CPU_MODEL],[RTEMS's cpu model])
-
-AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
-AC_MSG_CHECKING([for RTEMS_BSP])
-AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
-[dnl
-  test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP";
-])dnl
-if test -z "$rtems_cv_RTEMS_BSP"; then
-  AC_MSG_ERROR([Missing RTEMS_BSP])
-fi
-RTEMS_BSP="$rtems_cv_RTEMS_BSP"
-AC_MSG_RESULT(${RTEMS_BSP})
-AC_SUBST(RTEMS_BSP)
-
-RTEMS_BSP_SPECS="-specs bsp_specs -qrtems"
-AC_SUBST(RTEMS_BSP_SPECS)
-
-GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
-AC_SUBST(GCC_SPECS)
-
-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
-PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP"   
-AC_SUBST(PROJECT_RELEASE)
-
-RTEMS_ROOT="\$(PROJECT_ROOT)/c/$RTEMS_BSP"
-AC_SUBST(RTEMS_ROOT)
-
-RTEMS_ENABLE_BARE
-AC_SUBST(BARE_CPU_MODEL)
-AC_SUBST(BARE_CPU_CFLAGS)
-
-AM_CONDITIONAL([MULTILIB],[false])
-
-includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
-libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
-
-bsplibdir="\${exec_prefix}/${RTEMS_BSP}/lib"
-AC_SUBST(bsplibdir)
-])

aclocal/gcc-specs.m4

@@ -1,20 +0,0 @@
-dnl
-dnl $Id$
-dnl
-dnl Check whether the target compiler accepts -specs
-dnl
-
-AC_DEFUN(RTEMS_GCC_SPECS,
-[AC_REQUIRE([RTEMS_PROG_CC])
-AC_CACHE_CHECK(whether $CC accepts -specs,rtems_cv_gcc_specs,
-[
-rtems_cv_gcc_specs=no
-if test x"$GCC" = x"yes"; then
-  touch confspec
-  echo 'void f(){}' >conftest.c
-  if test -z "`${CC} -specs confspec -c conftest.c 2>&1`";then
-    rtems_cv_gcc_specs=yes
-  fi
-fi
-rm -f confspec conftest*
-])])

aclocal/multilib.m4

@@ -2,7 +2,7 @@ dnl This provides configure definitions used for multilib support
 
 dnl parts of these macros are derived from newlib-1.8.2's multilib support
 
-AC_DEFUN(RTEMS_ENABLE_MULTILIB,
+AC_DEFUN([RTEMS_ENABLE_MULTILIB],
 [
 AC_ARG_ENABLE(multilib,
 AC_HELP_STRING([--enable-multilib],

aclocal/path-ksh.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_PATH_KSH,
+AC_DEFUN([RTEMS_PATH_KSH],
 [
 dnl NOTE: prefer bash over ksh over sh
 AC_PATH_PROGS(KSH,bash ksh sh)

aclocal/path-perl.m4

@@ -1,12 +0,0 @@
-dnl $Id$
-
-AC_DEFUN(RTEMS_PATH_PERL,
-[
-AC_PATH_PROG(PERL,perl)
-if test -z "$PERL" ; then
-AC_MSG_WARN(
-[***]
-[   perl was not found]
-[   Note: Some tools will not be built.])
-fi
-])

aclocal/ppc.m4

@@ -1,87 +0,0 @@
-# $Id$
-#
-# Some hacks for handling powerpc-exception subdirectories
-#
-# Note: Consider this file a temporary band-aid until a better, more general
-# subdirectory handling solution is introduced to RTEMS.
-
-AC_DEFUN([RTEMS_PPC_EXCEPTIONS],
-[
-exceptions="$1_exception_processing"
-AC_SUBST(exceptions)
-
-AC_CONFIG_COMMANDS_POST(
-[
- exceptions_subdirs="$1_exception_processing"
- updir=/../support
-
-if test "$no_recursion" != yes; then
-
-  RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
-
-  for ac_subdir in : $exceptions_subdirs; do test "x$ac_subdir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d $srcdir${updir}/$ac_subdir || continue
-
-    AC_MSG_NOTICE([configuring in $ac_subdir])
-    case $srcdir in
-    .) ;;
-    *) AS_MKDIR_P(["./$ac_subdir"])
-       if test -d ./$ac_subdir; then :;
-       else
-         AC_MSG_ERROR([cannot create `pwd`/$ac_subdir])
-       fi
-       ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_subdir
-
-    # A "../" for each directory in /$ac_subdir.
-    ac_dots=`echo $ac_subdir |
-             sed 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g'`
-
-    case $srcdir in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir${updir} ;;
-    [[\\/]]* | ?:[[\\/]]* ) # Absolute path.
-      ac_sub_srcdir=$srcdir${updir}/$ac_subdir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir${updir}/$ac_subdir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"
-    elif test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure'"
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      AC_MSG_WARN([no configuration information is in $ac_subdir])
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file=$ac_dots$cache_file ;;
-      esac
-
-      AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
-      # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
-           --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
-        AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
-    fi
-
-    cd $ac_popdir
-  done
-fi
-])
-])

aclocal/prog-cc.m4

@@ -1,39 +0,0 @@
-dnl
-dnl $Id$
-dnl 
-dnl Check for target gcc
-dnl
-
-AC_DEFUN(RTEMS_PROG_CC,
-[
-AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_BEFORE([$0], [AC_PROG_CC])dnl
-AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
-
-_RTEMS_FLAGS([CFLAGS],
-  ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"])
-
-RTEMS_CHECK_TOOL(CC,gcc)
-test -z "$CC" && \
-  AC_MSG_ERROR([no acceptable cc found in \$PATH])
-AC_PROG_CC
-AC_PROG_CPP
-
-AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
-])
-
-AC_DEFUN(RTEMS_PROG_CC_FOR_TARGET,
-[
-dnl check target cc
-RTEMS_PROG_CC
-dnl check if the compiler supports --specs
-RTEMS_GCC_SPECS
-dnl check if the target compiler may use --pipe
-RTEMS_GCC_PIPE
-test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
-
-if test "$GCC" = yes; then
-RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
-m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
-fi
-])

aclocal/prog-ccas.m4

@@ -1,8 +0,0 @@
-## $Id$
-
-AC_DEFUN([RTEMS_PROG_CCAS],
-[
-AC_REQUIRE([RTEMS_PROG_CC])
-AC_SUBST(CCAS,["$CC \$(GCCSPECS)"])
-AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"])
-])

aclocal/prog-cxx.m4

@@ -1,35 +0,0 @@
-dnl
-dnl $Id$
-dnl 
-dnl Check for target g++
-dnl 
-
-AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
-[
-AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
-AC_REQUIRE([RTEMS_ENABLE_CXX])
-RTEMS_CHECK_TOOL(CXX,g++)
-if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
-then
-_RTEMS_FLAGS([CXXFLAGS],
-  ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"])
-
-dnl Only accept g++
-dnl NOTE: This might be too restrictive
-test -z "$CXX" \
-  && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
-AC_PROG_CXX
-
-  if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
-    AC_MSG_ERROR([***]
-     [Inconsistency in compiler configuration:]
-     [Target C compiler and target C++ compiler]
-     [must both either be cross compilers or native compilers]
-     [Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
-  fi
-
-else
-## Work-around to a bug in automake
-AM_CONDITIONAL([am__fastdepCXX],[false])
-fi
-])

aclocal/prog-gnat.m4

@@ -1,26 +0,0 @@
-## $Id$
-##
-## WARNING: All the stuff below is pretty immature.
-
-AC_DEFUN([RTEMS_PROG_GNAT],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])
-AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])
-
-AC_ARG_VAR([GNATMAKE],[GNATMAKE compiler command])
-AC_ARG_VAR([ADAFLAGS],[ADA compiler flags])
-
-RTEMS_CHECK_TOOL([GNATMAKE],[gnatmake],[])
-AS_IF([test -z "$GNATMAKE"],[AC_MSG_ERROR([No GNATMAKE found])])
-
-AC_MSG_CHECKING([whether $GNATMAKE works])
-rm -f conftest.*
-cat >conftest.adb <<EOF
-procedure conftest is begin null; end conftest;
-EOF
-
-AS_IF([$GNATMAKE -c conftest.adb 1>>config.log 2>&1],
-    [HAVE_GNAT=yes],
-    [HAVE_GNAT=no])
-AC_MSG_RESULT([$HAVE_GNAT])
-rm -f conftest.*
-])

aclocal/project-root.m4

@@ -12,7 +12,7 @@ dnl RTEMS_ROOT         .. path to the top of a bsp's build directory
 dnl                       [Applied by custom/*.cfg, depredicated otherwise]
 dnl
 
-AC_DEFUN(RTEMS_PROJECT_ROOT,
+AC_DEFUN([RTEMS_PROJECT_ROOT],
 [dnl
 AC_REQUIRE([RTEMS_TOP])
 

aclocal/rpm.m4

@@ -0,0 +1,20 @@
+AC_DEFUN([RTEMS_ENABLE_RPMPREFIX],[
+AC_ARG_ENABLE([rpmprefix],
+[  --enable-rpmprefix=<rpmprefix>      prefix rpms],
+[case $enable_rpmprefix in
+yes ) rpmprefix="rtems-"]RTEMS_API["-";;
+no ) rpmprefix="%{nil}";;
+* ) AS_IF([test -z "$enable_rpmprefix"],
+      [rpmprefix="%{nil}"],
+      [rpmprefix="$enable_rpmprefix"]);;
+esac],
+[rpmprefix="rtems-"]RTEMS_API["-"])
+
+AC_ARG_ENABLE([osversions],
+[  --enable-osversions       whether to use version numbers in os-tripples],
+[case $enable_osversions in
+yes ) osversion=RTEMS_API;;
+* ) osversion=;;
+esac],
+[osversion=RTEMS_API])
+])

aclocal/rtems-cpu-subdirs.m4

@@ -1,31 +0,0 @@
-AC_DEFUN([_RTEMS_CPU_SUBDIR],
-[
-$1 )	if test -d ${srcdir}/ifelse([$2],,[$1],[$2/$1]) ; then
-  AC_CONFIG_SUBDIRS(ifelse([$2],,[$1],[$2/$1]))
-  fi
-])
-
-## RTEMS_CPU_SUBDIRS([PREFIX])
-AC_DEFUN([RTEMS_CPU_SUBDIRS],
-[
-## EDIT: If adding a new cpu to RTEMS, add it to the case block below.
-case $RTEMS_CPU in
-_RTEMS_CPU_SUBDIR([a29k],[$1]);;
-_RTEMS_CPU_SUBDIR([arm],[$1]);;
-_RTEMS_CPU_SUBDIR([c4x],[$1]);;
-_RTEMS_CPU_SUBDIR([h8300],[$1]);;
-_RTEMS_CPU_SUBDIR([hppa1.1],[$1]);;
-_RTEMS_CPU_SUBDIR([i386],[$1]);;
-_RTEMS_CPU_SUBDIR([i960],[$1]);;
-_RTEMS_CPU_SUBDIR([m68k],[$1]);;
-_RTEMS_CPU_SUBDIR([mips],[$1]);;
-_RTEMS_CPU_SUBDIR([mips64orion],[$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
-])

aclocal/rtems-debug.m4

@@ -1,19 +0,0 @@
-## $Id$
-
-AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG,
-[
-AC_ARG_ENABLE(rtems-debug,
-AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
-[case "${enable_rtems_debug}" in
-  yes) enable_rtems_debug=yes ;;
-  no)  enable_rtems_debug=no ;;
-  *) AC_MSG_ERROR([bad value ${enable_rtems_debug} for RTEMS_DEBUG]) ;;
-esac],[enable_rtems_debug=no])
-])
-
-AC_DEFUN(RTEMS_CHECK_RTEMS_DEBUG,
-[AC_REQUIRE([RTEMS_ENABLE_RTEMS_DEBUG])
-AS_IF([test x"${enable_rtems_debug}" = x"yes"]
-  [AC_DEFINE_UNQUOTED(RTEMS_DEBUG,1,[if RTEMS_DEBUG is enabled])])
-])
-

aclocal/rtems-test-no-pause.m4

@@ -1,18 +0,0 @@
-AC_DEFUN(RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE,
-[AC_ARG_ENABLE(test-no-pause,
-AC_HELP_STRING([--disable-test-no-pause],[disable RTEMS_TEST_NO_PAUSE]),
-[case "${enableval}" in
-  yes) RTEMS_TEST_NO_PAUSE=yes ;;
-  no) RTEMS_TEST_NO_PAUSE=no ;;
-  *) AC_MSG_ERROR([bad value ${enableval} for RTEMS_TEST_NO_PAUSE]) ;;
-esac],[RTEMS_TEST_NO_PAUSE=yes])
-])
-
-AC_DEFUN(RTEMS_CHECK_RTEMS_TEST_NO_PAUSE,
-[AC_REQUIRE([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE])
-if test x"${RTEMS_TEST_NO_PAUSE}" = x"yes";
-then
-  AC_DEFINE_UNQUOTED(RTEMS_TEST_NO_PAUSE,1,[if RTEMS_TEST_NO_PAUSE is enabled])
-fi
-])
-

aclocal/rtems-top.m4

@@ -5,48 +5,26 @@ dnl RTEMS_TOP($1)
 dnl 
 dnl $1 .. relative path from this configure.in to the toplevel configure.in
 dnl
-AC_DEFUN(RTEMS_TOP,
+AC_DEFUN([RTEMS_TOP],
 [dnl
 AC_REQUIRE([RTEMS_VERSIONING])
+AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)
-AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
-AC_PREFIX_DEFAULT([/opt/rtems])
-
-## HACK to allow gnu-make conditionals in automake-Makefiles.
-ENDIF=endif
-AC_SUBST(ENDIF)
+AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
 
 RTEMS_TOPdir="$1";
 AC_SUBST(RTEMS_TOPdir)
 
-## with_target_subdirs is handled implicitly by autoconf
-test -n "$with_target_subdir" || with_target_subdir="."
-
-if test "$with_target_subdir" = "." ; then
-# Native
-PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
-else
-# Cross
 dots=`echo $with_target_subdir|\
-sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
+sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
 PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
-fi
 AC_SUBST(PROJECT_TOPdir)
 
-if test "$with_target_subdir" = "." ; then
-# Native
 PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-else
-# Cross
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-fi
 AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])
-AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
-[],
-[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
 AC_MSG_RESULT([_RTEMS_VERSION])
 ])dnl

aclocal/tool-paths.m4

@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_TOOLPATHS,
+AC_DEFUN([RTEMS_TOOLPATHS],
 [
 # tooldir='$(exec_prefix)/'$target_alias
 # Temporary work-around until building in source tree is supported

aclocal/version.m4

@@ -1,2 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[ss-20030128]))
+m4_define([_RTEMS_VERSION],[4.7.0]))
+
+m4_define([RTEMS_API],[4.7])

ampolish3

@@ -0,0 +1,276 @@
+#! /usr/bin/perl -w
+
+# $Id$
+
+# Copyright (C) 2005, 2006 Ralf Corsépius, Ulm, Germany
+#
+# Permission to use, copy, modify, and distribute this software
+# is freely granted, provided that this notice is preserved.
+
+# Helper script to generate pre/tmpinstall rules for RTEMS Makefile.am.
+#
+# Usage: ampolish3 Makefile.am > preinstall.am
+#
+# Reads a Makefile.am from stdin and writes corresponding 
+# pre/tmpinstall rules to stdout.
+
+sub replace($);
+sub print_dirstamp($$$);
+
+# Predefined directory mappings:
+#
+# final-installation directory => temp installation directory
+my %dirmap = (
+   '$(includedir)' 		=> '$(PROJECT_INCLUDE)',
+   '$(libdir)' 			=> '$(PROJECT_LIB)',
+   '$(project_libdir)' 		=> '$(PROJECT_LIB)',
+   '$(project_includedir)' 	=> '$(PROJECT_INCLUDE)'
+  );
+
+# Conventions on automake primaries:
+#
+# *_HEADERS -> preinstall
+# noinst*_HEADERS -> noinst
+# noinst_*_LIBRARIES -> noinst
+# project_*_LIBRARIES -> tmpinstall
+# *_LIBRARIES -> ignore (no preinstallation)
+# dist_project_*_DATA -> preinstall (bsp_specs,linkcmds)
+# project_*_DATA -> tmpinstall (*.o, *.a)
+# dist_*_DATA -> ignore (no preinstallation)
+# *SCRIPTS -> ignore (no preinstallation)
+# noinst_*_PROGRAMS -> noinst
+# project_*_PROGRAMS -> tmpinstall
+# *_PROGRAMS -> ignore (no preinstallation)
+
+## 1st pass: read in file
+my @buffer1 = () ;
+my %seen = ();
+my %predefs = ();
+
+{
+  my $mode = 0 ;
+  my $line = '';
+
+  while ( <> )
+  {
+    if ( $mode == 0 )
+    {
+      if ( /^([a-zA-Z0-9_]+\s*[\+]?[:=].*)\\$/o )
+      {
+        $line = "$1" ;
+        $mode = 1;
+      } else {
+        push @buffer1, $_ ;
+      }
+    } elsif ( $mode == 1 ) {
+      if ( /^(.*)\\$/o ) {
+        $line .= $1;
+      } else {
+        $line .= $_ ;
+        push @buffer1, $line ;
+        $line = '';
+        $mode = 0 ;
+      }
+    }
+  }
+}
+
+#foreach my $l ( @buffer1 ) { print STDERR "1:<$l>"; }
+
+# Filter out all Makefile code not relevant here
+my @buffer2 = ();
+foreach my $l ( @buffer1 ) {
+  if ( $l=~ /^\t.*$/o )
+  { #ignore: Production of a make rule.
+  } elsif ( $l =~ /^\s*([a-zA-Z0-9_]*dir)\s*\=\s*(.*)\s*$/o )
+  { # dirs
+    push @buffer2, "$l";
+    $dirmap{"\$\($1\)"} = replace($2);
+  } elsif ( $l =~ /^\s*noinst_(.*)\s*[\+]?\=(.*)$/o )
+  { 
+    #ignore: noinst_* are not relevant here.
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)([a-zA-Z0-9_]+)_(HEADERS|LIBRARIES|DATA|SCRIPTS|PROGRAMS)\s*([\+]?\=)\s*(.*)/o )
+  {
+    if ( ( "$5" eq '=' ) ) {
+      my $v = $dirmap{"\$\($3dir\)"};
+      if ( $v =~ /\$\(PROJECT_[^\)]+\)$/ )
+      {
+         $predefs{"$v"} = 1;
+      }
+    }
+    foreach my $f ( split(' ',$6) ) {
+      push @buffer2, "$1$2$3_$4 +=$f\n";
+    }
+  } elsif ( $l =~ /^\s*(if|else|endif)\s*.*$/o )
+  { # conditionals
+    push @buffer2, "$l";
+  }
+
+  # Check if Makefile.am already contains CLEANFILES or DISTCLEANFILES
+  if ( $l =~ /^\s*(CLEANFILES|DISTCLEANFILES|SUBDIRS)\s*\=.*$/o )
+  {
+    $predefs{"$1"} = 1;
+  }
+}
+
+if ( $predefs{"\$(PROJECT_INCLUDE)"} ){
+  unshift @buffer2, "includedir = \$(includedir)\n";
+}
+if ( $predefs{"\$(PROJECT_LIB)"} ){
+  unshift @buffer2, "libdir = \$(libdir)\n";
+}
+
+# foreach my $l ( @buffer2 ) { print STDERR "2:<$l>"; }
+
+my @buffer3 = ();
+
+foreach my $l ( @buffer2 ) {
+ if ( $l =~ /^\s*([a-zA-Z0-9_]*dir)\s*\=\s*(.*)\s*$/o )
+  { # dirs
+    my $v = $dirmap{"\$\($1\)"};
+    print_dirstamp(\@buffer3,$v,"PREINSTALL_DIRS");
+    $seen{"PREINSTALL_DIRS"} = 1;
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)([a-zA-Z0-9_]+)_HEADERS\s*\+\=(.*)/o )
+  { # preinstall
+    my $v = $dirmap{"\$\($3dir\)"};
+    my $f = $4;
+    my $x ; my $i = rindex($f,'/');
+    if ($i < 0) { $x="$f";
+    } else { $x = substr($f,$i+1);
+    }
+    push @buffer3,
+          "$v/$x: $f $v/\$(dirstamp)\n",
+          "\t\$(INSTALL_DATA) \$< $v/$x\n",
+          "PREINSTALL_FILES += $v/$x\n\n";
+    $seen{"PREINSTALL_FILES"} = 1;
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_)([a-zA-Z0-9_]+)_LIBRARIES\s*\+\=(.*)/o )
+  { # tmpinstall
+    my $v = $dirmap{"\$\($3dir\)"};
+    my $f = $4;
+    my $x ; my $i = rindex($f,'/');
+    if ($i < 0) { $x="$f";
+    } else { $x = substr($f,$i+1);
+    }
+    push @buffer3,
+          "$v/$x: $f $v/\$(dirstamp)\n",
+          "\t\$(INSTALL_DATA) \$< $v/$x\n",
+          "TMPINSTALL_FILES += $v/$x\n\n";
+    $seen{"TMPINSTALL_FILES"} = 1;
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)([a-zA-Z0-9_]+)_LIBRARIES\s*\+\=(.*)/o )
+  { # ignore
+  } elsif ( $l =~ /^\s*(dist_)(project_)([a-zA-Z0-9_]+)_DATA\s*\+\=(.*)/o )
+  { # preinstall
+    my $v = $dirmap{"\$\($3dir\)"};
+    my $f = $4;
+    my $x ; my $i = rindex($f,'/');
+    if ($i < 0) { $x="$f";
+    } else { $x = substr($f,$i+1);
+    }
+    push @buffer3,
+          "$v/$x: $f $v/\$(dirstamp)\n",
+          "\t\$(INSTALL_DATA) \$< $v/$x\n",
+          "PREINSTALL_FILES += $v/$x\n\n";
+    $seen{"PREINSTALL_FILES"} = 1;
+  } elsif ( $l =~ /^\s*(nodist_|)(project_)([a-zA-Z0-9_]+)_DATA\s*\+\=(.*)/o )
+  { # tmpinstall
+    my $v = $dirmap{"\$\($3dir\)"};
+    my $f = $4;
+    my $x ; my $i = rindex($f,'/');
+    if ($i < 0) { $x="$f";
+    } else { $x = substr($f,$i+1);
+    }
+    push @buffer3,
+          "$v/$x: $f $v/\$(dirstamp)\n",
+          "\t\$(INSTALL_DATA) \$< $v/$x\n",
+          "TMPINSTALL_FILES += $v/$x\n\n";
+    $seen{"TMPINSTALL_FILES"} = 1;
+  } elsif ( $l =~ /^\s*(dist_|)([a-zA-Z0-9_]+)_DATA\s*\+\=(.*)/o )
+  { # ignore
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)([a-zA-Z0-9_]+)_SCRIPTS\s*\+\=(.*)/o )
+  { # ignore
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_)([a-zA-Z0-9_]+)_PROGRAMS\s*\+\=(.*)/o )
+  { # tmpinstall
+    my $v = $dirmap{"\$\($3dir\)"};
+
+    my $f = $4;
+    my $x ; my $i = rindex($f,'/');
+    if ($i < 0) { $x="$f";
+    } else { $x = substr($f,$i+1);
+    }
+    push @buffer3,
+          "$v/$x: $f $v/\$(dirstamp)\n",
+          "\t\$(INSTALL_PROGRAM) \$< $v/$x\n",
+          "TMPINSTALL_FILES += $v/$x\n\n";
+    $seen{"TMPINSTALL_FILES"} = 1;
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)([a-zA-Z0-9_]+)_PROGRAMS\s*\+\=(.*)/o )
+  { # ignore
+  } elsif ( $l =~ /^\s*(if|else|endif)\s*.*$/o )
+  { # conditionals
+    push @buffer3, "$l";
+  }
+}
+
+# foreach my $l ( @buffer3 ) { print STDERR "3:<$l>"; }
+
+my $output;
+$output .= "## Automatically generated by ampolish3 - Do not edit\n\n";
+$output .=  "if AMPOLISH3\n";
+$output .=  "\$(srcdir)/preinstall.am: Makefile.am\n";
+$output .= "\t\$(AMPOLISH3) \$(srcdir)/Makefile.am > \$(srcdir)/preinstall.am\n";
+$output .= "endif\n\n";
+
+foreach my $k ( keys %seen )
+{
+  if ( $k =~ /PREINSTALL_FILES/o ) {
+    $output .= "all-am: \$(PREINSTALL_FILES)\n\n";
+
+    $output .= "$k =\n";
+    $output .= "CLEANFILES ";
+    if ( $predefs{"CLEANFILES"} ) { $output .= "+"; }
+    $output .= "= \$($k)\n";
+    $predefs{"CLEANFILES"} = 1;
+  } elsif ( $k =~ /TMPINSTALL_FILES/o ) {
+
+    $output .= "all-local: \$(TMPINSTALL_FILES)\n\n";
+
+    $output .= "$k =\n";
+    $output .= "CLEANFILES ";
+    if ( $predefs{"CLEANFILES"} ) { $output .= "+"; }
+    $output .= "= \$($k)\n";
+    $predefs{"CLEANFILES"} = 1;
+  } elsif ( $k =~ /.*DIRS/o ) {
+    $output .= "$k =\n";
+    $output .= "DISTCLEANFILES ";
+    if ( $predefs{"DISTCLEANFILES"} ) { $output .= "+"; }
+    $output .= "= \$($k)\n";
+    $predefs{"DISTCLEANFILES"} = 1;
+  }
+  $output .= "\n";
+}
+
+# Pretty printing
+$output .= join ( '', @buffer3 );
+$output =~ s/\nelse\n+endif/\nendif/g;
+$output =~ s/\n\n+endif/\nendif/g;
+$output =~ s/\nif [a-zA-Z0-9_!]+\n+endif//g;
+print STDOUT $output;
+
+exit 0;
+
+sub replace($)
+{
+  my ($v) = @_;
+  foreach my $i ( keys %dirmap )
+  {
+    $v =~ s/\Q$i/$dirmap{$i}/g;
+  }
+  return $v;
+}
+
+sub print_dirstamp($$$)
+{
+  my ($obuf,$file,$inst) = @_ ;
+  push @{$obuf}, "$file/\$(dirstamp):\n\t\@\$\(MKDIR_P\) $file\n" ;
+  push @{$obuf}, "\t\@: \> $file/\$(dirstamp)\n" ;
+  push @{$obuf}, "$inst += $file/\$(dirstamp)\n\n" ;
+}

automake/compile.am

@@ -1,221 +0,0 @@
-##
-## $Id$
-##
-
-## -------------------------------------------------------------------------
-## NOTE: This file is rather immature and has to be considered to be 
-## almost experimental.
-##
-## Expect frequent changes -- It deserves to be cleaned up :(
-## -------------------------------------------------------------------------
-
-## The section below is based on make/compilers/gcc-target-default.cfg
-## used in former versions of RTEMS.
-
-## 
-## Set up the flags for the toolchains:
-##
-## We are considering 3 different building schemes here:
-## * Using gcc's being able to accept -specs (aka gcc-2.8 building scheme)
-## * Using gcc's not being able to accept -specs (aka gcc-2.7.2 building
-##   scheme)
-## * Using third party toolchains (aka non-gcc building scheme)
-##
-## Automake conditionals in use:
-## RTEMS_USE_GCC     .. if we are using GCC
-
-## NOTES: 
-## * The gcc-2.8 building scheme is the nominal building scheme and
-##   is actively supported.
-## * The non-gcc building scheme requires manually setting up environment 
-##   variables and is hardly tested at all
-
-## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V are the values we
-## would want the corresponding macros to be set to.
-##
-## CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set by the 
-## 'VARIANT=<OPTIMIZE|DEBUG|PROFILE>' targets to their _V values.
-
-## XCPPFLAGS, XCFLAGS, XCXXFLAGS, XASFLAGS 
-## are used to add flags from the shell
-## cf. make.info ("Implicit rules/variables" for details)
-
-if RTEMS_USE_GCC
-## All the stuff below is specific to gcc
-
-## gcc >= 2.8.x
-GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS)
-else
-## fall back to the old style compilers/*.cfg
-## CONFIG.CC is supposed to be provided by <BSP>.cfg
-include $(CONFIG.CC)
-endif # RTEMS_USE_GCC
-
-DEFS = @DEFS@
-
-CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
-CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
-CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
-ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
-
-LINK_LIBS = $(LD_LIBS)
-
-#
-# Client compiler and support tools
-#
-
-#
-# How to compile stuff into ${ARCH} subdirectory
-#
-
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-
-CCAS = $(CC)
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-
-# OBSOLETE: Don't use
-AS = $(CC)
-ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
-
-${ARCH}/%.o: %.c
-	${COMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.cc
-	${CXXCOMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.S
-	${CCASCOMPILE} -DASM -o $@ -c $<
-
-# Dependency files for use by gmake
-# NOTE: we don't put them into $(ARCH)
-#       so that 'make clean' doesn't blow it away
-
-DEPEND=Depends-${ARCH}
-
-# We deliberately don't have anything depend on the
-# $(DEPEND) file; otherwise it will get rebuilt even
-# on 'make clean'
-#
-
-## HACK: Specific to gcc
-## FIXME: The approach below is known to be conceptionally broken.
-depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
-##       Use gcc -M to generate dependencies
-##       Replace foo.o with $(ARCH)/foo.o
-##       Replace $(ARCH) value with string $(ARCH)
-##           so that it will for debug and profile cases
-	$(COMPILE) -M   $^    |  \
-	sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
-	    -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
-	mv $(DEPEND).tmp $(DEPEND)
-depend: depend-am
-
-# pull in dependencies if they exist  
-ifeq (${DEPEND},$(wildcard ${DEPEND}))
-include ${DEPEND}
-@ENDIF@
-
-
-# spell out all the LINK_FILE's, rather than using -lbsp, so
-#  that $(LINK_FILES) can be a dependency
-
-LINK_OBJS = \
-    $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
-
-LINK_FILES =\
-    $(START_FILE) \
-    $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
-
-if RTEMS_USE_GCC
-## gcc >= 2.8
-define make-rel
-	$(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^
-endef
-else
-## non-gcc
-define make-rel
-	$(LINK) $(XLDFLAGS) $^
-endef
-endif
-
-## -------------------------------------------------------------------------
-
-## translate VARIANT into VARIANT_V
-VARIANT = OPTIMIZE
-
-VARIANT_OPTIMIZE_V = OPTIMIZE
-VARIANT_DEBUG_V = DEBUG
-VARIANT_PROFILE_V = PROFILE
-VARIANT_optimize_V = OPTIMIZE
-VARIANT_debug_V = DEBUG
-VARIANT_profile_V = PROFILE
-
-VARIANT_V = $(VARIANT_$(VARIANT)_V)
-
-## Setup the variant build subdirectory
-ARCH_OPTIMIZE_V = o-optimize
-ARCH_DEBUG_V = o-debug
-ARCH_PROFILE_V = o-profile
-
-ARCH__V = $(ARCH_OPTIMIZE_V)
-ARCH = $(ARCH_$(VARIANT_V)_V)
-
-## Setup the library suffix
-LIBSUFFIX_OPTIMIZE_V =
-LIBSUFFIX_DEBUG_V = _g
-LIBSUFFIX_PROFILE_V = _p
-LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V)
-
-LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
-LIBSUFFIX_VA = $(LIB_VARIANT).a
-
-## These are supposed to be set in make/custom/<bsp>.cfg
-CPU_CFLAGS = @CPU_CFLAGS@
-CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@
-CFLAGS_DEBUG_V = @CFLAGS_DEBUG_V@
-CFLAGS_PROFILE_V = @CFLAGS_PROFILE_V@
-CFLAGS__V = $(CFLAGS_OPTIMIZE_V)
-
-## ------------------------------------------------------------------------
-## Setup hard-coded flags
-if RTEMS_USE_GCC
-## gcc >= gcc-2.8
-RTEMS_CFLAGS_OPTIMIZE_V =
-RTEMS_CFLAGS_DEBUG_V = -qrtems_debug -Wno-unused
-RTEMS_CFLAGS_PROFILE_V = -pg
-
-## non-gcc
-## We can't guess what flags might be required here.
-## Pass the values from the environment if you want to apply them.
-endif
-RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V)
-
-## -------------------------------------------------------------------------
-
-CC = @CC@ $(GCCSPECS)
-CXX = @CXX@ $(GCCSPECS)
-CPP = @CPP@ $(GCCSPECS)
-
-LD = @LD@
-OBJCOPY = @OBJCOPY@
-NM = @NM@
-SIZE = @SIZE@
-STRIP = @STRIP@
-
-##
-AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
-AM_CFLAGS =
-AM_CXXFLAGS =
-AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)

automake/force-preinstall.am

@@ -1,4 +0,0 @@
-## This file is a temporary band-aid for the ppc-BSPs.
-## DO NOT use it, it will eventually be removed in future.
-
-PREINSTALL_FILES = $(TMPINSTALL_FILES)

automake/host.am

@@ -5,24 +5,6 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
-debug:
-	@echo
-	@echo "\"make debug\" is obsolete, instead use:"
-	@echo "	make VARIANT=DEBUG"
-	@echo
-
-.PHONY: debug
-
-profile:
-	@echo
-	@echo "\"make profile\" is obsolete, instead use:"
-	@echo "	make VARIANT=PROFILE"
-	@echo
-
 preinstall-am: $(PREINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
-
-depend-am:
-depend: depend-am
-.PHONY: depend depend-am

automake/lib.am

@@ -1,23 +0,0 @@
-##
-##  $Id$
-##
-
-## LD = @LD@
-AR = @AR@
-RANLIB = @RANLIB@
-
-ARFLAGS = ruv
-
-define make-library
-test -d $(ARCH) || mkdir $(ARCH)
-$(RM) $@
-$(AR) $(ARFLAGS) $@ $^
-$(RANLIB) $@
-endef
-
-$(PROJECT_RELEASE)/lib:
-	@$(mkinstalldirs) $@
-
-TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib
-
-.PRECIOUS: $(LIB)

automake/local.am

@@ -1,35 +1,7 @@
 ## $Id$
 
-debug:
-	@echo
-	@echo "\"make debug\" is obsolete, instead use:"
-	@echo "	make VARIANT=DEBUG"
-	@echo
-
-.PHONY: debug
-
-profile:
-	@echo
-	@echo "\"make profile\" is obsolete, instead use:"
-	@echo "	make VARIANT=PROFILE"
-	@echo
-
-.PHONY: profile
-
 preinstall-am: $(PREINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
 
-depend-am:
-depend: depend-am
-.PHONY: depend depend-am
-
-${ARCH}:
-	mkdir ${ARCH}
-
-clean-local:
-	$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
-	$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
-
 PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
-

automake/subdirs.am

@@ -7,7 +7,6 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
-depend-recursive \
 preinstall-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
@@ -31,6 +30,3 @@ preinstall-recursive:
 
 preinstall: preinstall-recursive
 .PHONY: preinstall-recursive
-
-depend: depend-recursive
-.PHONY: depend-recursive

bootstrap

@@ -12,9 +12,6 @@
 # to be run from the toplevel directory of RTEMS'
 # source tree
 
-AUTOCONF_VERS=2\.57
-AUTOMAKE_VERS=1\.7\.2
-
 progname=`basename $0`
 top_srcdir=`dirname $0`
 
@@ -25,13 +22,14 @@ mode="generate"
 usage()
 {
   echo
-  echo "usage: ${progname} [-h|-q|-v]"
+  echo "usage: ${progname} [-c|-p|-h] [-q][-v]"
   echo
   echo "options:"
-  echo "	-h .. display this message and exit";
-  echo "	-q .. quiet, don't display directories";
-  echo "	-v .. verbose, pass -v to automake when invoking automake"
   echo "	-c .. clean, remove all aclocal/autoconf/automake generated files"
+  echo "	-h .. display this message and exit"
+  echo "	-p .. regenerate preinstall.am files"
+  echo "	-q .. quiet, don't display directories"
+  echo "	-v .. verbose, pass -v to autotools"
   echo
   exit 1;
 }
@@ -39,11 +37,10 @@ usage()
 generate_bspdir_acinclude()
 {
 cat << EOF > acinclude.m4~
-# RTEMS_CHECK_BSPDIR(RTEMS_BSP)
+# RTEMS_CHECK_BSPDIR(RTEMS_BSP_FAMILY)
 AC_DEFUN([RTEMS_CHECK_BSPDIR],
 [
-  RTEMS_BSP_ALIAS(ifelse([\$1],,[\${RTEMS_BSP}],[\$1]),bspdir)
-  case "\$bspdir" in
+  case "\$1" in
 EOF
 
 for i in */bsp_specs; do
@@ -86,6 +83,12 @@ case $1 in
 -c|--cl|--cle|--clea|--clean)
   mode="clean";
   shift;;
+-p|--pr|--pre|--prei|--prein|--preins|--preinst)
+  mode="preinstall";
+  shift;;
+-r|--re|--rec|--reco|--recon|--reconf)
+  mode="autoreconf";
+  shift;;
 -*) echo "unknown option $1" ;
   usage ;;
 *) echo "invalid parameter $1" ;
@@ -94,31 +97,38 @@ esac
 done
 
 case $mode in
+preinstall)
+  confs=`find -name Makefile.am -exec grep -l 'include .*/preinstall\.am' {} \;`
+  for i in $confs; do
+    dir=$(dirname $i);
+    test "$quite" = "true" || echo "Generating $dir/preinstall.am"
+    ${top_srcdir}/ampolish3 "$dir/Makefile.am" > "$dir/preinstall.am"
+  done
+  ;;
+
 generate)
   AUTOCONF=${AUTOCONF-autoconf}
   if test -z "$AUTOCONF"; then
     echo "You must have autoconf installed to run $program"
+    exit 1
   fi
-  if test -z "`$AUTOCONF --version 2>/dev/null | grep -e \" $AUTOCONF_VERS\"`"; then
-cat << EOF
-RTEMS requires autoconf version $AUTOCONF_VERS.
   
-You are trying to use $AUTOCONF which does not seem to be sufficient
-EOF
-  exit 1
+  AUTOHEADER=${AUTOHEADER-autoheader}
+  if test -z "$AUTOHEADER"; then
+    echo "You must have autoconf installed to run $program"
+    exit 1
   fi
   
   AUTOMAKE=${AUTOMAKE-automake}
   if test -z "$AUTOMAKE"; then
     echo "You must have automake installed to run $program"
+    exit 1
   fi
-  if test -z "`$AUTOMAKE --version 2>/dev/null | grep -e \" $AUTOMAKE_VERS\"`"; then
-cat << EOF
-RTEMS requires automake version $AUTOMAKE_VERS.
   
-You are trying to use $AUTOMAKE which does not seem to be sufficient
-EOF
-  exit 1
+  ACLOCAL=${ACLOCAL-aclocal}
+  if test -z "$ACLOCAL"; then
+    echo "You must have automake installed to run $program"
+    exit 1
   fi
 
   case $top_srcdir in
@@ -139,14 +149,36 @@ EOF
     pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
     aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
       sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
-    test "$verbose" = "-v" && echo "aclocal $aclocal_args"
-    aclocal $aclocal_args;
-    test -n "`grep CONFIG_HEADER ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -f Makefile.am && automake -a -c $verbose ;
-    autoconf;
+    test "$verbose" = "-v" && echo "${ACLOCAL} $aclocal_args"
+    ${ACLOCAL} $aclocal_args;
+    test -n "`grep CONFIG_HEADER ${configure}`" && ${AUTOHEADER} \
+      && test "$verbose" = "-v" && echo "${AUTOHEADER}";
+    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && ${AUTOHEADER} \
+      && test "$verbose" = "-v" && echo "${AUTOHEADER}";
+    test -f Makefile.am && ${AUTOMAKE} -a -c $verbose ;
+    ${AUTOCONF};
+    test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
+      && echo timestamp > stamp-h.in
+  )
+  done
+  ;;
+
+autoreconf)
+  AUTORECONF=${AUTORECONF-autoreconf}
+  if test -z "$AUTORECONF"; then
+    echo "You must have autoreconf installed to run $program"
+    exit 1
+  fi
+
+  confs=`find . -name 'configure.ac' -print`
+  for i in $confs; do
+  dir=`dirname $i`;
+  configure=`basename $i`;
+  ( test "$quiet" = "true" || echo "$dir";
+    cd $dir;
+    test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \
+      generate_bspdir_acinclude;
+    ${AUTORECONF} -i --no-recursive $verbose;
     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
       && echo timestamp > stamp-h.in
   )
@@ -165,8 +197,8 @@ clean)
   files=`find . -name 'configure' -print` ;
   test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
   for i in $files; do if test -f $i; then
-    rm -f $i config.guess config.sub depcomp install-sh mdate-sh missing \
-	mkinstalldirs texinfo.tex
+    rm -f $i config.sub config.guess depcomp install-sh mdate-sh missing \
+	mkinstalldirs texinfo.tex compile
     test "$verbose" = "-v" && echo "$i"    
   fi; done
   
@@ -179,7 +211,7 @@ clean)
   fi; done
 
   find . -name '*~' -print | xargs rm -f
-  find . -name 'bspopts.h*' -print | xargs rm -f
+  find . -name 'bspopts.h.in' -print | xargs rm -f
   find . -name '*.orig' -print | xargs rm -f
   find . -name '*.rej' -print | xargs rm -f
   find . -name 'config.status' -print | xargs rm -f
@@ -192,3 +224,5 @@ clean)
   find . -name 'autom4te*.cache' | xargs rm -rf
   ;;
 esac
+
+exit 0

c/ACKNOWLEDGEMENTS

@@ -17,15 +17,6 @@ The following persons/organizations have made contributions:
   Scientific Association submitted the BSP and other miscellaneous support
   for the Motorola MVME162 (M68040LC CPU) VMEbus single board computer.
 
-+ Division Inc. of Chapel Hill, NC for sponsoring On-Line Applications
-  Research to port RTEMS to the Hewlett-Packard PA-RISC architecture (V1.1)
-  and the addition of HP-UX as a development host. Tony Bennett
-  (tbennett@chapelhill.hp.com) was assisted in this effort by Joel Sherrill
-  (joel@OARcorp.com).  Tony also deserves a big pat on the back for 
-  contributing significantly to the overall organization of the development 
-  environment and directory structure.  RTEMS is much easier to build 
-  because of Tony.
-
 + Greg Allen of Division Inc. of Chapel Hill, NC for 
   porting RTEMS to HP-UX.  This port treats a UNIX computer as simply
   another RTEMS target processor.  This port can be used to develop 
@@ -56,13 +47,10 @@ The following persons/organizations have made contributions:
 
 + John S. Gwynne (jsg@coulomb.eng.ohio-state.edu) of Ohio State University 
   submitted the support for the Motorola MC68332 CPU as well as completing 
-  the support for CPUs based on the MC68000 core.  This included the "efi68k" 
-  and "efi332" BSPs as well as completing the modifications to the m68k 
-  dependent executive code to support m68k family members based on the 
-  MC68000 core.  "efi68k" and "efi332" are single board computers designed 
-  primarily for automotive electronic fuel injection (EFI) control, but can 
-  be considered general purpose controllers when used without the EFI 
-  companion board(s). See the README in each BSP for more information.
+  the support for CPUs based on the MC68000 core.  Although the BSPs for
+  automotive electronic fuel injection (EFI) control he submitted have now
+  been removed, they formed the foundation for the mrm332 BSP which is still
+  in the tree. 
 
 + The European Space Agency for sponsoring On-Line Applications Research 
   to port RTEMS to the SPARC V7 architecture for use with their ERC32
@@ -165,11 +153,8 @@ The following persons/organizations have made contributions:
   interrupt management API that reduces interrupt latency while making
   it easier to support external interrupt controllers.
 
-+ Mark Bronson <mark@ramix.com> of RAMIX for submitting i960RP
-  support and the rxgen960 board support package.
-
 + Joel Sherrill <joel@OARcorp.com> for the BSPs that work with 
-  numerous simulators including psim, i960sim, c4xsim, h8sim, armulator,
+  numerous simulators including psim, c4xsim, h8sim, armulator,
   sim68000, and simcpu32.  Most of these BSPs work with instruction
   set simulators in gdb.
 

c/ChangeLog

@@ -1,3 +1,111 @@
+2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: New BUG-REPORT address.
+
+2006-10-19	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Require automake-1.10. Require autoconf-2.60.
+
+2006-08-09	Kolja Waschk <waschk@telos.de>
+
+	* TOOL_TARGETS: New port to Altera NIOS II.
+
+2005-11-13	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Remove depend-am.
+
+2004-10-18	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Rework checking for BSPs.
+
+2004-10-18	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* acinclude.m4: Remove RTEMS_CHECK_CPU.
+	* configure.ac: Remove RTEMS_CHECK_CPU, RTEMS_ENABLE_BARE. 
+
+2004-09-24	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Require automake > 1.9.
+
+2004-03-31	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Add --with-project-root, --with-project-top to
+	rtems_bsp_configure.
+
+2004-02-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Cosmetics.
+	* configure.ac: Add support for --disable-rtemsbsp. Cosmetics.
+
+2004-01-07	Joel Sherrill <joel@OARcorp.com>
+
+	* ACKNOWLEDGEMENTS: Remove efi68k and efi332 references as they are no
+	longer in the tree.
+
+2003-12-17	Joel Sherrill <joel@OARcorp.com>
+
+	* release_support: Removed -- accidentally added to wrong directory.
+
+2003-12-17	Joel Sherrill <joel@OARcorp.com>
+
+	* release_support: New file -- assistant to new cut_release script.
+
+2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove RTEMS_BSP-subdir rule.
+	* configure.ac: Let AC_CONFIG_FILES(Makefile..) append explictit
+	rules for RTEMS_BSP-subdirs.
+
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Use mkdir_p instead of mkinstalldirs.
+
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require automake >= 1.8, autoconf >= 2.59.
+
+2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Cosmetics.
+	* Makefile.am: Cosmetics.
+
+2003-11-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* acinclude.m4: Fix underquoting to silence automake-1.8.
+
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* acinclude.m4: Merge-in former ../aclocal/config-subdirs.m4.
+	* configure.ac: remove RTEMS_CANONICAL_HOST.
+
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't explictly invoke $MAKE preinstall.
+
+2003-10-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* acinclude.m4: New.
+	Add RTEMS_CHECK_CPU.
+
+2003-09-26	Joel Sherrill <joel@OARcorp.com>
+
+	* ACKNOWLEDGEMENTS: Obsoleting HP PA-RISC port and removing all
+	references.
+
+2003-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Use rtems-bugs@rtems.com as bug report email address.
+
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
+2003-02-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove references to obsolete files
+	README.DOS REQUIRES PROBLEMS TESTED README UPDATE_HELP.
+	Add TOOL_TARGETS.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).

c/Makefile.am

@@ -12,30 +12,15 @@ RTEMS_BSP = $(RTEMS_BSP_LIST)
 ## The '.' in SUBDIRS ensures that local make-targets (xxx-am) will be
 ## triggered before $(RTEMS_BSP_LIST) subdirectories are made.
 SUBDIRS = . $(RTEMS_BSP)
-
-## Use @RTEMS_BSP_LIST@ here, using $(RTEMS_BSP_LIST) would trigger
-## this rule for invalid BSPs
-@RTEMS_BSP_LIST@: src/configure
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	test -n "${RTEMS_BSP}" && for i in ${RTEMS_BSP}; do \
-	  echo "Configuring RTEMS_BSP=$$i"; \
-	  $(mkinstalldirs) $$i; \
-	  ( cd $$i && \
-	    CONFIG_SHELL=$(SHELL) RTEMS_BSP=$$i $(rtems_bsp_configure) \
-	    && $(MAKE) $(AM_MAKEFLAGS) preinstall ) \
-	  || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done
+DIST_SUBDIRS = $(RTEMS_BSP)
 
 ## Let all RTEMS' make targets depend on ${RTEMS_BSP}
 all-local: ${RTEMS_BSP}
 preinstall-am: ${RTEMS_BSP}
-depend-am: ${RTEMS_BSP}
 
 ## Pull in extra files intro the distribution
-EXTRA_DIST = ACKNOWLEDGEMENTS README.DOS REQUIRES PROBLEMS TESTED README \
-    UPDATE_HELP
+EXTRA_DIST = ACKNOWLEDGEMENTS
+EXTRA_DIST += TOOL_TARGETS
 
-DIST_SUBDIRS = ${RTEMS_BSP}
-## -------------------------------------------------------
-include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/host.am
+include $(top_srcdir)/../automake/subdirs.am

c/TOOL_TARGETS

@@ -11,32 +11,15 @@ arm:
 c4x:
         c4x-rtems               COFF           Requires patches
 
-hppa:
-	hppa1.1-rtems		ELF
-	
-
 h8300:
         h8300-rtems             COFF
 
 i386:
 	i386-rtems		ELF
-	i386-rtemself		ELF
-	i386-rtemscoff		COFF		Obsoleted
-	i386-go32-rtems		COFF		Obsoleted - no supporting BSP 
-
-i960:
-	i960-rtems		COFF		Switch to ELF when possible
-	i960-rtemscoff		COFF
-	i960-rtemself		ELF		Not currently in any tools
-
-	NOTE: As of October 2002, i960 has been deprecated in gdb and gcc.
 
 m68k:
-	m68k-rtems		COFF		Switch to ELF when possible
-	m68k-rtemscoff		COFF
-	m68k-rtemself		ELF		Not in all tools
+	m68k-rtems		ELF
 
-	NOTE: m68k-elf is in post egcs 1.1.2 snapshots.
 
 mips:
 	mips*-rtems		ELF		Big endian
@@ -45,6 +28,12 @@ mips:
 	NOTE: Little endian configuration is not in all tools and 
 	      is untested for RTEMS itself.
 
+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
@@ -61,5 +50,3 @@ sh:
 
 sparc:
 	sparc-rtems		ELF
-	sparc-rtemself		ELF
-	sparc-rtemsaout		A.OUT

c/acinclude.m4

@@ -0,0 +1,34 @@
+dnl $Id$
+
+dnl
+dnl Misc utility macros for subdir handling to work around missing abilities
+dnl in autoconf, automake and structural issues with RTEMS
+dnl
+dnl Contains parts derived from autoconf-2.13 AC_OUTPUT_SUBDIRS and Cygnus'
+dnl configure.in.
+dnl
+
+dnl
+dnl _AC_DOTS(PATH)
+dnl
+AC_DEFUN([_AC_DOTS],[
+# A "../" for each directory in $1.
+    ac_dots=`echo $1 | \
+             sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
+])
+
+dnl
+dnl _RTEMS_ADJUST_SRCDIR(REVAR,CONFIG_DIR[,TARGET_SUBDIR])
+dnl
+AC_DEFUN([_RTEMS_ADJUST_SRCDIR],[
+    _AC_DOTS(ifelse([$3], ,[$2],[$3/$2]))
+
+    case "$srcdir" in
+    .) # No --srcdir option.  We are building in place.
+      $1=$srcdir ;;
+    [[\\/]]* | ?:[[\\/]]*) # Absolute path.
+      $1=$srcdir/$2 ;;
+    *) # Relative path.
+      $1=$ac_dots$srcdir/$2 ;;
+    esac
+])

c/configure.ac

@@ -2,50 +2,51 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.57)
-AC_INIT([rtems-c],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
-AC_CONFIG_SRCDIR([src])
+AC_PREREQ(2.60)
+AC_INIT([rtems-c],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
+AC_CONFIG_SRCDIR([TOOL_TARGETS])
 RTEMS_TOP(..)
-AC_CONFIG_AUX_DIR(..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
+AM_INIT_AUTOMAKE([no-define foreign 1.10])
 AM_MAINTAINER_MODE
 
 ## These options are used within this file.
-RTEMS_ENABLE_BARE
-RTEMS_ENABLE_RTEMSBSP(rtems_bsp)
+RTEMS_ENABLE_RTEMSBSP
 
-RTEMS_CHECK_CPU
-RTEMS_CANONICAL_HOST
+# Set up rtems_bsp
+AS_IF([test x"$enable_rtemsbsp" = x"no"],[
+# --disable-rtemsbsp
+  rtems_bsp=""
+],[
+  AS_IF([test -z "$enable_rtemsbsp"],
+    [# --enable-rtemsbsp=""
+    RTEMS_CHECK_BSPS(rtems_bsp)],
+    [# --enable-rtemsbsp="list"
+    rtems_bsp="$enable_rtemsbsp"])
+])
 
-AS_IF([test -z "$rtems_bsp"],
-  [RTEMS_CHECK_BSPS(rtems_bsp)])
+# Check sanity of BSPs in $rtems_bsp
+for _rtems_bsp in : $rtems_bsp; do test "x$_rtems_bsp" = x: && continue
+  # make sure there is a make/custom file for the bsp
+  _RTEMS_CHECK_CUSTOM_BSP([$_rtems_bsp.cfg],[bsp_cfg])
 
-for i in $rtems_bsp; do
-
-    # make sure there is a make/custom file for the bsp
-    RTEMS_CHECK_CUSTOM_BSP(i)
- 
-    RTEMS_BSP_ALIAS($i,bspdir)
+  AS_IF([test -n "$bsp_cfg"],
+  [
+    # retrieve bsp_family
+    RTEMS_BSP_ALIAS([$_rtems_bsp],[rtems_bsp_family])
 
     # Is there code where there should be for this BSP?
-    # The bare bsp is a special case as it is not under the RTEMS_CPU path
-    case $bspdir in
-      bare)
-        bspcpudir=
-        ;;
-      *)
-        bspcpudir=$RTEMS_CPU/
-        ;;
+    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
 
-    if test -d "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$bspcpudir$bspdir"; then
-      RTEMS_BSP_LIST="$RTEMS_BSP_LIST $i"
-    else
-      AC_MSG_ERROR([unable to find libbsp directory ($bspdir) for  $i])
-    fi
+    # Is there a configure script for the BSP?    
+    AS_IF([test -r "$rtems_libbspdir/configure"],
+      [RTEMS_BSP_LIST="$RTEMS_BSP_LIST $_rtems_bsp"])
+  ])
 done
 
 #
@@ -62,17 +63,33 @@ rtems_bsp_configure="$rtems_bsp_configure/configure"
     [-enable-rtemsbsp=* | --enable-rtemsbsp=* ) ;;])
 
 rtems_bsp_configure="$rtems_bsp_configure $rtems_bsp_configure_args"
+rtems_bsp_configure="$rtems_bsp_configure '--with-project-root=../../'"
+rtems_bsp_configure="$rtems_bsp_configure '--with-project-top=../../'"
 AC_SUBST(rtems_bsp_configure)
 
 AC_SUBST(RTEMS_BSP_LIST)
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_CONFIG_FILES([Makefile],[
+for bsp in : $RTEMS_BSP_LIST; do test "x$bsp" = x: && continue
+cat >> Makefile << BSPEOF
 
+$bsp: src/configure
+	@set fnord \$(MAKEFLAGS); amf=\[$]\[$]2; \\
+	  echo "Configuring RTEMS_BSP=$bsp"; \\
+	  \$(mkdir_p) $bsp; \\
+	  ( cd $bsp && \\
+	    CONFIG_SHELL=\$(SHELL) RTEMS_BSP=$bsp \$(rtems_bsp_configure) ) \\
+	  || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac;
+BSPEOF
+done
+],[RTEMS_BSP_LIST="$RTEMS_BSP_LIST"])
+AC_OUTPUT
+AS_IF([test -n "$RTEMS_BSP_LIST"],[
 echo
 echo target architecture: $target_cpu.
-echo available BSPs: $rtems_bsp.
+echo available BSPs: $RTEMS_BSP_LIST.
 echo \'${MAKE} all\' will build the following BSPs: $RTEMS_BSP_LIST.
 echo other BSPs can be built with \'${MAKE} RTEMS_BSP=\"bsp1 bsp2 ...\"\'
 echo
+])

c/src/Makefile.am

@@ -2,9 +2,10 @@
 ##  $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../aclocal
+ACLOCAL_AMFLAGS = -I aclocal
 
 SUBDIRS = . @BSP_SUBDIRS@
+DIST_SUBDIRS = @BSP_SUBDIRS@
 
 clean-local:
 	$(RM) -r $(PROJECT_RELEASE)
@@ -21,13 +22,11 @@ DISTCLEANFILES = make/@RTEMS_BSP@.cache
 rtems_makedir = $(prefix)/make
 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 $< $@
 
-make/custom/%.cfg: $(srcdir)/$(cfg_dir)/custom/%.cfg
-	cp $< $@
-
 noinst_DATA += make/custom/default.cfg
 DISTCLEANFILES += make/custom/default.cfg
 
@@ -38,5 +37,15 @@ preinstall-stamp:
 	touch preinstall-stamp
 CLEANFILES = preinstall-stamp
 
-include $(top_srcdir)/../../automake/subdirs.am
-include $(top_srcdir)/../../automake/host.am
+@host_alias@-@RTEMS_BSP@.pc: config.status bsp.pc.in
+	./config.status --file=$@:$(srcdir)/bsp.pc.in
+
+pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfig_DATA = @host_alias@-@RTEMS_BSP@.pc
+DISTCLEANFILES += @host_alias@-@RTEMS_BSP@.pc
+
+DISTCLEANFILES += $(DEPDIR)/cfg.P
+include $(DEPDIR)/cfg.P
+
+include $(top_srcdir)/automake/subdirs.am
+include $(top_srcdir)/automake/local.am

c/src/acinclude.m4

@@ -5,18 +5,11 @@
 # Note: Consider this file a temporary band-aid until a better, more general
 # subdirectory handling solution is introduced to RTEMS.
 
-AC_DEFUN([RTEMS_CONFIG_SUBDIR],
+AC_DEFUN([_RTEMS_CONFIG_SUBDIR],
 [
-AC_CONFIG_COMMANDS_POST(
-[
-if test "$multilib" != "yes"; then
- ac_sub_sourcedir=$2
- ac_sub_builddir=$1
-
 if test "$no_recursion" != yes; then
-  RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
-
-  ac_sub_configure_args="$ac_sub_configure_args $3"
+  ac_sub_sourcedir=$2
+  ac_sub_builddir=$1
 
   for ac_subdir in : $ac_sub_sourcedir; do test "x$ac_subdir" = x: && continue
 
@@ -72,16 +65,22 @@ if test "$no_recursion" != yes; then
         ac_sub_cache_file=$ac_dots$cache_file ;;
       esac
 
-      AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
+      AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args $3 --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
       # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
+      eval $ac_sub_configure $ac_sub_configure_args $3 \
            --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
-fi
 ])
+
+## RTEMS_BSP_CONFIG_SUBDIR(builddir,srcdir,configargs,condition)
+AC_DEFUN([RTEMS_BSP_CONFIG_SUBDIR],[
+m4_expand_once([RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])])
+AS_IF([$4],[BSP_SUBDIRS="$BSP_SUBDIRS $1"])
+AC_CONFIG_COMMANDS_POST([
+AS_IF([$4],[_RTEMS_CONFIG_SUBDIR([$1],[$2],[$3])])])
 ])

c/src/aclocal/bsp-arg-enable.m4

@@ -9,7 +9,7 @@ dnl Configure scripts will receive <bsp-value> if <RTEMS_BSP> matches the
 dnl actual value of the shell variable RTEMS_BSP (cf. RTEMS_ENV_RTEMSBSP), 
 dnl and the raw value passed to --enable-FEATURE otherwise.
 dnl
-AC_DEFUN(RTEMS_BSP_ARG_ENABLE,
+AC_DEFUN([RTEMS_BSP_ARG_ENABLE],
 [AC_REQUIRE([RTEMS_ENV_RTEMSBSP])
 AC_ARG_ENABLE([$1],[$2],
 [enableval=`echo "[$enable_]patsubst([$1], -, _)" | sed -e "s%^${RTEMS_BSP}:%%"`

c/src/aclocal/bsp-configure.m4

@@ -0,0 +1,37 @@
+dnl $Id$
+
+dnl RTEMS_BSP_CONFIGURE
+dnl Common macro to be included by all bsp-configure.acs
+AC_DEFUN([RTEMS_BSP_CONFIGURE],
+[
+  AC_PREREQ(2.60)
+  AM_MAINTAINER_MODE
+  RTEMS_ENV_RTEMSBSP
+
+  RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+
+  AC_CONFIG_HEADERS([include/bspopts.tmp:include/bspopts.h.in],[
+echo "/* BSP dependent options file */"         >$tmp/config.h
+echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
+echo                                                  >>$tmp/config.h
+echo "#ifndef __BSP_OPTIONS_H"                        >>$tmp/config.h
+echo "#define __BSP_OPTIONS_H"                        >>$tmp/config.h
+echo                                                  >>$tmp/config.h
+sed \
+  -e '/.*PACKAGE.*/d' \
+  -e '/\/\* Define to.*this package.*\*\//d' \
+include/bspopts.tmp >> $tmp/config.h
+echo                                                  >>$tmp/config.h
+echo "#endif /* __BSP_OPTIONS_H */"                   >>$tmp/config.h
+  AS_IF([cmp -s include/bspopts.h $tmp/config.h 2>/dev/null],[
+    AC_MSG_NOTICE([include/bspopts.h is unchanged])
+    rm -f $tmp/config.h],[
+    AC_MSG_NOTICE([creating include/bspopts.h])
+    rm -f include/bspopts.h
+    mv $tmp/config.h include/bspopts.h
+  ])
+])
+  RTEMS_PROJECT_ROOT
+
+  RTEMS_CHECK_MULTIPROCESSING
+])

c/src/aclocal/bspopts.m4

@@ -43,7 +43,7 @@ dnl RTEMS_BSPOPTS_SET(VAR,BSP,DEFAULT)
 dnl Set up a value DEFAULT to be used as default value for variable VAR for
 dnl BSP in RTEMS_BSPOPTS_HELP.
 
-dnl MUST be use in front of exactly _one_ corresponding RTEMS_BSPOPTS_HELP
+dnl MUST be used in front of exactly _one_ corresponding RTEMS_BSPOPTS_HELP
 
 AC_DEFUN([RTEMS_BSPOPTS_SET],[dnl
 m4_append([_$1],
@@ -61,6 +61,6 @@ dnl Stripped down version of autoconf-2.52's AC_ARG_VAR.
 AC_DEFUN([RTEMS_ARG_VAR],
 [
 m4_expand_once([m4_divert_once([HELP_VAR],
-[AC_HELP_STRING([$1], [$2], [              ])])],
+[AS_HELP_STRING([$1],[$2],              )])],
       [$0($1)])dnl
 ])

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

@@ -0,0 +1,49 @@
+dnl
+dnl $Id$
+dnl
+
+dnl canonicalize target cpu
+dnl NOTE: Most rtems targets do not fullfil autoconf's
+dnl target naming conventions "processor-vendor-os"
+dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
+dnl and we have to fix it for rtems ourselves 
+
+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
+	;;
+  tic4x-*rtems*)          	# gcc changed the name
+	RTEMS_CPU=c4x
+	RTEMS_HOST=$host_os
+	;;
+  *) 
+	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/canonicalize-tools.m4

@@ -0,0 +1,17 @@
+dnl
+dnl $Id$
+dnl
+dnl Set target tools
+dnl
+
+AC_DEFUN([RTEMS_CANONICALIZE_TOOLS],
+[AC_REQUIRE([RTEMS_PROG_CC])dnl
+
+dnl FIXME: What shall be done if these tools are not available?
+  RTEMS_CHECK_TOOL(AR,ar,no)
+  RTEMS_CHECK_TOOL(AS,as,no)
+  RTEMS_CHECK_TOOL(LD,ld,no)
+
+dnl special treatment of ranlib
+  RTEMS_CHECK_TOOL(RANLIB,ranlib,:)
+])

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

@@ -0,0 +1,24 @@
+dnl $Id$
+
+AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
+  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"
+      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-cxx.m4

@@ -0,0 +1,20 @@
+dnl $Id$
+dnl
+AC_DEFUN([RTEMS_CHECK_CXX],
+[dnl
+AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
+AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl
+AC_CACHE_CHECK([whether to build rtems++],
+  rtems_cv_HAS_CPLUSPLUS,
+  [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
+      if test -n "$CXX"; then
+        rtems_cv_HAS_CPLUSPLUS="yes"
+      else
+        rtems_cv_HAS_CPLUSPLUS="no"
+      fi
+    else
+      rtems_cv_HAS_CPLUSPLUS="no"
+    fi])
+HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
+AC_SUBST(HAS_CPLUSPLUS)dnl
+])

c/src/aclocal/check-multiprocessing.m4

@@ -2,14 +2,13 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+AC_DEFUN([RTEMS_CHECK_MULTIPROCESSING],
 [dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl
 AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
 AC_REQUIRE([RTEMS_TOP])dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
-AC_REQUIRE([RTEMS_BSP_ALIAS])dnl
 
 AC_CACHE_CHECK([if wanting multiprocessing],
   [rtems_cv_want_multiprocessing],
@@ -38,5 +37,5 @@ AC_MSG_ERROR([multiprocessing requested but not supported])
 fi
 ],[rtems_cv_HAS_MP="no";])
 
-AC_SUBST(HAS_MP,[$rtems_cv_HAS_MP])
+AM_CONDITIONAL(HAS_MP,[test x"$rtems_cv_HAS_MP" = x"yes"])
 ])

c/src/aclocal/check-networking.m4

@@ -1,8 +1,8 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_NETWORKING,
+AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
 
 AC_CACHE_CHECK([whether BSP supports networking],

c/src/aclocal/check-posix.m4

@@ -1,8 +1,8 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_POSIX_API,
+AC_DEFUN([RTEMS_CHECK_POSIX_API],
 [dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
 
 AC_CACHE_CHECK([whether CPU supports libposix],
@@ -28,7 +28,7 @@ fi
 AC_SUBST(HAS_POSIX_API)dnl
 ])
 
-AC_DEFUN(RTEMS_DEFINE_POSIX_API,
+AC_DEFUN([RTEMS_DEFINE_POSIX_API],
 [AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
 AS_IF(
   [test x"${HAS_POSIX_API}" = x"yes"],

c/src/aclocal/check-rdbg.m4

@@ -0,0 +1,33 @@
+dnl $Id$
+dnl
+AC_DEFUN([RTEMS_CHECK_RDBG],
+[dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
+AC_REQUIRE([RTEMS_CHECK_NETWORKING])dnl
+AC_REQUIRE([RTEMS_ENABLE_RDBG])dnl
+AC_CACHE_CHECK([whether BSP supports librdbg],
+  rtems_cv_HAS_RDBG,
+  [
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/librdbg/src/${RTEMS_CPU}/${$1}";
+    then
+      rtems_cv_HAS_RDBG="yes" ;
+    elif test -d "$srcdir/${RTEMS_TOPdir}/c/src/librdbg/src/${RTEMS_CPU}/any"; 
+    then
+      rtems_cv_HAS_RDBG="yes" ;
+    elif test "${RTEMS_CPU}" = "powerpc"; 
+    then
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+          [],
+          [#if defined(_OLD_EXCEPTIONS)
+            choke me
+           #endif])],
+          [rtems_cv_HAS_RDBG=yes],
+          [rtems_cv_HAS_RDBG=no])
+    else
+      rtems_cv_HAS_RDBG="no";
+    fi
+  ])
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+])

c/src/aclocal/check-tool.m4

@@ -0,0 +1,11 @@
+dnl $Id$
+
+## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to
+## the un-prefixed version of PROG-TO-CHECK-FOR.
+dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([RTEMS_CHECK_TOOL],
+[
+  AS_IF([test "x$build_alias" != "x$host_alias"],
+    [rtems_tool_prefix=${ac_tool_prefix}])
+  AC_CHECK_PROG($1, ${rtems_tool_prefix}$2, ${rtems_tool_prefix}$2, $3, $4)
+])

c/src/aclocal/config-subdirs.m4

@@ -11,7 +11,7 @@ dnl
 dnl
 dnl _AC_DOTS(PATH)
 dnl
-AC_DEFUN(_AC_DOTS,[
+AC_DEFUN([_AC_DOTS],[
 # A "../" for each directory in $1.
     ac_dots=`echo $1 | \
              sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
@@ -20,7 +20,7 @@ AC_DEFUN(_AC_DOTS,[
 dnl
 dnl _RTEMS_ADJUST_SRCDIR(REVAR,CONFIG_DIR[,TARGET_SUBDIR])
 dnl
-AC_DEFUN(_RTEMS_ADJUST_SRCDIR,[
+AC_DEFUN([_RTEMS_ADJUST_SRCDIR],[
     _AC_DOTS(ifelse([$3], ,[$2],[$3/$2]))
 
     case "$srcdir" in

c/src/aclocal/enable-cxx.m4

@@ -0,0 +1,12 @@
+dnl $Id$
+
+AC_DEFUN([RTEMS_ENABLE_CXX],
+[
+AC_ARG_ENABLE(cxx,
+[AS_HELP_STRING(--enable-cxx,enable C++ support and build the rtems++ library)],
+[case "${enable_cxx}" in
+  yes) RTEMS_HAS_CPLUSPLUS=yes ;;
+  no) RTEMS_HAS_CPLUSPLUS=no   ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-cxx option) ;;
+esac], [RTEMS_HAS_CPLUSPLUS=no])
+])

c/src/aclocal/enable-multiprocessing.m4

@@ -0,0 +1,12 @@
+dnl $Id$
+
+AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
+[
+AC_ARG_ENABLE(multiprocessing,
+[AS_HELP_STRING(--enable-multiprocessing,enable multiprocessing interface)],
+[case "${enable_multiprocessing}" in 
+  yes) ;;
+  no) ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
+esac],[enable_multiprocessing=no])
+])

c/src/aclocal/enable-networking.m4

@@ -0,0 +1,15 @@
+dnl $Id$
+
+AC_DEFUN([RTEMS_ENABLE_NETWORKING],
+[
+## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
+
+AC_ARG_ENABLE(networking,
+[AS_HELP_STRING(--enable-networking,enable TCP/IP stack)],
+[case "${enableval}" in
+  yes) RTEMS_HAS_NETWORKING=yes ;;
+  no) RTEMS_HAS_NETWORKING=no ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
+esac],[RTEMS_HAS_NETWORKING=yes])
+AC_SUBST(RTEMS_HAS_NETWORKING)dnl
+])

c/src/aclocal/enable-posix.m4

@@ -0,0 +1,33 @@
+dnl $Id$
+
+AC_DEFUN([RTEMS_ENABLE_POSIX],
+[
+## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
+
+AC_ARG_ENABLE(posix,
+[AS_HELP_STRING(--enable-posix,enable posix interface)],
+[case "${enableval}" in 
+  yes) RTEMS_HAS_POSIX_API=yes ;;
+  no) RTEMS_HAS_POSIX_API=no ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
+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
+AC_SUBST(RTEMS_HAS_POSIX_API)
+])

c/src/aclocal/enable-rdbg.m4

@@ -0,0 +1,15 @@
+dnl $Id$
+
+AC_DEFUN([RTEMS_ENABLE_RDBG],
+[
+AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
+
+AC_ARG_ENABLE(rdbg,
+[AS_HELP_STRING(--enable-rdbg,enable remote debugger)],
+[case "${enableval}" in
+  yes) RTEMS_HAS_RDBG=yes ;;
+  no) RTEMS_HAS_RDBG=no ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-rdbg option) ;;
+esac],[RTEMS_HAS_RDBG=no])
+AC_SUBST(RTEMS_HAS_RDBG)dnl
+])

c/src/aclocal/enable-rtemsbsp.m4

@@ -0,0 +1,15 @@
+dnl $Id$
+
+dnl Override the set of BSPs to be built.
+dnl used by the toplevel configure script
+dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list)
+AC_DEFUN([RTEMS_ENABLE_RTEMSBSP],
+[
+AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
+AC_ARG_ENABLE(rtemsbsp,
+[AS_HELP_STRING(--enable-rtemsbsp="bsp1 bsp2 ..",BSPs to include in build)],
+[case "${enableval}" in
+  yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp="bsp1 bsp2"]);;
+  *) $1=$enableval;;
+esac],[$1=""])
+])

c/src/aclocal/env-rtemsbsp.m4

@@ -0,0 +1,41 @@
+dnl $Id$
+
+dnl Pass a single BSP via an environment variable
+dnl used by per BSP configure scripts
+AC_DEFUN([RTEMS_ENV_RTEMSBSP],
+[dnl
+AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
+AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
+AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
+
+# AC_ARG_VAR([CPU_CFLAGS],[CFLAGS specifying CPU-dependent features])
+# AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[CFLAGS for building the OPTIMIZE variant])
+# AC_ARG_VAR([CFLAGS_DEBUG_V],[CFLAGS for building the DEBUG variant])
+AC_ARG_VAR([RTEMS_BSP_FAMILY],[RTEMS's BSP directory])
+AC_ARG_VAR([RTEMS_CPU_MODEL],[RTEMS's cpu model])
+
+AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
+AC_MSG_CHECKING([for RTEMS_BSP])
+AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
+[dnl
+  test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP";
+])dnl
+if test -z "$rtems_cv_RTEMS_BSP"; then
+  AC_MSG_ERROR([Missing RTEMS_BSP])
+fi
+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"
+
+AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"])
+AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib"])
+AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"])
+
+AC_SUBST([project_libdir],["\$(libdir)"])
+AC_SUBST([project_includedir],["\$(includedir)"])
+])

c/src/aclocal/gcc-isystem.m4

@@ -0,0 +1,25 @@
+dnl
+dnl $Id$
+dnl
+dnl Check whether the gcc accepts -isystem
+dnl
+
+AC_DEFUN([RTEMS_GCC_ISYSTEM],
+[AC_REQUIRE([RTEMS_PROG_CC])
+AC_CACHE_CHECK(whether $CC accepts -isystem,rtems_cv_gcc_isystem,
+[
+rtems_cv_gcc_isystem=no
+if test x"$GCC" = x"yes"; then
+cat << EOF > conftest.h
+int conftest123();
+EOF
+cat << EOF > conftest.c
+#include <conftest.h>
+int conftest123() {}
+EOF
+  if test -z "`${CC} -isystem./ -c conftest.c 2>&1`";then
+    rtems_cv_gcc_isystem=yes
+  fi
+fi
+rm -f conftest*
+])])

c/src/aclocal/gcc-pipe.m4

@@ -4,7 +4,7 @@ dnl
 dnl Check whether the target compiler accepts -pipe
 dnl
 
-AC_DEFUN(RTEMS_GCC_PIPE,
+AC_DEFUN([RTEMS_GCC_PIPE],
 [AC_REQUIRE([RTEMS_PROG_CC]) 
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_CACHE_CHECK(whether $CC accepts --pipe,rtems_cv_gcc_pipe,

c/src/aclocal/gcc-specs.m4

@@ -0,0 +1,20 @@
+dnl
+dnl $Id$
+dnl
+dnl Check whether the target compiler accepts -specs
+dnl
+
+AC_DEFUN([RTEMS_GCC_SPECS],
+[AC_REQUIRE([RTEMS_PROG_CC])
+AC_CACHE_CHECK(whether $CC accepts -specs,rtems_cv_gcc_specs,
+[
+rtems_cv_gcc_specs=no
+if test x"$GCC" = x"yes"; then
+  touch confspec
+  echo 'void f(){}' >conftest.c
+  if test -z "`${CC} -specs confspec -c conftest.c 2>&1`";then
+    rtems_cv_gcc_specs=yes
+  fi
+fi
+rm -f confspec conftest*
+])])

c/src/aclocal/gcc-weak.m4

@@ -0,0 +1,19 @@
+AC_DEFUN([RTEMS_CHECK_GCC_WEAK],[
+AC_CACHE_CHECK([whether $CC supports function __attribute__((weak))],
+[rtems_cv_cc_attribute_weak],[
+  AS_IF([test x"$GCC" = xyes],[
+    save_CFLAGS=$CFLAGS
+    CFLAGS=-Werror])
+
+  AC_COMPILE_IFELSE([
+    AC_LANG_PROGRAM(
+    [void myfunc(char c) __attribute__ ((weak));
+     void myfunc(char c) {}],
+    [])],
+    [rtems_cv_cc_attribute_weak=yes],
+    [rtems_cv_cc_attribute_weak=no])
+
+  AS_IF([test x"$GCC" = xyes],[
+    CFLAGS=$save_CFLAGS])
+])
+])

c/src/aclocal/i386-gas-code16.m4

@@ -5,7 +5,7 @@ dnl
 dnl check for i386 gas supporting 16 bit mode
 dnl     - binutils 2.9.1.0.7 and higher
 
-AC_DEFUN(RTEMS_I386_GAS_CODE16,
+AC_DEFUN([RTEMS_I386_GAS_CODE16],
 [ if test "${host_cpu}" = "i386"; then
     AC_CACHE_CHECK([for 16 bit mode assembler support],
       rtems_cv_prog_gas_code16,

c/src/aclocal/multilib.m4

@@ -0,0 +1,16 @@
+dnl This provides configure definitions used for multilib support
+
+dnl parts of these macros are derived from newlib-1.8.2's multilib support
+
+AC_DEFUN([RTEMS_ENABLE_MULTILIB],
+[
+AC_ARG_ENABLE(multilib,
+AS_HELP_STRING(--enable-multilib,build many library versions (default=no)),
+[case "${enableval}" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
+ esac], [multilib=no])dnl
+
+AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes")
+])

c/src/aclocal/path-ksh.m4

@@ -0,0 +1,14 @@
+dnl $Id$
+
+AC_DEFUN([RTEMS_PATH_KSH],
+[
+dnl NOTE: prefer bash over ksh over sh
+AC_PATH_PROGS(KSH,bash ksh sh)
+if test -z "$KSH"; then
+dnl NOTE: This cannot happen -- /bin/sh must always exist
+AC_MSG_ERROR(
+[***]
+[    Cannot determine a usable shell bash/ksh/sh]
+[    Please contact your system administrator] );
+fi
+])

c/src/aclocal/ppc.m4

@@ -0,0 +1,21 @@
+# $Id$
+#
+# Some hacks for handling powerpc-exception subdirectories
+#
+# Note: Consider this file a temporary band-aid until a better, more general
+# subdirectory handling solution is introduced to RTEMS.
+
+AC_DEFUN([RTEMS_PPC_EXCEPTIONS],
+[
+AC_MSG_CHECKING([for style of powerpc exceptions])
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
+    [],
+    [#if defined(_OLD_EXCEPTIONS)
+     choke me
+     #endif])],
+  [EXCEPTIONS=new],
+  [EXCEPTIONS=old])
+AC_MSG_RESULT([$EXCEPTIONS])
+AC_SUBST([exceptions],[$EXCEPTIONS-exceptions])
+])

c/src/aclocal/prog-cc.m4

@@ -0,0 +1,54 @@
+dnl
+dnl $Id$
+dnl 
+dnl Check for target gcc
+dnl
+
+AC_DEFUN([RTEMS_PROG_CC],
+[
+AC_BEFORE([$0], [AC_PROG_CPP])dnl
+AC_BEFORE([$0], [AC_PROG_CC])dnl
+AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
+
+RTEMS_CHECK_TOOL(CC,gcc)
+test -z "$CC" && \
+  AC_MSG_ERROR([no acceptable cc found in \$PATH])
+AC_PROG_CC
+AC_PROG_CPP
+])
+
+AC_DEFUN([RTEMS_PROG_CC_FOR_TARGET],
+[
+dnl check target cc
+RTEMS_PROG_CC
+dnl check if the compiler supports -isystem
+RTEMS_GCC_ISYSTEM
+dnl check if the target compiler may use --pipe
+RTEMS_GCC_PIPE
+test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
+
+dnl check if the compiler supports --specs
+RTEMS_GCC_SPECS
+
+AS_IF([test x"$rtems_cv_gcc_specs" = xyes],[
+GCCSPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
+GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
+AC_SUBST(GCCSPECS)
+
+if test "$GCC" = yes; then
+RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
+m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
+fi
+AC_SUBST(RTEMS_CFLAGS)
+
+AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[
+  RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[
+  RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
+])
+AC_SUBST(RTEMS_CPPFLAGS)
+
+AS_IF([test "$GCC" = yes],[
+  RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -Wl,-r"
+])
+AC_SUBST(RTEMS_RELLDFLAGS)
+])

c/src/aclocal/prog-ccas.m4

@@ -0,0 +1,8 @@
+## $Id$
+
+AC_DEFUN([RTEMS_PROG_CCAS],
+[
+AC_REQUIRE([RTEMS_PROG_CC])
+AM_PROG_AS
+AC_SUBST(RTEMS_CCASFLAGS,["-DASM"])
+])

c/src/aclocal/prog-cxx.m4

@@ -0,0 +1,34 @@
+dnl
+dnl $Id$
+dnl 
+dnl Check for target g++
+dnl 
+
+AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
+[
+AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
+AC_REQUIRE([RTEMS_ENABLE_CXX])
+RTEMS_CHECK_TOOL(CXX,g++)
+if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
+then
+  CXXFLAGS=${CXXFLAGS-${CFLAGS}}
+
+dnl Only accept g++
+dnl NOTE: This might be too restrictive
+test -z "$CXX" \
+  && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
+AC_PROG_CXX
+AC_PROG_CXXCPP
+
+  if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
+    AC_MSG_ERROR([***]
+     [Inconsistency in compiler configuration:]
+     [Target C compiler and target C++ compiler]
+     [must both either be cross compilers or native compilers]
+     [Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
+  fi
+else
+## Work-around to a bug in automake
+AM_CONDITIONAL([am__fastdepCXX],[false])
+fi
+])

c/src/aclocal/project-root.m4

@@ -0,0 +1,10 @@
+dnl
+dnl $Id$
+dnl 
+
+AC_DEFUN([RTEMS_PROJECT_ROOT],
+[dnl
+AC_REQUIRE([RTEMS_TOP])
+AC_REQUIRE([RTEMS_AMPOLISH3])
+])
+