rpc: misaligned address exception in get_myaddress.c

updates #2249 see #1401

.gitignore

@@ -2,4 +2,8 @@ aclocal.m4
 autom4te.cache
 configure
 config.h.in
+config.guess
+config.sub
+install-sh
 Makefile.in
+missing

INSTALL

@@ -1,4 +1,51 @@
+#
+#  $Id$
+#
+
 Building RTEMS
 ==============
-See the documentation referred to in the README.
+See the file README.configure.
+
+
+UNCOMPRESSING .tgz FILES
+===========================
+Many of the files found in this directory and its subdirectories 
+are gzip'ed, tar archive files.  These files have the ".tgz"
+extension.  They were compressed with gzip version 1.2.4.  
+
+Use a command sequence similar to the following to uncompress each
+file:
+
+   gzcat FILE.tgz | tar xvof -
+
+where FILE.tgz is the file to be installed.  This procedure will
+extract the files in the archive into the current directory.
+All of the .tgz files associated with this release RTEMS will
+place their contents in a subdirectory rtems-<release> in the current
+directory.
+
+If you are unsure of what is in an RTEMS archive file, then use
+the following command sequence to get a listing of the contents:
+
+   gzcat FILE.tgz | tar tvf -
+
+NOTES:  
+
+(1) The "-o" option to tar is included on the tar command line
+    so that the user extracting the tar archive will own the extracted
+    files.
+
+(2) gzcat is sometimes installed as zcat.  Be warned that on many
+    (most) UNIX machines, zcat is associated with compress (.Z files).
+
+(3) If you do not have gzip 1.2.4, it is available from numerous sites
+    including this one.  Other sites include ftp.gnu.org and ftp.cdrom.com.
+    
+(4) The GNU archive files included in this distribution are packaged
+    exactly like they are on official GNU ftp sites.  When extracting
+    GNU archives, they will not extract under a rtems-<version> 
+    directory.  They will extract themselves under a directory which
+    is the name and version of the tool in question.  For example,
+    gcc-2.5.8.tgz will extract its contents into the subdirectory 
+    gcc-2.5.8.
 

LICENSE

@@ -1,3 +1,6 @@
+#
+#  $Id$
+# 
                       LICENSE INFORMATION
 
 RTEMS is free software; you can redistribute it and/or modify it under

LICENSE.JFFS2

@@ -1,30 +0,0 @@
-The files in this directory and elsewhere which refer to this LICENCE
-file are part of JFFS2, the Journalling Flash File System v2.
-
-	Copyright © 2001-2007 Red Hat, Inc. and others
-
-JFFS2 is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 or (at your option) any later 
-version.
-
-JFFS2 is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License along
-with JFFS2; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-As a special exception, if other files instantiate templates or use
-macros or inline functions from these files, or you compile these
-files and link them with other works to produce a work based on these
-files, these files do not by themselves cause the resulting work to be
-covered by the GNU General Public License. However the source code for
-these files must still be made available in accordance with section (3)
-of the GNU General Public License.
-
-This exception does not invalidate any other reasons why a work based on
-this file might be covered by the GNU General Public License.
-

LICENSE.NET

@@ -1,3 +1,7 @@
+#
+#  $Id$
+#
+
 The RTEMS TCP/IP stack is a port of the FreeBSD TCP/IP stack.  The following
 copyright and licensing information applies to this code.
 

LICENSE.RPCXDR

@@ -1,3 +1,7 @@
+#
+#  $Id$
+#
+
 The RTEMS RPC/XDR support is a port of the freely distributed
 Sun Microsystems implementation.  The following copyright and
 licensing information applies to this code.

LICENSE.WEBSERVER

@@ -0,0 +1,8 @@
+#
+#  $Id$
+#
+
+The source code in c/src/libnetworking/rtems_webserver is a port
+of the Go Ahead Software, Inc. WebServer.  Their copyright and 
+licensing terms apply.  See c/src/libnetworking/rtems_webserver/license.txt
+for details.

MAINTAINERS

@@ -1,55 +1,54 @@
+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
 ===========
-This file contains information about people who are permitted to make
-changes to 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.org
+		Blanket Write Privileges (alphabetical order)
 
-To report problems in RTEMS, please visit: http://www.rtems.org/bugs.html
+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
 
-RTEMS is maintained by collection of volunteers.  RTEMS is a very
-broad and diverse project which requires expertise in many areas.
-This breadth of knowledge exceeds the capabilities of any
-single person. Each volunteer has areas of expertise where they
-are more comfortable but each is capable of making technical
-decisions across the entirety of RTEMS.
+		Various Component Maintainers
 
-Blanket Write Privileges are granted to experienced RTEMS developers
-who can be trusted to distinguish between changes which require
-others to review, require a problem report, or can be safely committed
-with limited review.
+Networking		NAME-TBD		EMAIL-TBD
 
-Write After Approval is granted to experienced but also trusted 
-RTEMS developers.  These developers may be less familiar with
-the breadth of RTEMS.  Developers with write after approval need
-to submit their patches for review. Once the patches have been
-approved by a developer with Blanket Write Privileges, the patches
-may be checked in.  
+			CPU Port Maintainers	(CPU alphabetical order)
 
-Localized Write Permission is for developers who have primary
-responsibility for a port and all associated BSPs, a BSP, or other
-specific aspects of RTEMS.  These folks are allowed to make changes to
-areas they maintain and related documentation, web pages, and test cases
-without approval from anyone else, and approve other people's changes
-in those areas. They must get approval for changes elsewhere in RTEMS.
+arm			Jay Monkman		jtm@lopingdog.com
+avr			Ralf Corsepius		ralf.corsepius@rtems.org
+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
 
-Blanket Write Privileges
-========================
-Jennifer Averett           jennifer.averett@OARcorp.com
-Thomas Doefler             Thomas.Doerfler@embedded-brains.de
-Sebastian Huber            sebastian.huber@embedded-brains.de
-Chris Johns                chrisj@rtems.org
-Joel Sherrill              joel.sherrill@OARcorp.com
-Gedare Bloom               gedare@rtems.org
+		    BSP Maintainers		(CPU/BSP alphabetical order)
 
-Write After Approval
-====================
-Daniel Hellstrom           daniel@gaisler.com
-Ben Gras                   beng@rtems.org
-
-Localized Write Permission
-==========================
-sparc                      Daniel Hellstrom (daniel@gaisler.com)
-beagle                     Ben Gras (beng@rtems.org)
+CPU/BSP			NAME-TBD		EMAIL-TBD
+arm/edb7312  		Jay Monkman		jtm@lopingdog.com
+arm/gp32		Philippe Simons		loki_666@fastmail.fm
 

Makefile.am

@@ -1,10 +1,13 @@
 #
 # top level directory for RTEMS build tree
 #
+##
+## $Id$
+##
 
 ACLOCAL_AMFLAGS = -I aclocal
 
-SUBDIRS = $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
+SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
 DIST_SUBDIRS = $(SUBDIRS)
 
 noinst_SCRIPTS = bootstrap
@@ -14,7 +17,7 @@ EXTRA_DIST += config-ml.in
 EXTRA_DIST += ampolish3
 
 dist-hook:
