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/exec/score/cpu/powerpc/Makefile.am                     |  8 +-------
 c/src/exec/score/cpu/powerpc/configure.in                    | 12 ++----------
 .../score/cpu/powerpc/new_exception_processing/Makefile.am   | 11 +++--------
 .../score/cpu/powerpc/old_exception_processing/Makefile.am   |  7 ++++---
 4 files changed, 10 insertions(+), 28 deletions(-)

(limited to 'c/src/exec/score/cpu')

diff --git a/c/src/exec/score/cpu/powerpc/Makefile.am b/c/src/exec/score/cpu/powerpc/Makefile.am
index cbddc2bca7..5a78c873dd 100644
--- a/c/src/exec/score/cpu/powerpc/Makefile.am
+++ b/c/src/exec/score/cpu/powerpc/Makefile.am
@@ -5,13 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-if PPC_NEW_EXCEPTION_PROCESSING
-CPUDIR = new_exception_processing
-else
-CPUDIR = old_exception_processing
-endif
-
-SUBDIRS = shared $(CPUDIR)
+SUBDIRS = shared
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/exec/score/cpu/powerpc/configure.in b/c/src/exec/score/cpu/powerpc/configure.in
index 1c35a770d9..0360848cbd 100644
--- a/c/src/exec/score/cpu/powerpc/configure.in
+++ b/c/src/exec/score/cpu/powerpc/configure.in
@@ -3,7 +3,7 @@ dnl
 dnl $Id$
 
 AC_PREREQ(2.13)
-AC_INIT(new_exception_processing)
+AC_INIT(shared)
 RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
@@ -27,15 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-# FIXME: This is in contradiction to multilibs
-RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-
-# FIXME: This is in contradiction to multilibs
-AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604")
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
-shared/Makefile
-new_exception_processing/Makefile
-old_exception_processing/Makefile)
+shared/Makefile)
diff --git a/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am b/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am
index 1f4affe8f4..f6b84c4969 100644
--- a/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am
@@ -3,6 +3,7 @@
 ##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 C_FILES = cpu.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
@@ -15,7 +16,7 @@ S_FILES = cpu_asm.S
 S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -25,12 +26,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
     $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
     $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
 
-##TMPINSTALL_FILES += \
-##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
-##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
-##	$(INSTALL_DATA) $< $@
-
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
@@ -57,4 +52,4 @@ CLEANDIRS = ../o-optimize ../o-debug ../o-profile
 
 EXTRA_DIST = $(C_FILES) $(S_FILES)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/exec/score/cpu/powerpc/old_exception_processing/Makefile.am b/c/src/exec/score/cpu/powerpc/old_exception_processing/Makefile.am
index 92f3fee811..1ad0b1bde9 100644
--- a/c/src/exec/score/cpu/powerpc/old_exception_processing/Makefile.am
+++ b/c/src/exec/score/cpu/powerpc/old_exception_processing/Makefile.am
@@ -3,6 +3,7 @@
 ##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 # C source names
 C_FILES = cpu.c
@@ -17,7 +18,7 @@ S_FILES = cpu_asm.S
 S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../../automake/lib.am
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
     $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
@@ -40,7 +41,7 @@ $(PROJECT_INCLUDE)/rtems/score/%: %
 $(PROJECT_INCLUDE)/%: %
 	$(INSTALL_DATA) $< $@
 
-REL = ../$(ARCH)/rtems-cpu.rel
+REL = $(ARCH)/rtems-cpu.rel
 
 $(REL): $(C_O_FILES) $(S_O_FILES)
 	test -d ../$(ARCH) || mkdir ../$(ARCH)
@@ -54,4 +55,4 @@ UNUSED_FILES = irq_stub.S
 
 EXTRA_DIST = TODO rtems.S $(C_FILES) $(S_FILES) $(UNUSED_FILES)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../../automake/local.am
-- 
cgit v1.2.3