From 6b2b4a367d07c9b895e451111a480bd72c71651f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 14 Feb 2003 05:15:15 +0000 Subject: Merger from rtems-4-6-branch. --- ChangeLog | 12 ++++++++++++ aclocal/canonical-target-name.m4 | 3 +++ cpukit/ChangeLog | 4 ++++ cpukit/aclocal/canonical-target-name.m4 | 3 +++ 4 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index a9ff49514c..c705081509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-02-12 Ralf Corsepius + + * aclocal/canonical-target-name.m4: Transform tic4x -> RTEMS_CPU=c4x. + +2003-02-11 Joel Sherrill + + * VERSION: Updated to rtems-4.6.0pre1. + +2003-02-11 Joel Sherrill + + * aclocal/version.m4: Updated to rtems-4.6.0pre1. + 2003-02-11 Ralf Corsepius * 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 + + * aclocal/canonical-target-name.m4: Transform tic4x -> RTEMS_CPU=c4x. + 2003-01-28 Joel Sherrill * 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%'` ;; -- cgit v1.2.3