-	@files=`(cd $(srcdir); find cpukit c testsuites tools \
+	@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 : ; \
@@ -37,22 +40,5 @@ dist-hook:
 	  f=`echo $$a | sed 's,\.in$$,,'`; \
 	  if test -f $$f; then echo "rm $$f"; rm $$f; fi; done
 
-rtems_makedir = $(prefix)/make
-
-dist_rtems_make_DATA = 
-dist_rtems_make_DATA += make/main.cfg
-dist_rtems_make_DATA += make/leaf.cfg
-
-rtems_make_Templatesdir = $(pkgdatadir)/make/Templates
-
-dist_rtems_make_Templates_DATA =
-dist_rtems_make_Templates_DATA += make/Templates/Makefile.dir
-dist_rtems_make_Templates_DATA += make/Templates/Makefile.leaf
-dist_rtems_make_Templates_DATA += make/Templates/Makefile.lib
-
-rtems_make_customdir = $(rtems_makedir)/custom
-
-dist_rtems_make_custom_DATA = make/custom/default.cfg
-
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/host.am

Makefile.maint

@@ -31,7 +31,7 @@ TAG_SUFFIX = -test1
 
 rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};')
 rtems_tag     := $(shell echo "rtems-$(rtems_version)" | tr . -)
-rtems_api     := 4.10
+rtems_api     := 4.9
 PATH          := /opt/rtems-$(rtems_api)/bin:$(PATH)
 
 # -----------------
@@ -54,6 +54,15 @@ rtems-$(rtems_version)/stamp.export.$(rtems_tag)$(TAG_SUFFIX):
 rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2: rtems-$(rtems_version)/stamp.autofiles \
 	  rtems-$(rtems_version)/excludes \
 	  rtems-$(rtems_version)/TOOL_VERSIONS
+	cd rtems-$(rtems_version) ; \
+	  touch doc/ada_user/ada_user.texi doc/bsp_howto/bsp_howto.texi \
+	    doc/cpu_supplement/cpu_supplement.texi \
+	    doc/develenv/develenv.texi doc/filesystem/filesystem.texi \
+	    doc/itron3.0/itron.texi doc/networking/networking.texi \
+	    doc/new_chapters/new_chapters.texi doc/porting/porting.texi \
+	    doc/posix1003.1/posix1003_1.texi doc/posix_users/posix_users.texi \
+	    doc/relnotes/relnotes.texi doc/started/started.texi \
+	    doc/user/c_user.texi
 	tar -cj -X rtems-$(rtems_version)/excludes \
 	  -f rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2 rtems-$(rtems_version)
 
@@ -122,23 +131,6 @@ new-revision:
 	  $(VERSION_FILES); \
 	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
 
-# -----------------
-# Create a new branch
-# increments the 2nd digit of the version number
-# set the 3rd digit of the version number to 99
-# set the 4rd digit of the version number to 0
-# Example: 4.6.34.4 -> 4.7.99.0
-new-branch:
-	v=$$(echo $(rtems_version) | sed 's,^\([0-9]\+\).*,\1,'); \
-	r=$$(echo $(rtems_version) | sed 's,^[0-9]\+\.\([0-9]\+\).*,\1,'); \
-	r=$$(($$r + 1)); version="$$v.$$r.99.0"; \
-	api="$$v.$$(($$r + 1))"; \
-	echo "New branch release: $$version"; \
-	sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
-	  -e "s|\[_RTEMS_API\],\[.*\]|\[_RTEMS_API\],\[$$api\]|" \
-	  $(VERSION_FILES); \
-	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
-
 VERSION_FILES += aclocal/version.m4
 VERSION_FILES += cpukit/aclocal/version.m4
 VERSION_FILES += c/src/aclocal/version.m4
@@ -150,4 +142,4 @@ commit:
 	$(CVS_RUN) commit -m "Upgrade to $(rtems_version)" \
 	  $(VERSION_FILES) VERSION
 
-.PHONY: commit new-minor new-revision new-branch tag tarball
+.PHONY: commit new-minor new-revision tag tarball

README

@@ -1,24 +1,97 @@
-This is the Real-Time Executive for Multiprocessing Systems (RTEMS).
-The version number for this software is indicated in the VERSION file.
+#
+#  $Id$
+#
 
-See the documentation manuals in doc/ with daily builds available online at
-http://rtems.org/onlinedocs/doc-current/share/rtems/html/ and released builds
-at http://www.rtems.org/onlinedocs/releases/ for information on building,
-installing, and using RTEMS. The INSTALL file tells you to come back here.
+Building RTEMS
+==============
+See the file README.configure.
 
-See the RTEMS Wiki at http://devel.rtems.org for community knowledge and
-tutorials.
+Directory Overview
+==================
 
-RTEMS Doxygen available at http://www.rtems.org/onlinedocs/doxygen/cpukit/html
+This is the top level of the RTEMS directory structure.  The following 
+is a description of the files and directories in this directory:
 
-The RTEMS Project maintains mailing lists which are used for most
-discussions:
+  INSTALL
+    Rudimentary installation instructions.  For more detailed
+    information please see the Release Notes.  The Postscript 
+    version of this manual can be found in the file
+    c_or_ada/doc/relnotes.tgz.
 
-* For general-purpose questions related to using RTEMS, use the
-  rtems-users ml: https://lists.rtems.org/mailman/listinfo/users
-* For questions and discussion related to development of RTEMS, use the
-  rtems-devel ml: https://lists.rtems.org/mailman/listinfo/devel
+  LICENSE
+    Required legalese.
 
-See https://devel.rtems.org/ to view existing or file a new issue
-report ticket.
+  README
+    This file.
 
+  c
+    This directory contains the source code for the C 
+    implementation of RTEMS as well as the test suites, sample 
+    applications, Board Support Packages, Device Drivers, and 
+    support libraries.
+
+  doc
+    This directory contains the PDL for the RTEMS executive.
+
+Ada versus C
+============
+
+There are two implementations of RTEMS in this source tree -- 
+in Ada and in C.  These two implementations are functionally
+and structurally equivalent.  The C implementation follows
+the packaging conventions and hierarchical nature of the Ada 
+implementation.  In addition, a style has been followed which 
+allows one to easily find the corresponding Ada and C 
+implementations.  
+
+File names in C and code placement was carefully designed to insure
+a close mapping to the Ada implementation.  The following file name 
+extensions are used:
+
+   .adb - Ada body
+   .ads - Ada specification
+   .adp - Ada body requiring preprocessing
+   .inc - include file for .adp files
+
+   .c   - C body (non-inlined routines)
+   .inl - C body (inlined routines)
+   .h   - C specification
+
+In the executive source, XYZ.c and XYZ.inl correspond directly to a 
+single XYZ.adb or XYZ.adp file.  A .h file corresponds directly to
+the .ads file.  There are only a handful of .inc files in the 
+Ada source and these are used to insure that the desired simple 
+inline textual expansion is performed.  This avoids scoping and
+calling convention side-effects in carefully constructed tests 
+which usually test context switch behavior.
+
+In addition, in Ada code and data name references are always fully
+qualified as PACKAGE.NAME.  In C, this convention is followed 
+by having the package name as part of the name itself and using a
+capital letter to indicate the presence of a "." level.  So we have
+PACKAGE.NAME in Ada and _Package_Name in C.  The leading "_" in C
+is used to avoid naming conflicts between RTEMS and user variables.
+By using these conventions, one can easily compare the C and Ada
+implementations.
+
+The most noticeable difference between the C and Ada83 code is 
+the inability to easily obtain a "typed pointer" in Ada83.  
+Using the "&" operator in C yields a pointer with a specific type.
+The 'Address attribute is the closest feature in Ada83.  This
+returns a System.Address and this must be coerced via Unchecked_Conversion
+into an access type of the desired type.  It is easy to view 
+System.Address as similar to a "void *" in C, but this is not the case.
+A "void *" can be assigned to any other pointer type without an
+explicit conversion.  
+
+The solution adopted to this problem was to provide two routines for
+each access type in the Ada implementation -- one to convert from
+System.Address to the access type and another to go the opposite
+direction.  This results in code which accomplishes the same thing
+as the corresponding C but it is easier to get lost in the clutter
+of the apparent subprogram invocations than the "less bulky"
+C equivalent.
+
+A related difference is the types which are only in Ada which are used 
+for pointers to arrays.  These types do not exist and are not needed 
+in the C implementation.

README.cdn-X

@@ -0,0 +1,73 @@
+Building RTEMS Canadian Cross
+=============================
+
+RTEMS now contains experimental and yet incomplete support for building
+it Canadian Cross.
+
+1. Introduction
+---------------
+If you don't know what Canadian Cross Building means, you probably don't want
+to apply it and should consider stop reading here. 
+
+Interested readers might want to read Ian Lance Taylor's article at 
+http://www.airs.com/ian/configure for underlaying details and working 
+principles.
+
+
+2. RTEMS
+--------
+Example: Building RTEMS for sparc-rtems under i386-pc-linux-gnu to be hosted 
+on a i386-cygwin platform.
+
+2.1 Required tools
+------------------
+* A i386-pc-linux-gnu cross sparc-rtems toolchain.
+* A i386-pc-linux-gnu cross i386-cygwin toolchain.
+* A i386-pc-linux-gnu native toolchain.
+
+We further on assume these to be installed to these locations:
+/opt/rtems .. linux cross sparc-rtems toolchain
+/opt/cygwin .. linux cross i386-cygwin cross-toolchain
+/usr .. linux native toolchain and further tools. 
+
+2.2 Building sparc-rtems
+------------------------
+The first step is to build RTEMS for sparc-rtems under linux. 
+
+mkdir build
+cd build
+<path>/rtems/configure [options] \
+--target=sparc-rtems \
+--prefix=/opt/cygwin
+make
+make install
+
+This will build a standard sparc-rtems RTEMS and install it to the given 
+PREFIX.
+
+2.3 Building i386-cygwin host support
+-------------------------------------
+The next step is to build RTEMS host support for i386-cygwin.
+This basically means to cross-build the host tools contained in RTEMS.
+
+mkdir host
+cd host
+<path>/rtems/configure [options] \
+--target=sparc-rtems \
+--build=`<path>/rtems/config.guess` \
+--host=i386-cygwin \
+--prefix=/opt/cygwin
+make
+make install
+
+This will build RTEMS host-tools for i386-cygwin and install them to the given
+PREFIX.
+
+
+3. Known issues
+---------------
+
+* At present time, building RTEMS Canadian Cross is known to be immature, and
+to require additional work. Do not expect this to work.
+
+* The <toplevel>/make/ directory hierarchy is not treated correctly.

README.configure

@@ -0,0 +1,250 @@
+#
+#  $Id$
+#
+
+1. Autoconf support
+===================
+
+This version of RTEMS is configured with GNU autoconf. RTEMS can be
+configured and built either standalone or together with the compiler
+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.59 and automake-1.8 are required.
+
+2. Installation
+===============
+
+2.1 Standalone build
+
+To configure RTEMS for a specific target, run configure in the build
+directory. In addition to the standard configure options, the following
+RTEMS-specific option are supported:
+
+      --disable-rtems-inlines
+      --disable-posix
+      --disable-itron
+      --disable-networking
+      --enable-cxx
+      --enable-bare-cpu-model=<MODEL>
+      --enable-bare-cpu-cflags=<FLAGS>
+      --enable-multiprocessing
+      --enable-rtemsbsp="bsp1 bsp2 ..."
+      --enable-tests
+      --enable-rdbg            (only valid for i386 and some PowerPC BSPs)
+      --enable-docs
+
+In addition, the following standard autoconf options are frequently
+used when configuring RTEMS installations:
+
+      --prefix=INSTALL_DIRECTORY
+
+By default, inline routines are used instead of macros where possible.
+Macros can be selected using the --disable-inlines option.  [NOTE:
+Some APIs may not support macro versions of their inline routines.]
+
+By default, the RTEMS POSIX 1003.1b interface is built for targets that support
+it. It can be disabled with the --disable-posix option.
+
+By default, the RTEMS uITRON interface is built for targets that support
+it. It can be disabled with the --disable-itron option.
+
+By default, the RTEMS networking support is built for targets which
+support it.  It can be specifically disabled for those targets
+with the --disable-networking option.
+
+By default, the RTEMS remote debugger server support is not built.
+It can be specifically enabled for the targets that support it.
+with the --enable-rdbg option. NB : the RTEMS networking support
+must be enabled to support the remote debugger server.
+
+By default, the RTEMS support of C++ is disabled.  It can be enabled
+with the --enable-cxx option. If the rtems++ C++ library is installed
+it will also be build.
+
+By default, the RTEMS test suites are NOT configured -- only the 
+sample tests are built.  --enable-tests will configure
+the RTEMS test suite. The default speeds up the build
+and configure process when the tests are not desired.
+
+By default, RTEMS is built using arguments and build rules which require a
+gcc supporting the -specs option, ie. a gcc >= 2.8.
+[The --disable-gcc28 option, which has been present in former releases, has
+been removed.]
+
+By default, multiprocessing is is not built.  It can be enabled
+for those BSPs supporting it by the --enable-multiprocessing option.
+
+By default, all bsps for a target are built. The bare BSP is not built
+unless directly specified. There are  two ways of changing this:
+
++ use the --enable-rtemsbsp option which will set the specified
+  bsps as the default bsps, or 
++ set the RTEMS_BSP variable during make (see below).
+
+The --enable-rtemsbsp= option configures RTEMS for a specific board
+within a target architecture.  Remember that the target specifies the
+CPU family while the BSP specifies the precise board you will be using. 
+The following targets are supported:
+
+      (none)	will build the host-based version on Linux, Solaris and HPUX.
+
+      arm-rtems4.9
+      h8300-rtems4.9
+      i386-rtems4.9
+      m68k-rtems4.9
+      mips-rtems4.9
+      no_cpu-rtems4.9
+      powerpc-rtems4.9
+      sh-rtems4.9
+      sparc-rtems4.9
+      bare                    see notes
+
+The cross-compiler is set to $(target)-gcc by default. This can be
+overridden by:
+
++ using the --program-prefix option to configure to specify the
+  string which will prepended to the tool names.  Be sure to include
+  a trailing "-".  For example, to use a m68k-coff toolset, use the
+  --program-prefix=m68k-coff- option.
+
+To build, run make in the build directory. To specify which bsps to build,
+add the RTEMS_BSP="bsp1 bsp2 .." to the make command.  Specifying multiple
+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 mvme162 bsps for m68k do:
+
+      (path_to_rtems_src)/configure --target=m68k-rtems
+
+      make RTEMS_BSP="mvme136 mvme162"
+      
+      make install RTEMS_BSP="mvme136 mvme162"
+
+The sample tests are built by 'make all' when configured with
+--enable-tests=samples.  Use --enable-tests=all to build the full
+test suite.
+
+Documentation is built separately from the source code.
+
+2.2 Target Dependent Notes
+
+bare:
+
+1.  See the README in the bare bsp source directory. This should
+    contain all info you need.
+2.  The bare bsp source contains a script to show how to build it.
+3.  The configure flags must be used to get the bare bsp to work.
+    The --enable-bare-cpu-model and --enable-bare-cpu-cflags are the
+    only pieces of information. The module is usually a gcc module
+    such as m68302 or mcpu32. The flags are passed directly to gcc.
+    Use "" if more than one option is specified.
+
+3. To use the installed RTEMS library
+=====================================
+
+To use the installed RTEMS bsps to build applications, the application
+makefile has to include a bsp-specific makefile that will define the
+RTEMS variables necessary to find include files and libraries. The
+bsp-specific makefile is installed at 
+
+      $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+
+For the erc32 bsp installed at /usr/local/cross, the environment
+variable RTEMS_MAKEFILE_PATH would be set as follows to the
+following:
+
+/usr/local/cross/sparc-rtems/rtems/erc32/Makefile.inc
+
+4. Supported target bsps
+========================
+
+The following bsps are supported:
+
+host-based	: posix (on Linux, FreeBSD, Cygwin, Solaris, and HPUX)
+
+arm             : csb336 csb337 edb7312 gba gp32 nds rtl22x rtl22xx_t
+                  smdk2410
+
+avr:            : none
+
+bfin            : eZKit533 bf537Stamp
+
+h8300           : h8sim
+
+i386		: i386ex pc386 pc386dx pc486 pc586 pc686 pck6 ts_386ex
+		NOTE: The "pc386" BSP can be compiled to support a 
+		      variety of PC configurations including PC-104
+		      based solutions.
+
+m68k		: av5282 csb360 gen68302 gen68360 gen68360_040 
+		genmcf548x idp mcf5206elite mcf52235 mcf5235 mcf5239
+		m5484FireEngine mrm332 mvme136 mvme147s mvme162 mvme162lx
+		mvme167 ods68302 pgh360 sim68000 simcpu32 uC5282 
+
+no_cpu          : no_bsp  (porting example)
+
+mips            : csb350 genmongoosev hurricane jmr3904 rbtx4925 rbtx4938
+		p4600 p4650
+
+powerpc		: brs5l ep1a gen5200 gen83xx haleakala hsc_cm01 icecube
+		mbx821_001 mbx821_002 mbx821_002b mbx860_001b mbx860_002
+		mbx860_005b mcp750 mvme2100 mvme2307 mtx603e
+		mvme5500 mpc55xxevb mpc8260ads mpc8313erdb mpc8349eamds 
+		pghplus pm520_cr825 pm520_ze30 psim score603e ss555
+		tqm8xx_stk8xx virtex
+
+                  NOTE: The "motorola_powerpc" BSP is a single BSP which
+                  can be conditionally compiled to support most Motorola
+                  VMEbus, CompactPCI, and MTX boards.)
+
+                  NOTE: The mbx8xx, gen5200, gen83xx, and tqm8xx BSPs are
+		  designed to handle a variety of boards based on the same
+		  family of system on chips CPUs
+
+sh              : gensh1 gensh2 gensh4 shsim simsh4 simsh7045
+
+sparc 		: erc32 sis leon2 leon3
+
+any             : bare
+
+The following ports were considered obsoleted after the 4.6 releases
+and were removed: a29k, hppa, i960, mips64orion, and or32.
+
+
+5. Makefile structure
+=====================
+
+The makefiles have been re-organized. Most gnu-based bsps now use three
+main makefiles:
+    + custom/default.cfg,
+    + custom/bsp.cfg and
+    + compilers/gcc-target-default.cfg.
+
+Default.cfg sets the default values of certain common build options.
+
+Bsp.cfg set bsp-specific build options and can also override the
+default settings.
+
+Gcc-target-default.cfg contains the common gcc definitions.
+
+6. Adding a bsp
+===============
+
+Please refer to the BSP and Device Driver Guide.
+
+
+7. Tested configurations
+========================
+
+All BSPs have been built on GNU/Linux if the target architecture
+is supported in the FSF tools distribution. 
+
+8. Prerequisites
+================
+
+GNU make
+Bash.
+binutils, gcc, newlib and gdb versions matching those in the RPMs.

SUPPORT

@@ -0,0 +1,22 @@
+#
+#  $Id$
+#
+
+On-Line Applications Research Corporation (OAR) offers support,
+customization, and training for RTEMS.  Custom RTEMS development services
+includes porting RTEMS to new processors and the development of custom board
+support packages and device drivers.   In addition, OAR is available
+to assist in the development of your real-time embedded application.
+
+For more information, email Joel Sherrill joel.sherrill@OARcorp.com 
+or contact OAR at:
+
+On-Line Applications Research Corporation
+7047 Old Madison Pike Suite 320
+Huntsville AL 35806
+Voice: (205) 722-9985
+Fax:   (205 722-0985
+
+RTEMS maintenance and development is funded solely by RTEMS users.  
+The future of RTEMS depends on its user base.
+

VERSION

@@ -0,0 +1,7 @@
+#
+#  This file is automatically generated -- DO NOT EDIT!!!
+#
+#  $Id$
+#
+
+RTEMS Version 4.9.6

aclocal/bsp-alias.m4

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

aclocal/canonical-target-name.m4

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

aclocal/check-bsps.m4

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

aclocal/check-custom-bsp.m4

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

aclocal/enable-cxx.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 AC_DEFUN([RTEMS_ENABLE_CXX],
 [
 AC_ARG_ENABLE(cxx,

aclocal/enable-drvmgr.m4

@@ -1,12 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_DRVMGR],
-[
-## AC_BEFORE([$0], [RTEMS_CHECK_DRVMGR_STARTUP])dnl
-
-AC_ARG_ENABLE(drvmgr,
-[AS_HELP_STRING([--enable-drvmgr],[enable Driver Manager at Startup])],
-[case "${enableval}" in 
-  yes) RTEMS_DRVMGR_STARTUP=yes ;;
-  no) RTEMS_DRVMGR_STARTUP=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-drvmgr option) ;;
-esac],[RTEMS_DRVMGR_STARTUP=yes]) 
-])

aclocal/enable-itron.m4

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

aclocal/enable-multiprocessing.m4

@@ -1,10 +1,10 @@
+dnl $Id$
+
 AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
 [AS_HELP_STRING([--enable-multiprocessing],
-[enable multiprocessing interface; the multiprocessing interface is a
-communication interface between different RTEMS instances and allows
-synchronization of objects via message passing])],
+[enable multiprocessing interface])],
 [case "${enable_multiprocessing}" in 
   yes) ;;
   no) ;;

aclocal/enable-networking.m4

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

aclocal/enable-paravirt.m4

@@ -1,13 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_PARAVIRT],
-[
-
-AC_ARG_ENABLE(paravirt,
-[AS_HELP_STRING([--enable-paravirt],[enable support for paravirtualization
-(default=no)])],
-
-[case "${enableval}" in 
-  yes) RTEMS_HAS_PARAVIRT=yes ;;
-  no) RTEMS_HAS_PARAVIRT=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-paravirt option) ;;
-esac],[RTEMS_HAS_PARAVIRT=no]) 
-])

aclocal/enable-posix.m4

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

aclocal/enable-rtems-debug.m4

@@ -1,3 +1,5 @@
+## $Id$
+
 AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
 [
 AC_ARG_ENABLE(rtems-debug,

aclocal/enable-rtemsbsp.m4

@@ -1,3 +1,5 @@
+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)

aclocal/enable-smp.m4

@@ -1,21 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_SMP],
-[
-## AC_BEFORE([$0], [RTEMS_CHECK_SMP])dnl
-
-AC_ARG_ENABLE(experimental-smp,
-[AS_HELP_STRING([--enable-experimental-smp],[enable experimental support for symmetric multiprocessing
-(SMP)])],
-[case "${enableval}" in 
-  yes) case "${RTEMS_CPU}" in
-         arm|powerpc|sparc|i386) RTEMS_HAS_SMP=yes ;;
-         *)          RTEMS_HAS_SMP=no ;;
-       esac
-       ;;
-  no) RTEMS_HAS_SMP=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-smp option) ;;
-esac],[RTEMS_HAS_SMP=no])
-AC_ARG_ENABLE(smp,
-[],
-[AC_MSG_ERROR([SMP support is experimental in RTEMS 4.11, use --enable-experimental-smp])],
-[])
-])

aclocal/enable-tests.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 AC_DEFUN([RTEMS_ENABLE_TESTS],
 [
 AC_ARG_ENABLE(tests,

aclocal/path-ksh.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 AC_DEFUN([RTEMS_PATH_KSH],
 [
 dnl NOTE: prefer bash over ksh over sh

aclocal/project-root.m4

@@ -1,9 +1,13 @@
+dnl
+dnl $Id$
+dnl 
+
 dnl
 dnl PROJECT_TOPdir     .. relative path to the top of the build-tree
 dnl PROJECT_ROOT       .. relative path to the top of the temporary
 dnl                       installation directory inside the build-tree
-dnl RTEMS_TOPdir       .. relative path of a subpackage's configure.ac to the
-dnl                       toplevel configure.ac of the source-tree
+dnl RTEMS_TOPdir       .. relative path of a subpackage's configure.in to the
+dnl                       toplevel configure.in of the source-tree
 dnl RTEMS_ROOT         .. path to the top of a bsp's build directory
 dnl                       [Applied by custom/*.cfg, depredicated otherwise]
 dnl
@@ -14,8 +18,5 @@ AC_REQUIRE([RTEMS_TOP])
 
 PACKHEX="\$(PROJECT_TOPdir)/tools/build/packhex"
 AC_SUBST(PACKHEX)
-
-BIN2C="\$(PROJECT_TOPdir)/tools/build/rtems-bin2c"
-AC_SUBST(BIN2C)
 ])
 

aclocal/rpm.m4

@@ -2,19 +2,19 @@ AC_DEFUN([RTEMS_ENABLE_RPMPREFIX],[
 AC_ARG_ENABLE([rpmprefix],
 [  --enable-rpmprefix=<rpmprefix>      prefix rpms],
 [case $enable_rpmprefix in
-yes ) rpmprefix="rtems-"]_RTEMS_API["-";;
+yes ) rpmprefix="rtems-"]RTEMS_API["-";;
 no ) rpmprefix="%{nil}";;
 * ) AS_IF([test -z "$enable_rpmprefix"],
       [rpmprefix="%{nil}"],
       [rpmprefix="$enable_rpmprefix"]);;
 esac],
-[rpmprefix="rtems-"]_RTEMS_API["-"])
+[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;;
+yes ) osversion=RTEMS_API;;
 * ) osversion=;;
 esac],
-[osversion=_RTEMS_API])
+[osversion=RTEMS_API])
 ])

aclocal/rtems-top.m4

@@ -1,10 +1,12 @@
+dnl $Id$
+
 # AC_DISABLE_OPTION_CHECKING is not available before 2.62
 AC_PREREQ(2.62)
 
 dnl
 dnl RTEMS_TOP($1)
 dnl 
-dnl $1 .. relative path from this configure.ac to the toplevel configure.ac
+dnl $1 .. relative path from this configure.in to the toplevel configure.in
 dnl
 AC_DEFUN([RTEMS_TOP],
 [dnl
@@ -14,7 +16,7 @@ AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
-AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
+AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
 
 RTEMS_TOPdir="$1";
 AC_SUBST(RTEMS_TOPdir)
@@ -29,6 +31,4 @@ AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])
 AC_MSG_RESULT([_RTEMS_VERSION])
-pkgdatadir="${datadir}"/rtems[]_RTEMS_API;
-AC_SUBST([pkgdatadir])
 ])dnl

aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.11.1.99]))
+m4_define([_RTEMS_VERSION],[4.9.6]))
 
-m4_define([_RTEMS_API],[4.11])
+m4_define([RTEMS_API],[4.9])

ampolish3

@@ -1,5 +1,7 @@
-#! /usr/bin/env perl
-#
+#! /usr/bin/perl -w
+
+# $Id$
+
 # Copyright (C) 2005, 2006 Ralf Corsépius, Ulm, Germany
 #
 # Permission to use, copy, modify, and distribute this software
@@ -9,7 +11,7 @@
 #
 # Usage: ampolish3 Makefile.am > preinstall.am
 #
-# Reads a Makefile.am from stdin and writes corresponding
+# Reads a Makefile.am from stdin and writes corresponding 
 # pre/tmpinstall rules to stdout.
 
 sub replace($);
@@ -85,7 +87,7 @@ foreach my $l ( @buffer1 ) {
     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 )
   {
@@ -217,7 +219,7 @@ $output .=  "\$(srcdir)/preinstall.am: Makefile.am\n";
 $output .= "\t\$(AMPOLISH3) \$(srcdir)/Makefile.am > \$(srcdir)/preinstall.am\n";
 $output .= "endif\n\n";
 
-foreach my $k ( sort keys %seen )
+foreach my $k ( keys %seen )
 {
   if ( $k =~ /PREINSTALL_FILES/o ) {
     $output .= "all-am: \$(PREINSTALL_FILES)\n\n";
@@ -258,7 +260,7 @@ exit 0;
 sub replace($)
 {
   my ($v) = @_;
-  foreach my $i ( sort keys %dirmap )
+  foreach my $i ( keys %dirmap )
   {
     $v =~ s/\Q$i/$dirmap{$i}/g;
   }

automake/host.am

@@ -1,3 +1,5 @@
+## $Id$
+
 ## NOTE: This is a temporary work-around to keep 
 ## RTEMS's non automake standard make targets working.
 ## Once automake is fully integrated these make targets 

automake/local.am

@@ -1,3 +1,5 @@
+## $Id$
+
 preinstall-am: $(PREINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am

automake/subdirs.am

@@ -1,3 +1,5 @@
+## $Id$
+
 ## Borrowed from automake-1.4 and adapted to RTEMS 
 
 ## NOTE: This is a temporary work-around to keep 

bootstrap

@@ -1,22 +1,23 @@
-#!/bin/sh
+#! /bin/sh
 #
 # helps bootstrapping, when checked out from CVS
 # requires GNU autoconf and GNU automake
 #
+# $Id$
+
 # this is not meant to be exported outside the source tree
-#
+
 # NOTE: Inspired by libtool's autogen script
-#
+
 # to be run from the toplevel directory of RTEMS'
 # source tree
 
 progname=`basename $0`
 top_srcdir=`dirname $0`
 
-verbose=""
+verbose="";
 quiet="false"
-mode="autoreconf"
-force=0
+mode="generate"
 
 usage()
 {
@@ -30,7 +31,7 @@ usage()
   echo "	-q .. quiet, don't display directories"
   echo "	-v .. verbose, pass -v to autotools"
   echo
-  exit 1
+  exit 1;
 }
 
 generate_bspdir_acinclude()
@@ -42,7 +43,7 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR],
   case "\$1" in
 EOF
 
-for i in `LANG=C LC_COLLATE=C ls */bsp_specs | sort`; do
+for i in */bsp_specs; do
   d=`dirname $i`
 cat << EOF >> acinclude.m4~
   $d )
@@ -56,7 +57,7 @@ cat << EOF >> acinclude.m4~
 ])
 EOF
 if cmp -s acinclude.m4 acinclude.m4~ 2>/dev/null; then
-  echo "acinclude.m4 is unchanged"
+  echo "acinclude.m4 is unchanged";
 else
   cp acinclude.m4~ acinclude.m4
 fi
@@ -66,7 +67,7 @@ rm -f acinclude.m4~
 if test ! -f $top_srcdir/aclocal/version.m4; then
   echo "${progname}:"
   echo "	Installation problem: Can't find file aclocal/version.m4"
-  exit 1
+  exit 1;
 fi
 
 while test $# -gt 0; do
@@ -74,29 +75,23 @@ case $1 in
 -h|--he|--hel|--help)
   usage ;;
 -q|--qu|--qui|--quie|--quiet)
-  quiet="true"
+  quiet="true";
   shift;;
 -v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
-  verbose="-v"
+  verbose="-v";
   shift;;
 -c|--cl|--cle|--clea|--clean)
-  mode="clean"
-  shift;;
--f|--fo|--for|--forc|--force)
-  force=`expr $force + 1`
+  mode="clean";
   shift;;
 -p|--pr|--pre|--prei|--prein|--preins|--preinst)
-  mode="preinstall"
+  mode="preinstall";
   shift;;
 -r|--re|--rec|--reco|--recon|--reconf)
-  mode="autoreconf"
+  mode="autoreconf";
   shift;;
--g|--ge|--gen|--gene|--gener|--genera|--generat|--generate)
-  mode="generate"
-  shift;;
--*) echo "unknown option $1"
+-*) echo "unknown option $1" ;
   usage ;;
-*) echo "invalid parameter $1"
+*) echo "invalid parameter $1" ;
   usage ;;
 esac
 done
@@ -105,7 +100,7 @@ case $mode in
 preinstall)
   confs=`find . -name Makefile.am -exec grep -l 'include .*/preinstall\.am' {} \;`
   for i in $confs; do
-    dir=$(dirname $i)
+    dir=$(dirname $i);
     test "$quite" = "true" || echo "Generating $dir/preinstall.am"
     ${top_srcdir}/ampolish3 "$dir/Makefile.am" > "$dir/preinstall.am"
   done
@@ -117,19 +112,19 @@ generate)
     echo "You must have autoconf installed to run $program"
     exit 1
   fi
-
+  
   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
-
+  
   ACLOCAL=${ACLOCAL-aclocal}
   if test -z "$ACLOCAL"; then
     echo "You must have automake installed to run $program"
@@ -145,23 +140,23 @@ generate)
 
   confs=`find . \( -name 'configure.in' -o -name 'configure.ac' \) -print`
   for i in $confs; do
-  dir=`dirname $i`
-  configure=`basename $i`
-  ( test "$quiet" = "true" || echo "$dir"
-    cd $dir
+  dir=`dirname $i`;
+  configure=`basename $i`;
+  ( test "$quiet" = "true" || echo "$dir";
+    cd $dir;
     test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \
-      generate_bspdir_acinclude
+      generate_bspdir_acinclude;
     pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
     aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
-      sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat `
+      sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
     test "$verbose" = "-v" && echo "${ACLOCAL} $aclocal_args"
