From 80e53918dcb752cca5c435d3110069ae7c4b501e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 7 Jul 2000 19:36:14 +0000
Subject: Moved old_exception_processing and new_exception_processing
 directories from score/cpu to libcpu because the determination of which to
 use is based on RTEMS_CPU_MODEL.  Thus it can not be determined based solely
 on multilib information.

---
 c/src/lib/libcpu/powerpc/Makefile.am                         | 8 +++++++-
 c/src/lib/libcpu/powerpc/configure.in                        | 6 ++++++
 c/src/lib/libcpu/powerpc/new_exception_processing/.cvsignore | 2 --
 c/src/lib/libcpu/powerpc/old_exception_processing/.cvsignore | 2 --
 c/src/lib/libcpu/powerpc/wrapup/Makefile.am                  | 5 ++++-
 5 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 c/src/lib/libcpu/powerpc/new_exception_processing/.cvsignore
 delete mode 100644 c/src/lib/libcpu/powerpc/old_exception_processing/.cvsignore

(limited to 'c/src/lib/libcpu')

diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 26522c385c..17ebfd2b9a 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -10,6 +10,12 @@ if shared
 SHARED_LIB = shared
 endif
 
+if new_exception_processing
+EXCEPTION_SUBDIR = new_exception_processing
+else
+EXCEPTION_SUBDIR = old_exception_processing
+endif
+
 if mpc505
 CPU_SUBDIR = mpc505
 endif
@@ -23,7 +29,7 @@ if ppc403
 CPU_SUBDIR = ppc403
 endif
 
-SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR) wrapup
+SUBDIRS = $(SHARED_LIB) $(EXCEPTION_SUBDIR) $(CPU_SUBDIR) wrapup
 
 include $(top_srcdir)/../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/configure.in b/c/src/lib/libcpu/powerpc/configure.in
index 0d3894d8aa..a480b75d79 100644
--- a/c/src/lib/libcpu/powerpc/configure.in
+++ b/c/src/lib/libcpu/powerpc/configure.in
@@ -34,6 +34,10 @@ AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "mpc750" \
 || test "$RTEMS_CPU_MODEL" = "mpc860" \
 || test "$RTEMS_CPU_MODEL" = "mpc8xx" )
 
+AM_CONDITIONAL(new_exception_processing, \
+test "$RTEMS_CPU_MODEL" = "mpc750" || \
+test "$RTEMS_CPU_MODEL" = "mpc604")
+
 AM_CONDITIONAL(mpc505, test "$RTEMS_CPU_MODEL" = "mpc505")
 AM_CONDITIONAL(mpc6xx, test "$RTEMS_CPU_MODEL" = "mpc6xx" \
 || test "$RTEMS_CPU_MODEL" = "mpc604" \
@@ -70,6 +74,8 @@ mpc6xx/exceptions/Makefile
 mpc6xx/mmu/Makefile
 mpc6xx/timer/Makefile
 mpc6xx/wrapup/Makefile
+new_exception_processing/Makefile
+old_exception_processing/Makefile
 shared/Makefile
 shared/include/Makefile
 shared/src/Makefile
diff --git a/c/src/lib/libcpu/powerpc/new_exception_processing/.cvsignore b/c/src/lib/libcpu/powerpc/new_exception_processing/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libcpu/powerpc/new_exception_processing/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/.cvsignore b/c/src/lib/libcpu/powerpc/old_exception_processing/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libcpu/powerpc/old_exception_processing/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
index 9d6ac5b753..c45bfc418d 100644
--- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
@@ -10,7 +10,10 @@ GENERIC_FILES = shared
 # So far FAMILY_OBJS is empty and ar dislike it...
 CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
 FAMILY_OBJS = \
-    $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o ../mpc6xx/*/$(ARCH)/*.o)
+    $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o \
+         ../old_exception_processing/*/$(ARCH)/*.o \
+         ../new_exception_processing/*/$(ARCH)/*.o \
+         ../mpc6xx/*/$(ARCH)/*.o)
 
 LIB = $(ARCH)/libcpu.a
 
-- 
cgit v1.2.3