summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-24 21:52:19 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-24 21:52:19 +0000
commit5b53d9700d67534bffa38c1af981b79469d19616 (patch)
treedde0d583b37360405047727193d07cc7000068e9
parent86748ff7edf2cf2fd7e0ed629641f370bd6096c0 (diff)
downloadrtems-5b53d9700d67534bffa38c1af981b79469d19616.tar.bz2
2000-10-24 Alan Cudmore <alanc@linuxstart.com> and
Joel Sherrill <joel@OARcorp.com> * This is a major reworking of the mips64orion port to use gcc predefines as much as possible and a big push to multilib the mips port. The mips64orion port was copied/renamed to mips to be more like other GNU tools. Alan did most of the technical work of determining how to map old macro names used by the mips64orion port to standard compiler macro definitions. Joel did the merge with CVS magic to keep individual file history and did the BSP modifications. Details follow: * Makefile.am: Made clock and timer subdirectories conditional. * configure.in: Ditto. * clock/clock.S: Switch from using <idtmon.h> to <asm.h>. * clock/gettime.S: Switch from using <idtmon.h> to <asm.h>.
-rw-r--r--c/src/lib/libcpu/mips/ChangeLog16
-rw-r--r--c/src/lib/libcpu/mips/Makefile.am9
-rw-r--r--c/src/lib/libcpu/mips/clock/clock.S2
-rw-r--r--c/src/lib/libcpu/mips/configure.in5
-rw-r--r--c/src/lib/libcpu/mips/timer/gettime.S2
5 files changed, 30 insertions, 4 deletions
diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index c3ba764344..248ab136c7 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-24 Alan Cudmore <alanc@linuxstart.com> and
+ Joel Sherrill <joel@OARcorp.com>
+
+ * This is a major reworking of the mips64orion port to use
+ gcc predefines as much as possible and a big push to multilib
+ the mips port. The mips64orion port was copied/renamed to mips
+ to be more like other GNU tools. Alan did most of the technical
+ work of determining how to map old macro names used by the mips64orion
+ port to standard compiler macro definitions. Joel did the merge
+ with CVS magic to keep individual file history and did the BSP
+ modifications. Details follow:
+ * Makefile.am: Made clock and timer subdirectories conditional.
+ * configure.in: Ditto.
+ * clock/clock.S: Switch from using <idtmon.h> to <asm.h>.
+ * clock/gettime.S: Switch from using <idtmon.h> to <asm.h>.
+
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am, timer/Makefile.am: Include compile.am
diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am
index d9fad31f51..92ee8b6f87 100644
--- a/c/src/lib/libcpu/mips/Makefile.am
+++ b/c/src/lib/libcpu/mips/Makefile.am
@@ -5,7 +5,14 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-SUBDIRS = clock timer
+SHARED_LIB =
+
+if r46xx
+CPU_SUBDIR = clock timer
+endif
+
+SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR)
+
include $(top_srcdir)/../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/clock/clock.S b/c/src/lib/libcpu/mips/clock/clock.S
index ab3533991a..dc47fc2bc8 100644
--- a/c/src/lib/libcpu/mips/clock/clock.S
+++ b/c/src/lib/libcpu/mips/clock/clock.S
@@ -23,7 +23,7 @@
#include <iregdef.h>
#include <idtcpu.h>
-#include <idtmon.h>
+#include <asm.h>
FRAME(mips_set_timer,sp,0,ra)
.set noreorder
diff --git a/c/src/lib/libcpu/mips/configure.in b/c/src/lib/libcpu/mips/configure.in
index aed970845c..822592cdc0 100644
--- a/c/src/lib/libcpu/mips/configure.in
+++ b/c/src/lib/libcpu/mips/configure.in
@@ -9,7 +9,7 @@ AC_CONFIG_AUX_DIR(../../../../..)
RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips64orion,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
RTEMS_ENABLE_BARE
@@ -26,6 +26,9 @@ RTEMS_CANONICALIZE_TOOLS
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+AM_CONDITIONAL(r46xx, test "$RTEMS_CPU_MODEL" = "R4600" \
+|| test "$RTEMS_CPU_MODEL" = "R4650" )
+
# Explicitly list all Makefiles here
AC_OUTPUT(
Makefile
diff --git a/c/src/lib/libcpu/mips/timer/gettime.S b/c/src/lib/libcpu/mips/timer/gettime.S
index b69f0ab8f5..a8f54e5163 100644
--- a/c/src/lib/libcpu/mips/timer/gettime.S
+++ b/c/src/lib/libcpu/mips/timer/gettime.S
@@ -24,7 +24,7 @@
#include <iregdef.h>
#include <idtcpu.h>
-#include <idtmon.h>
+#include <asm.h>
FRAME(mips_read_timer,sp,0,ra)
.set noreorder