-    ${ACLOCAL} $aclocal_args
+    ${ACLOCAL} $aclocal_args;
     test -n "`grep CONFIG_HEADER ${configure}`" && ${AUTOHEADER} \
-      && test "$verbose" = "-v" && echo "${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 "${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
   )
@@ -177,13 +172,13 @@ autoreconf)
 
   confs=`find . -name 'configure.ac' -print`
   for i in $confs; do
-  dir=`dirname $i`
-  configure=`basename $i`
-  ( test "$quiet" = "true" || echo "$dir"
-    cd $dir
+  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
+      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
   )
@@ -192,58 +187,28 @@ autoreconf)
 
 clean)
   test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
-  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'`
-  for i in $files; do
-    if test -f $i; then
-      rm -f $i
-      test "$verbose" = "-v" && echo "$i"
-    fi
-  done
+  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
+  for i in $files; do if test -f $i; then
+    rm -f $i
+    test "$verbose" = "-v" && echo "$i"    
+  fi; done
 
   test "$quiet" = "true" || echo "removing configure files"
-  files=`find . -name 'configure' -print`
-  for i in $files; do
-    if test -f $i; then
-      rm -f $i
-      test "$verbose" = "-v" && echo "$i"
-    fi
-  done
-
-  if test $force -gt 0; then
-    needles=""
-    if test $force -gt 1; then
-      # Manually maintained
-      needles="$needles config.sub"
-      needles="$needles config.guess"
-    fi
-    if test $force -gt 0; then
-      # Inherited from automake
-      needles="$needles compile"
-      needles="$needles depcomp"
-      needles="$needles install-sh"
-      needles="$needles missing"
-      needles="$needles mdate-sh"
-    fi
-    for j in $needles; do
-      files=`find . -name "$j" -print`
-      for i in $files; do
-        if test -f $i; then
-          rm -f $i
-          test "$verbose" = "-v" && echo "$i"
-        fi
-      done
-    done
-  fi
-
+  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.sub config.guess depcomp install-sh mdate-sh missing \
+	mkinstalldirs texinfo.tex compile
+    test "$verbose" = "-v" && echo "$i"    
+  fi; done
+  
   test "$quiet" = "true" || echo "removing aclocal.m4 files"
