Merger from rtems-4-6-branch.

cpukit/sapi/ChangeLog

@@ -1,3 +1,8 @@
+2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/rtems/sptables.h.in: Remove RTEMS_VERSION (Moved to
+	cpuopts.h).
+
 2003-02-03	Joel Sherrill <joel@OARcorp.com>
 
 	PR 338/filesystem

cpukit/sapi/include/rtems/sptables.h.in

@@ -63,12 +63,6 @@ extern const rtems_multiprocessing_table
        _Initialization_Default_multiprocessing_table;
 #endif
 
-/*
- *  This is the version string.
- */
-
-#define RTEMS_VERSION "rtems-@RTEMS_VERSION@"
-
 #if defined(SAPI_INIT) 
 const char _RTEMS_version[] =
   "RTEMS RELEASE " RTEMS_VERSION

cpukit/score/ChangeLog

@@ -1,3 +1,7 @@
+2002-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/rtems/system.h: Add __RTEMS_MAJOR__, __RTEMS_MINOR__.
+
 2003-02-14	Joel Sherrill <joel@OARcorp.com>
 
 	AMD a29k declared obsolete.

cpukit/score/cpu/arm/ChangeLog

@@ -1,3 +1,7 @@
+2003-02-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* rtems/score/arm.h: Set up ARM_HAS_FPU based on -D__SOFTFP__.
+
 2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Require autoconf-2.57 + automake-1.7.2.

cpukit/score/cpu/arm/rtems/score/arm.h

@@ -65,7 +65,13 @@ extern "C" {
 #endif
 
 /* All ARM CPUs are assumed to not have floating point units */
+#if defined(__SOFTFP__)
 #define ARM_HAS_FPU     0
+#else
+#define ARM_HAS_FPU	1
+# error "FPU-support not yet implemented for the arm"
+#endif
+
 
 /*
  *  Define the name of the CPU family.

cpukit/score/include/rtems/system.h

@@ -21,6 +21,13 @@
 extern "C" {
 #endif
 
+/*
+ * Major and minor version number of RTEMS.
+ * Use these macros to test for features in specific releases.
+ */
+#define __RTEMS_MAJOR__	4
+#define __RTEMS_MINOR__	6
+
 /*
  *  The cpu options include file defines all cpu dependent 
  *  parameters for this build of RTEMS.  It must be included