summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-02-28 07:08:21 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-02-28 07:08:21 +0000
commit9c59c2d9536df048e309f70f48b67bba137ca244 (patch)
treead9a664fbc86bd6d152ea43adb9316da3d18bc3e
parentb9184faa30f8fbf175305111dc108b5074a2c849 (diff)
downloadrtems-9c59c2d9536df048e309f70f48b67bba137ca244.tar.bz2
Merger from rtems-4-6-branch.
-rw-r--r--cpukit/sapi/ChangeLog5
-rw-r--r--cpukit/sapi/include/rtems/sptables.h.in6
-rw-r--r--cpukit/score/ChangeLog4
-rw-r--r--cpukit/score/cpu/arm/ChangeLog4
-rw-r--r--cpukit/score/cpu/arm/rtems/score/arm.h6
-rw-r--r--cpukit/score/include/rtems/system.h7
6 files changed, 26 insertions, 6 deletions
diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog
index 24d943f454..de76eb4b9c 100644
--- a/cpukit/sapi/ChangeLog
+++ b/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
diff --git a/cpukit/sapi/include/rtems/sptables.h.in b/cpukit/sapi/include/rtems/sptables.h.in
index 4d1425120b..8e8e0a4a02 100644
--- a/cpukit/sapi/include/rtems/sptables.h.in
+++ b/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
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index 59d434ca44..3eaa423ba1 100644
--- a/cpukit/score/ChangeLog
+++ b/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.
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 85cb79e851..0e26e358fe 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/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.
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h
index 7d8d135488..f32556bf64 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/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.
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 92b05c340c..fc013750ff 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -22,6 +22,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
* first so the basic macro definitions are in place.