-  files=`find . -name 'aclocal.m4' -print`
-  test "$verbose" = "-v" && test -n "$files" && echo "$files"
-  for i in $files; do
-    if test -f $i; then
-      rm -f $i
-      test "$verbose" = "-v" && echo "$i"
-    fi
-  done
+  files=`find . -name 'aclocal.m4' -print` ;
+  test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
+  for i in $files; do if test -f $i; then
+    rm -f $i
+    test "$verbose" = "-v" && echo "$i"    
+  fi; done
 
   find . -name '*~' -print | xargs rm -f
   find . -name 'bspopts.h.in' -print | xargs rm -f

bspkit/README

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

bspkit/avr/bare/ChangeLog

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

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

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

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

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

c/ACKNOWLEDGEMENTS

@@ -1,3 +1,7 @@
+#
+#  $Id$
+#
+
 RTEMS was developed by On-Line Applications Research (OAR) under
 contract to the U.S. Army Missile Command.  Other than the
 contributions listed in this document, all code and documentation
@@ -149,7 +153,7 @@ The following persons/organizations have made contributions:
   interrupt management API that reduces interrupt latency while making
   it easier to support external interrupt controllers.
 
-+ Joel Sherrill <joel@OARcorp.com> for the BSPs that work with 
++ Joel Sherrill <joel.sherrill@OARcorp.com> for the BSPs that work with 
   numerous simulators including psim, c4xsim, h8sim, armulator,
   sim68000, and simcpu32.  Most of these BSPs work with instruction
   set simulators in gdb.

