Changeset 9c59c2d9 in rtems

Timestamp:

Feb 28, 2003, 7:08:21 AM (17 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

769f47a

Parents:

b9184faa

Message:

Merger from rtems-4-6-branch.

Location:

cpukit

Files:

• sapi/ChangeLog (modified) (1 diff)
• sapi/include/rtems/sptables.h.in (modified) (1 diff)
• score/ChangeLog (modified) (1 diff)
• score/cpu/arm/ChangeLog (modified) (1 diff)
• score/cpu/arm/rtems/score/arm.h (modified) (1 diff)
• score/include/rtems/system.h (modified) (1 diff)

cpukit/sapi/ChangeLog

@@ +1 @@
+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>
 

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

@@ -64 +64 @@
 #endif
 
-/*
- *  This is the version string.
- */
-
-#define RTEMS_VERSION "rtems-@RTEMS_VERSION@"
-
 #if defined(SAPI_INIT) 
 const char _RTEMS_version[] =

cpukit/score/ChangeLog

@@ +1 @@
+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>
 

cpukit/score/cpu/arm/ChangeLog

@@ +1 @@
+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>
 

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

@@ -66 +66 @@
 
 /* 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
+
 
 /*

cpukit/score/include/rtems/system.h

@@ -21 +21 @@
 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
 
 /*