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

@@ -5,13 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-if PPC_NEW_EXCEPTION_PROCESSING
+SUBDIRS = shared
-CPUDIR = new_exception_processing
-else
-CPUDIR = old_exception_processing
-endif
-
-SUBDIRS = shared $(CPUDIR)
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am

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
+shared/Makefile)
-new_exception_processing/Makefile
-old_exception_processing/Makefile)

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

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

c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am

@@ -14,6 +14,7 @@ BSP_PIECES = startup clock console scv64 timer tod $(NETWORKING)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o)
 LIB = $(ARCH)/libbsp.a
 

c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am

@@ -17,6 +17,7 @@ BSP_PIECES = startup start canbus console $(NETWORKING)
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
+ $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
 LIB = $(ARCH)/libbsp.a
 

c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am

@@ -10,6 +10,7 @@ CPU_PIECES = clock timer console vectors ictrl
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
  $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
 
 LIB = $(ARCH)/libbsp.a

c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am

@@ -17,6 +17,7 @@ BSP_PIECES = startup console $(NETWORKING)
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
+ $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.o)
 LIB = $(ARCH)/libbsp.a
 

c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am

@@ -10,6 +10,7 @@ BSP_PIECES = clock console irq openpic pci residual startup vectors motorola
 OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.o) \
+ $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \
  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
 LIB = $(ARCH)/libbsp.a
 

c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am

@@ -10,6 +10,7 @@ CPU_PIECES = clock timer console vectors ictrl
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
  $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
 
 LIB = $(ARCH)/libbsp.a

c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am

@@ -14,7 +14,8 @@ BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \
 # pieces to pick up out of libcpu/$(RTEMS_CPU)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am

@@ -17,10 +17,11 @@ BSP_MP_O_PIECES = shmsupp
 endif
 BSP_PIECES = startup clock console timer vectors $(BSP_MP_O_PIECES)
 
+
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
  $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
-
 LIB = $(ARCH)/libbsp.a
 
 #

c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am

@@ -8,7 +8,8 @@ BSP_PIECES = startup clock console timer tod vectors PCI_bus
 # pieces to pick up out of libcpu/$(RTEMS_CPU)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

c/src/lib/libbsp/powerpc/support/new_exception_processing/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libbsp/powerpc/support/old_exception_processing/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

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

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

c/src/lib/libcpu/powerpc/new_exception_processing/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libcpu/powerpc/old_exception_processing/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

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
 

cpukit/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
+SUBDIRS = shared
-CPUDIR = new_exception_processing
-else
-CPUDIR = old_exception_processing
-endif
-
-SUBDIRS = shared $(CPUDIR)
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am