c/ChangeLog

@@ -0,0 +1,222 @@
+2008-09-10	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* ACKNOWLEDGEMENTS, TOOL_TARGETS: Remove TI C4x and NIOS2 ports from
+	4.9 branch.
+
+2007-03-27	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Use MKDIR_P instead of mkdir_p.
+
+2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: New BUG-REPORT address.
+
+2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Require autoconf-2.60. Require automake-1.10.
+
+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]).
+
+2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: AC_PREREQ(2.57).
+
+2002-11-07	Joel Sherrill <joel@OARcorp.com>
+
+	* TOOL_TARGETS: Updated.
+	* PROBLEMS, README, REQUIRES, TESTED, UPDATE_HELP: Removed
+	since they were obsolete.
+
+2002-11-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Use mkinstalldirs instead of mkdir.
+
+2002-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Fix --enable-rtemsbsp= handling.
+
+2002-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* .cvsignore: Reformat.
+	Add autom4te*cache.
+	Remove autom4te.cache.
+
+2002-10-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Apply RTEMS_CONFIGURE_ARGS_QUOTE.
+
+2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac:
+	AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS).
+	AM_INIT_AUTOMAKE([no-define foreign 1.6]).
+	* Makefile.am: Remove AUTOMAKE_OPTIONS.
+
+2002-02-05	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove make from SUBDIRS.
+	* configure.ac: Remove make from CONFIG_SUBDIRS, cosmetics.
+
+2001-10-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* .cvsignore: Add autom4te.cache for autoconf > 2.52.
+	* configure.in: Remove.
+	* configure.ac: New file, generated from configure.in by autoupdate.
+
+2001-05-25	Joel Sherrill <joel@OARcorp.com>
+
+ 	* TESTED: Corrected the name of the MRM332 BSP.
+
+2001-05-25	Joel Sherrill <joel@OARcorp.com>
+
+ 	* TESTED: Updated the list of BSPs.
+ 	* TOOLS_TARGETS: Updated the list of tools and object formats.
+
+2001-03-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Use ${MAKE} in message at the end of the
+	configure.in.
+
+2001-02-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Apply _RTEMS_ADJUST_SRCDIR.
+
+2000-12-14	Joel Sherrill <joel@OARcorp.com>
+
+	* TESTED: Added comment on 68en302 now that there is a network driver.
+
+2000-11-25	Joel Sherrill <joel@OARcorp.com>
+
+	* TESTED: Added jmr3904 entry.
+
+2000-11-20	Joel Sherrill <joel@OARcorp.com>
+
+	* TESTED: Added new sparc variations (erc32, leon, and Tharsys).
+
+2000-11-10	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: catch -enable-rtemsbsp (Allowed by autoconf).
+	Autoconf allows one to pass -enable-*, but this file expected --enable*.
+
+2000-11-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.
+
+2000-11-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Switch to ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal.
+
+2000-10-30      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Switch to GNU-canonicalization.
+
+2000-10-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Make sure $SHELL inside of Makefiles does not get
+	propagated to the BSP-subdirectories if a user specified CONFIG_SHELL.
+
+2000-08-10	Joel Sherrill <joel@OARcorp.com>
+
+	* ChangeLog: New file.

