summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-02-14 05:15:15 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-02-14 05:15:15 +0000
commit6b2b4a367d07c9b895e451111a480bd72c71651f (patch)
tree2b75e5f05de797954a80dda889b1d36742d66c02
parente84c52869baf3ba40890f37887e1e0893079bdf3 (diff)
downloadrtems-6b2b4a367d07c9b895e451111a480bd72c71651f.tar.bz2
Merger from rtems-4-6-branch.
-rw-r--r--ChangeLog12
-rw-r--r--aclocal/canonical-target-name.m43
-rw-r--r--cpukit/ChangeLog4
-rw-r--r--cpukit/aclocal/canonical-target-name.m43
4 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a9ff49514c..c705081509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/canonical-target-name.m4: Transform tic4x -> RTEMS_CPU=c4x.
+
+2003-02-11 Joel Sherrill <joel@OARcorp.com>
+
+ * VERSION: Updated to rtems-4.6.0pre1.
+
+2003-02-11 Joel Sherrill <joel@OARcorp.com>
+
+ * aclocal/version.m4: Updated to rtems-4.6.0pre1.
+
2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bootstrap: Remove attempts to detect autoconf and automake using
diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4
index 1b491c0b15..ab710dc722 100644
--- a/aclocal/canonical-target-name.m4
+++ b/aclocal/canonical-target-name.m4
@@ -29,6 +29,9 @@ case "${target}" in
sparc-sun-solaris*) # unix "simulator" port
RTEMS_CPU=unix
;;
+ tic4x-*rtems*) # gcc changed the name
+ RTEMS_CPU=c4x
+ ;;
*)
RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
;;
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 07b70d8e9a..f3add6266f 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/canonical-target-name.m4: Transform tic4x -> RTEMS_CPU=c4x.
+
2003-01-28 Joel Sherrill <joel@OARcorp.com>
* aclocal/version.m4: Updated to rtems-ss-20030128.
diff --git a/cpukit/aclocal/canonical-target-name.m4 b/cpukit/aclocal/canonical-target-name.m4
index 1b491c0b15..ab710dc722 100644
--- a/cpukit/aclocal/canonical-target-name.m4
+++ b/cpukit/aclocal/canonical-target-name.m4
@@ -29,6 +29,9 @@ case "${target}" in
sparc-sun-solaris*) # unix "simulator" port
RTEMS_CPU=unix
;;
+ tic4x-*rtems*) # gcc changed the name
+ RTEMS_CPU=c4x
+ ;;
*)
RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
;;