3 files changed, 7 insertions, 25 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index afdec0d157..f3b283d4a4 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove old_exception_processing,
+	new_exception_processing.
+	* Makefile.am: Ditto.
+
 2001-11-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove mpc750 from new_exception_processing,
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 02dac61d17..039aace06f 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -10,15 +10,6 @@ if shared
 SHARED_LIB = shared
 endif
 
-## Use new or old exception processing based on the CPU
-if new_exception_processing
-EXCEPTION_SUBDIR = new_exception_processing
-endif
-
-if old_exception_processing
-EXCEPTION_SUBDIR = old_exception_processing
-endif
-
 if mpc505
 CPU_SUBDIR = mpc505
 endif
@@ -39,7 +30,7 @@ if ppc405
 CPU_SUBDIR = ppc403
 endif
 
-SUBDIRS = $(SHARED_LIB) $(EXCEPTION_SUBDIR) $(CPU_SUBDIR) wrapup
+SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR) wrapup
 
 include $(top_srcdir)/../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac
index 46d340ea43..4081105c5c 100644
--- a/c/src/lib/libcpu/powerpc/configure.ac
+++ b/c/src/lib/libcpu/powerpc/configure.ac
@@ -36,19 +36,6 @@ AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "mpc750" \
 || test "$RTEMS_CPU_MODEL" = "mpc8260" \
 || test "$RTEMS_CPU_MODEL" = "mpc8xx" )
 
-## there are no 601 or 602 BSPs currently.  The 505 BSPs are in user land.
-AM_CONDITIONAL(new_exception_processing, \
-test "$RTEMS_CPU_MODEL" = "mpc860" )
-
-## The goal is to get rid of the old exception processing code but
-## but all BSPs in the distribution must be migrated to the new model
-## first.
-AM_CONDITIONAL(old_exception_processing, \
-test "$RTEMS_CPU_MODEL" = "ppc403" || \
-test "$RTEMS_CPU_MODEL" = "ppc405" || \
-test "$RTEMS_CPU_MODEL" = "mpc505" \
-)
-
 ## test on CPU type
 AM_CONDITIONAL(mpc505, test "$RTEMS_CPU_MODEL" = "mpc505")
 AM_CONDITIONAL(mpc6xx, test "$RTEMS_CPU_MODEL" = "mpc6xx" \
@@ -97,8 +84,6 @@ mpc8260/timer/Makefile
 mpc8260/exceptions/Makefile
 mpc8260/mmu/Makefile
 mpc8260/cpm/Makefile
-new_exception_processing/Makefile
-old_exception_processing/Makefile
 shared/Makefile
 shared/include/Makefile
 shared/src/Makefile