c/Makefile.am

@@ -1,3 +1,7 @@
+##
+## $Id$
+##
+
 ACLOCAL_AMFLAGS = -I ../aclocal
 
 ## NOTE: This Makefile.am is rather fragile to the value of RTEMS_BSP

c/TOOL_TARGETS

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

c/acinclude.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 dnl
 dnl Misc utility macros for subdir handling to work around missing abilities
 dnl in autoconf, automake and structural issues with RTEMS

c/configure.ac

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

c/src/Makefile.am

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

c/src/README

@@ -1,3 +1,7 @@
+#
+#  $Id$
+#
+
 This is the top level directory of the C RTEMS environment.  The
 following is a description of the contents of each file and
 subdirectory directly in this directory:

c/src/acinclude.m4

@@ -1,3 +1,5 @@
+# $Id$
+#
 # Some hacks for handling special config subdirectories
 #
 # Note: Consider this file a temporary band-aid until a better, more general

c/src/aclocal/bsp-alias.m4

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

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

@@ -1,3 +1,4 @@
+dnl $Id$
 dnl
 dnl RTEMS_BSP_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
 dnl 

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

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

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

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

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

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

c/src/aclocal/bsp-configure.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 dnl RTEMS_BSP_CONFIGURE
 dnl Common macro to be included by all bsp-configure.acs
 AC_DEFUN([RTEMS_BSP_CONFIGURE],
@@ -32,6 +34,4 @@ echo "#endif /* __BSP_OPTIONS_H */"                   >>$tmp/config.h
   RTEMS_PROJECT_ROOT
 
   RTEMS_CHECK_MULTIPROCESSING
-
-  RTEMS_BSP_BOOTCARD_OPTIONS
 ])

c/src/aclocal/bsp-linkcmds.m4

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

c/src/aclocal/bspopts.m4

@@ -1,4 +1,6 @@
+dnl $Id$
 dnl
+
 dnl RTEMS_BSPOPTS_* - some autoconf voodoo to handle default values and
 dnl help-strings for per-BSP-environment variables.
 
@@ -27,7 +29,7 @@ dnl appropriate /bin/sh-magic to "configure" to have VAR set up.
 AC_DEFUN([RTEMS_BSPOPTS_HELP],[
 RTEMS_ARG_VAR([$1],[$2])
 m4_ifdef([_$1],[
-case "${RTEMS_BSP}" in
+case ${RTEMS_BSP} in
 _$1[]dnl
 esac],[])
 if test -n "[$]{$1}"; then[]dnl
@@ -62,21 +64,3 @@ m4_expand_once([m4_divert_once([HELP_VAR],
 [AS_HELP_STRING([$1],[$2],              )])],
       [$0($1)])dnl
 ])
-
-AC_DEFUN(
-[RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED],
-[RTEMS_BSPOPTS_SET([BSP_DATA_CACHE_ENABLED],[$1],[$2])])
-
-AC_DEFUN(
-[RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED],
-[RTEMS_BSPOPTS_HELP([BSP_DATA_CACHE_ENABLED],
-[enables the data cache, if defined to a value other than zero])])
-
-AC_DEFUN(
-[RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED],
-[RTEMS_BSPOPTS_SET([BSP_INSTRUCTION_CACHE_ENABLED],[$1],[$2])])
-
-AC_DEFUN(
-[RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED],
-[RTEMS_BSPOPTS_HELP([BSP_INSTRUCTION_CACHE_ENABLED],
-[enables the instruction cache, if defined to a value other than zero])])

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

@@ -1,3 +1,7 @@
+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"
@@ -5,19 +9,37 @@ 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_REQUIRE([AC_CANONICAL_HOST])
+[
+AC_CANONICAL_HOST
 AC_MSG_CHECKING(rtems target cpu)
 case "${host}" in
-*-*-rtems*)
-	RTEMS_CPU="$host_cpu";;
-*)
+  # hpux unix port should go here
+  i[[34567]]86-*linux*)		# unix "simulator" port
+	RTEMS_CPU=unix
+        RTEMS_HOST=Linux
+	;;
+  i[[34567]]86-*freebsd*) 	# unix "simulator" port
+	RTEMS_CPU=unix
+        RTEMS_HOST=FreeBSD
+	;;
+  i[[34567]]86-pc-cygwin*) 	# Cygwin is just enough unix like :)
+	RTEMS_CPU=unix
+        RTEMS_HOST=Cygwin
+	;;
+  no_cpu-*rtems*)
+        RTEMS_CPU=no_cpu
+	RTEMS_HOST=$host_os
+	;;
+  sparc-sun-solaris*)           # unix "simulator" port
+	RTEMS_CPU=unix
+        RTEMS_HOST=Solaris
+	;;
+  *) 
+	RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
+	RTEMS_HOST=$host_os
 	;;
 esac
-AS_IF([test -n "$RTEMS_CPU"],
-[dnl
-AC_MSG_RESULT($RTEMS_CPU)],
-[dnl
-AC_MSG_RESULT([<none>])
-AC_MSG_ERROR([unsupported host $host])])
 AC_SUBST(RTEMS_CPU)
+AC_SUBST(RTEMS_HOST)
+AC_MSG_RESULT($RTEMS_CPU)
 ])

c/src/aclocal/canonicalize-tools.m4

@@ -1,4 +1,8 @@
+dnl
+dnl $Id$
+dnl
 dnl Set target tools
+dnl
 
 AC_DEFUN([RTEMS_CANONICALIZE_TOOLS],
 [AC_REQUIRE([RTEMS_PROG_CC])dnl

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

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

c/src/aclocal/check-cxx.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+dnl
 AC_DEFUN([RTEMS_CHECK_CXX],
 [dnl
 AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl

c/src/aclocal/check-multiprocessing.m4

@@ -1,3 +1,7 @@
+dnl
+dnl $Id$
+dnl
+
 AC_DEFUN([RTEMS_CHECK_MULTIPROCESSING],
 [dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl

c/src/aclocal/check-networking.m4

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

c/src/aclocal/check-posix.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+dnl
 AC_DEFUN([RTEMS_CHECK_POSIX_API],
 [dnl
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
@@ -7,6 +9,9 @@ AC_CACHE_CHECK([whether CPU supports libposix],
   rtems_cv_HAS_POSIX_API,
   [dnl
     case "$RTEMS_CPU" in
+    unix*)
+      rtems_cv_HAS_POSIX_API="no"
+      ;;
     *)
       if test "${RTEMS_HAS_POSIX_API}" = "yes"; then
         rtems_cv_HAS_POSIX_API="yes";

c/src/aclocal/check-smp.m4

@@ -1,17 +0,0 @@
-AC_DEFUN([RTEMS_CHECK_SMP],
-[dnl
-AC_REQUIRE([RTEMS_ENABLE_SMP])dnl
-
-AC_CACHE_CHECK([whether CPU supports SMP],
-  rtems_cv_HAS_SMP,
-  [dnl
-    case "$RTEMS_CPU" in
-    *)
-      if test "${RTEMS_HAS_SMP}" = "yes"; then
-        rtems_cv_HAS_SMP="yes";
-      else
-        rtems_cv_HAS_SMP="disabled";
-      fi
-      ;;
-    esac])
-])

c/src/aclocal/check-tool.m4

@@ -1,3 +1,5 @@
+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]])

c/src/aclocal/config-subdirs.m4

@@ -1,9 +1,11 @@
+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.ac.
+dnl configure.in.
 dnl
 
 dnl

c/src/aclocal/enable-cxx.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 AC_DEFUN([RTEMS_ENABLE_CXX],
 [
 AC_ARG_ENABLE(cxx,

c/src/aclocal/enable-drvmgr.m4

@@ -1,12 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_DRVMGR],
-[
-## AC_BEFORE([$0], [RTEMS_CHECK_DRVMGR_STARTUP])dnl
-
-AC_ARG_ENABLE(drvmgr,
-[AS_HELP_STRING([--enable-drvmgr],[enable Driver Manager at Startup])],
-[case "${enableval}" in 
-  yes) RTEMS_DRVMGR_STARTUP=yes ;;
-  no) RTEMS_DRVMGR_STARTUP=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-drvmgr option) ;;
-esac],[RTEMS_DRVMGR_STARTUP=yes]) 
-])

c/src/aclocal/enable-multiprocessing.m4

@@ -1,10 +1,9 @@
+dnl $Id$
+
 AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
-[AS_HELP_STRING([--enable-multiprocessing],
-[enable multiprocessing interface; the multiprocessing interface is a
-communication interface between different RTEMS instances and allows
-synchronization of objects via message passing])],
+[AS_HELP_STRING(--enable-multiprocessing,enable multiprocessing interface)],
 [case "${enable_multiprocessing}" in 
   yes) ;;
   no) ;;

c/src/aclocal/enable-networking.m4

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

c/src/aclocal/enable-posix.m4

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

c/src/aclocal/enable-rtemsbsp.m4

@@ -1,3 +1,5 @@
+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)

c/src/aclocal/enable-smp.m4

@@ -1,21 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_SMP],
-[
-## AC_BEFORE([$0], [RTEMS_CHECK_SMP])dnl
-
-AC_ARG_ENABLE(experimental-smp,
-[AS_HELP_STRING([--enable-experimental-smp],[enable experimental support for symmetric multiprocessing
-(SMP)])],
-[case "${enableval}" in 
-  yes) case "${RTEMS_CPU}" in
-         arm|powerpc|sparc|i386) RTEMS_HAS_SMP=yes ;;
-         *)          RTEMS_HAS_SMP=no ;;
-       esac
-       ;;
-  no) RTEMS_HAS_SMP=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-smp option) ;;
-esac],[RTEMS_HAS_SMP=no])
-AC_ARG_ENABLE(smp,
-[],
-[AC_MSG_ERROR([SMP support is experimental in RTEMS 4.11, use --enable-experimental-smp])],
-[])
-])

c/src/aclocal/env-rtemsbsp.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 dnl Pass a single BSP via an environment variable
 dnl used by per BSP configure scripts
 AC_DEFUN([RTEMS_ENV_RTEMSBSP],
@@ -25,6 +27,8 @@ RTEMS_BSP="$rtems_cv_RTEMS_BSP"
 AC_MSG_RESULT(${RTEMS_BSP})
 AC_SUBST(RTEMS_BSP)
 
+AM_CONDITIONAL([MULTILIB],[false])
+
 includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
 libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
 

c/src/aclocal/gcc-isystem.m4

@@ -1,3 +1,6 @@
+dnl
+dnl $Id$
+dnl
 dnl Check whether the gcc accepts -isystem
 dnl
 

c/src/aclocal/gcc-pipe.m4

@@ -1,4 +1,8 @@
+dnl
+dnl $Id$
+dnl
 dnl Check whether the target compiler accepts -pipe
+dnl
 
 AC_DEFUN([RTEMS_GCC_PIPE],
 [AC_REQUIRE([RTEMS_PROG_CC]) 

c/src/aclocal/gcc-specs.m4

@@ -1,4 +1,8 @@
+dnl
+dnl $Id$
+dnl
 dnl Check whether the target compiler accepts -specs
+dnl
 
 AC_DEFUN([RTEMS_GCC_SPECS],
 [AC_REQUIRE([RTEMS_PROG_CC])

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

@@ -1,3 +1,7 @@
+dnl
+dnl  $Id$
+dnl 
+
 dnl check for i386 gas supporting 16 bit mode
 dnl     - binutils 2.9.1.0.7 and higher
 

c/src/aclocal/path-ksh.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 AC_DEFUN([RTEMS_PATH_KSH],
 [
 dnl NOTE: prefer bash over ksh over sh

c/src/aclocal/ppc.m4

@@ -1,3 +1,5 @@
+# $Id$
+#
 # Some hacks for handling powerpc-exception subdirectories
 #
 # Note: Consider this file a temporary band-aid until a better, more general

c/src/aclocal/prog-cc.m4

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

c/src/aclocal/prog-ccas.m4

@@ -1,3 +1,5 @@
+## $Id$
+
 AC_DEFUN([RTEMS_PROG_CCAS],
 [
 AC_REQUIRE([RTEMS_PROG_CC])

c/src/aclocal/prog-cxx.m4

@@ -1,3 +1,5 @@
+dnl
+dnl $Id$
 dnl 
 dnl Check for target g++
 dnl 
@@ -6,18 +8,11 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
 [
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_ENABLE_CXX])
-AC_REQUIRE([RTEMS_CHECK_SMP])
-
-# If CXXFLAGS is not set, default to CFLAGS
-if test x"$rtems_cv_HAS_SMP" = x"yes" ; then
-  CXXFLAGS=${CXXFLAGS-${CFLAGS} -std=gnu++11}
-else
-  CXXFLAGS=${CXXFLAGS-${CFLAGS}}
-fi
-
 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" \
@@ -29,7 +24,8 @@ AC_PROG_CXXCPP
     AC_MSG_ERROR([***]
      [Inconsistency in compiler configuration:]
      [Target C compiler and target C++ compiler]
-     [must both either be cross compilers or native compilers])
+     [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

c/src/aclocal/project-root.m4

@@ -1,3 +1,7 @@
+dnl
+dnl $Id$
+dnl 
+
 AC_DEFUN([RTEMS_PROJECT_ROOT],
 [dnl
 AC_REQUIRE([RTEMS_TOP])

c/src/aclocal/rtems-ampolish.m4

@@ -1,3 +1,5 @@
+# $Id$
+
 AC_DEFUN([RTEMS_AMPOLISH3],
 [
 AC_REQUIRE([AM_INIT_AUTOMAKE])

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

@@ -12,24 +12,18 @@ AC_DEFUN([RTEMS_CPU_SUBDIRS],
 case $RTEMS_CPU in
 _RTEMS_CPU_SUBDIR([arm],[$1]);;
 _RTEMS_CPU_SUBDIR([bfin],[$1]);;
-_RTEMS_CPU_SUBDIR([epiphany],[$1]);;
 _RTEMS_CPU_SUBDIR([avr],[$1]);;
 _RTEMS_CPU_SUBDIR([h8300],[$1]);;
+_RTEMS_CPU_SUBDIR([hppa1.1],[$1]);;
 _RTEMS_CPU_SUBDIR([i386],[$1]);;
-_RTEMS_CPU_SUBDIR([lm32],[$1]);;
-_RTEMS_CPU_SUBDIR([m32c],[$1]);;
-_RTEMS_CPU_SUBDIR([m32r],[$1]);;
 _RTEMS_CPU_SUBDIR([m68k],[$1]);;
 _RTEMS_CPU_SUBDIR([mips],[$1]);;
-_RTEMS_CPU_SUBDIR([moxie],[$1]);;
-_RTEMS_CPU_SUBDIR([nios2],[$1]);;
 _RTEMS_CPU_SUBDIR([no_cpu],[$1]);;
-_RTEMS_CPU_SUBDIR([or1k],[$1]);;
+_RTEMS_CPU_SUBDIR([or32],[$1]);;
 _RTEMS_CPU_SUBDIR([powerpc],[$1]);;
 _RTEMS_CPU_SUBDIR([sh],[$1]);;
 _RTEMS_CPU_SUBDIR([sparc],[$1]);;
-_RTEMS_CPU_SUBDIR([sparc64],[$1]);;
-_RTEMS_CPU_SUBDIR([v850],[$1]);;
+_RTEMS_CPU_SUBDIR([unix],[$1]);;
 *) AC_MSG_ERROR([Invalid RTEMS_CPU <[$]{RTEMS_CPU}>])
 esac
 ])

c/src/aclocal/rtems-top.m4

@@ -1,10 +1,12 @@
+dnl $Id$
+
 # AC_DISABLE_OPTION_CHECKING is not available before 2.62
 AC_PREREQ(2.62)
 
 dnl
 dnl RTEMS_TOP($1)
 dnl 
-dnl $1 .. relative path from this configure.ac to the toplevel configure.ac
+dnl $1 .. relative path from this configure.in to the toplevel configure.in
 dnl
 AC_DEFUN([RTEMS_TOP],
 [dnl
@@ -15,7 +17,7 @@ AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
-AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
+AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
 
 AC_SUBST([RTEMS_TOPdir],["$1"])
 
@@ -30,5 +32,4 @@ AC_SUBST([PROJECT_TOPdir],[${project_top}${rtems_updir}'$(top_builddir)'])
 AC_SUBST([PROJECT_ROOT],[${with_project_root}${rtems_updir}'$(top_builddir)'])
 
 AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
-AC_SUBST([pkgdatadir],["\${datadir}"/rtems]_RTEMS_API)
 ])dnl

c/src/aclocal/target.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+
 ## HACK: Work-around to structural issue with RTEMS
 ## The macros below violate most autoconf and canonicalization standards
 AC_DEFUN([RTEMS_CONFIG_BUILD_SUBDIRS],
@@ -76,7 +78,7 @@ 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.ac.
+dnl configure.in.
 dnl
 
 dnl

c/src/aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.11.1.99]))
+m4_define([_RTEMS_VERSION],[4.9.6]))
 
-m4_define([_RTEMS_API],[4.11])
+m4_define([RTEMS_API],[4.9])

c/src/ada-tests/Makefile.am

@@ -1,3 +1,5 @@
+## $Id$
+
 ACLOCAL_AMFLAGS = -I aclocal -I ../../../testsuites/aclocal
 
 SUBDIRS = support samples sptests tmtests
@@ -10,4 +12,4 @@ DIST_SUBDIRS = support samples sptests tmtests mptests
 EXTRA_DIST = ada.am
 
 include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../../../testsuites//automake/local.am

c/src/ada-tests/aclocal/prog-gnat.m4

@@ -1,3 +1,4 @@
+## $Id$
 ##
 ## Partially borrowed from gcc-3.2
 ##

c/src/ada-tests/ada.am

@@ -15,7 +15,7 @@ GNATCOMPILE = $(GNATMAKE) \
     $(GCCSPECS) \
 $(AM_LDFLAGS) $(LDFLAGS) init.o
 
-CLEANFILES += *.ali *.o b~*.adb b~*.ads
+CLEANFILES = *.ali *.o b~*.adb b~*.ads
 
 #%.o: %.c
 #	$(CC) $(CFLAGS) -I@srcdir@ -c $< -o $@