[rtems commit] bsps/powerpc: Move exceptions support to bsps

Sebastian Huber sebh at rtems.org
Mon Mar 19 12:13:15 UTC 2018


Module:    rtems
Branch:    master
Commit:    bd1508019cfb219b41da7cb6f1a9895a69c64534
Changeset: http://git.rtems.org/rtems/commit/?id=bd1508019cfb219b41da7cb6f1a9895a69c64534

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Mar 13 16:24:16 2018 +0100

bsps/powerpc: Move exceptions support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 bsps/powerpc/shared/exceptions.am                  | 14 +++++++++
 .../powerpc/shared/exceptions}/README              |  0
 .../powerpc/shared/exceptions}/ppc-code-copy.c     |  0
 .../powerpc/shared/exceptions}/ppc_exc.S           |  8 +++++
 .../powerpc/shared/exceptions}/ppc_exc_address.c   |  0
 .../powerpc/shared/exceptions}/ppc_exc_alignment.c |  0
 .../shared/exceptions}/ppc_exc_asm_macros.h        |  0
 .../shared/exceptions}/ppc_exc_async_normal.S      |  0
 .../shared/exceptions}/ppc_exc_categories.c        |  0
 .../powerpc/shared/exceptions}/ppc_exc_fatal.S     |  0
 .../shared/exceptions}/ppc_exc_global_handler.c    |  0
 .../powerpc/shared/exceptions}/ppc_exc_hdl.c       |  0
 .../shared/exceptions}/ppc_exc_initialize.c        |  0
 .../powerpc/shared/exceptions}/ppc_exc_naked.S     |  0
 .../powerpc/shared/exceptions}/ppc_exc_print.c     |  0
 .../powerpc/shared/exceptions}/ppc_exc_prologue.c  |  0
 .../vectors => bsps/powerpc/ss555/start}/vectors.S |  0
 .../powerpc/ss555/start}/vectors_init.c            |  0
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am       |  4 +--
 c/src/lib/libbsp/powerpc/gen5200/Makefile.am       |  4 +--
 c/src/lib/libbsp/powerpc/gen83xx/Makefile.am       |  4 +--
 c/src/lib/libbsp/powerpc/haleakala/Makefile.am     |  4 +--
 .../libbsp/powerpc/motorola_powerpc/Makefile.am    |  2 +-
 c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am    |  2 +-
 c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am    |  4 +--
 c/src/lib/libbsp/powerpc/mvme3100/Makefile.am      |  4 +--
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am      |  2 +-
 c/src/lib/libbsp/powerpc/psim/Makefile.am          |  2 +-
 c/src/lib/libbsp/powerpc/qemuppc/Makefile.am       |  4 +--
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am         |  4 +--
 c/src/lib/libbsp/powerpc/ss555/Makefile.am         |  6 ++--
 c/src/lib/libbsp/powerpc/t32mppc/Makefile.am       |  3 +-
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am        |  2 +-
 c/src/lib/libbsp/powerpc/virtex/Makefile.am        |  3 +-
 c/src/lib/libbsp/powerpc/virtex4/Makefile.am       |  4 +--
 c/src/lib/libbsp/powerpc/virtex5/Makefile.am       |  4 +--
 c/src/lib/libcpu/powerpc/Makefile.am               | 34 ----------------------
 37 files changed, 53 insertions(+), 65 deletions(-)

diff --git a/bsps/powerpc/shared/exceptions.am b/bsps/powerpc/shared/exceptions.am
new file mode 100644
index 0000000..e85b4bb
--- /dev/null
+++ b/bsps/powerpc/shared/exceptions.am
@@ -0,0 +1,14 @@
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc-code-copy.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_address.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_alignment.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_asm_macros.h
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_categories.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_fatal.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_global_handler.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_hdl.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_initialize.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_naked.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_print.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_prologue.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc.S
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/README b/bsps/powerpc/shared/exceptions/README
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/README
rename to bsps/powerpc/shared/exceptions/README
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc-code-copy.c b/bsps/powerpc/shared/exceptions/ppc-code-copy.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc-code-copy.c
rename to bsps/powerpc/shared/exceptions/ppc-code-copy.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S b/bsps/powerpc/shared/exceptions/ppc_exc.S
similarity index 97%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S
rename to bsps/powerpc/shared/exceptions/ppc_exc.S
index 511601d..c606c0d 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S
+++ b/bsps/powerpc/shared/exceptions/ppc_exc.S
@@ -17,6 +17,12 @@
 #include <rtems/system.h>
 #include <rtems/score/percpu.h>
 
+/*
+ * This code uses the small-data area which is not available in the 64-bit
+ * PowerPC ELFv2 ABI.
+ */
+#ifndef __powerpc64__
+
 #include "ppc_exc_asm_macros.h"
 
 /******************************************************/
@@ -175,3 +181,5 @@ ppc_exc_wrap_auto_async:
 
 	.global	__ppc_exc_wrappers_end
 __ppc_exc_wrappers_end = .
+
+#endif /* !__powerpc64__ */
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c b/bsps/powerpc/shared/exceptions/ppc_exc_address.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_address.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c b/bsps/powerpc/shared/exceptions/ppc_exc_alignment.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_alignment.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_asm_macros.h b/bsps/powerpc/shared/exceptions/ppc_exc_asm_macros.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_asm_macros.h
rename to bsps/powerpc/shared/exceptions/ppc_exc_asm_macros.h
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S b/bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S
rename to bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c b/bsps/powerpc/shared/exceptions/ppc_exc_categories.c
old mode 100755
new mode 100644
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_categories.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_fatal.S b/bsps/powerpc/shared/exceptions/ppc_exc_fatal.S
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_fatal.S
rename to bsps/powerpc/shared/exceptions/ppc_exc_fatal.S
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_global_handler.c b/bsps/powerpc/shared/exceptions/ppc_exc_global_handler.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_global_handler.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_global_handler.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c b/bsps/powerpc/shared/exceptions/ppc_exc_hdl.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_hdl.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c b/bsps/powerpc/shared/exceptions/ppc_exc_initialize.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_initialize.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_naked.S b/bsps/powerpc/shared/exceptions/ppc_exc_naked.S
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_naked.S
rename to bsps/powerpc/shared/exceptions/ppc_exc_naked.S
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c b/bsps/powerpc/shared/exceptions/ppc_exc_print.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_print.c
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c b/bsps/powerpc/shared/exceptions/ppc_exc_prologue.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c
rename to bsps/powerpc/shared/exceptions/ppc_exc_prologue.c
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.S b/bsps/powerpc/ss555/start/vectors.S
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.S
rename to bsps/powerpc/ss555/start/vectors.S
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors_init.c b/bsps/powerpc/ss555/start/vectors_init.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors_init.c
rename to bsps/powerpc/ss555/start/vectors_init.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 9926e38..30ad34a 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -166,8 +166,7 @@ libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
@@ -181,4 +180,5 @@ EXTRA_DIST += README LICENSE
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/beatnik/headers.am
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index b35576e..efaea4b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -112,10 +112,10 @@ endif
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-	../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
+libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/gen5200/headers.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 7f29f1d..94971ba 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -75,8 +75,7 @@ libbsp_a_SOURCES += spi/spi_init.c
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-	../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel   \
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel   \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc83xx/i2c.rel  \
 	../../../libcpu/@RTEMS_CPU@/mpc83xx/spi.rel \
@@ -91,4 +90,5 @@ EXTRA_DIST += README.mpc8349eamds
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/gen83xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index fafec4d..951e493 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -45,10 +45,10 @@ endif
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-    ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/haleakala/headers.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index bdae576..71c7de9 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -120,7 +120,6 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 libbsp_a_LIBADD = \
     polledIO.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
@@ -134,4 +133,5 @@ EXTRA_DIST += times.mcp750 times.mvme2307
 include $(top_srcdir)/../../../../automake/local.am
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/motorola_powerpc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 645deff..b2f6122 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -114,9 +114,9 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/misc.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/edma.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/emios.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dspi.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/mpc55xxevb/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 45860cc..d039345 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -56,8 +56,7 @@ endif
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8260/console-generic.rel \
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc8260/console-generic.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel
@@ -66,4 +65,5 @@ EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/mpc8260ads/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 1b9c9c2..6d6ae37 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -110,8 +110,7 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/e500/timer.rel \
-    ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel
+    ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel
 
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
@@ -121,4 +120,5 @@ EXTRA_DIST += LICENSE README KNOWN_PROBLEMS
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/mvme3100/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index ee66b7c..6bc467f 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -88,7 +88,6 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel\
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
@@ -99,4 +98,5 @@ endif
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/mvme5500/headers.am
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 1ae5e6b..1df73b7 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -64,11 +64,11 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/psim/headers.am
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index a5349f6..ad42c39 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -53,10 +53,10 @@ libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/qemuppc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index af1158a..832e67d 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -98,8 +98,7 @@ libbsp_a_SOURCES += shmsupp/lock.S \
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-	../../../libcpu/@RTEMS_CPU@/e500/mmu.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel
 
 if HAS_NETWORKING
 libbsp_a_SOURCES += network/network.c \
@@ -113,4 +112,5 @@ endif
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/qoriq/headers.am
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 56f1862..6997ece 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -36,14 +36,16 @@ libbsp_a_SOURCES += ../../shared/bspreset.c
 libbsp_a_SOURCES += startup/tm27supp.c
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_print.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors_init.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors.S
 
 libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mpc5xx/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc5xx/console-generic.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc5xx/exceptions.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc5xx/irq.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel
+    ../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index c7f37e9..345e8e3 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -66,12 +66,11 @@ libbsp_a_SOURCES += console/console.c
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel
-
 if HAS_SMP
 libbsp_a_SOURCES += ../../shared/bspsmp.c
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/t32mppc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 5f35a17..8188ad5 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -65,7 +65,6 @@ endif
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
 libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc8xx/console-generic.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc8xx/cpm.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc8xx/clock.rel \
@@ -74,4 +73,5 @@ libbsp_a_LIBADD = \
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/tqm8xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 9ceabd6..355b0ca 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -68,8 +68,7 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel
-
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/virtex/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index bb19568..256ace5 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -47,12 +47,12 @@ libbsp_a_SOURCES += mmu/mmu.c
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-                  ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
                   ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel
 
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/virtex4/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 561b8aa..f250458 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -49,12 +49,12 @@ libbsp_a_SOURCES += mmu/mmu.c
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-                  ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \
                   ../../../libcpu/@RTEMS_CPU@/e500/timer.rel
 
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
 include $(srcdir)/../../../../../../bsps/powerpc/virtex5/headers.am
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index fa4498b..724dfea 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -6,33 +6,6 @@ EXTRA_DIST =
 
 noinst_PROGRAMS =
 
-if !mpc5xx
-noinst_PROGRAMS += new-exceptions/exc_bspsupport.rel
-new_exceptions_exc_bspsupport_rel_SOURCES = \
-    new-exceptions/bspsupport/ppc_exc_async_normal.S \
-    new-exceptions/bspsupport/ppc_exc_fatal.S \
-    new-exceptions/bspsupport/ppc_exc_print.c
-if !qoriq
-new_exceptions_exc_bspsupport_rel_SOURCES += \
-    new-exceptions/bspsupport/ppc-code-copy.c \
-    new-exceptions/bspsupport/ppc_exc.S \
-    new-exceptions/bspsupport/ppc_exc_naked.S \
-    new-exceptions/bspsupport/ppc_exc_hdl.c \
-    new-exceptions/bspsupport/ppc_exc_initialize.c \
-    new-exceptions/bspsupport/ppc_exc_global_handler.c \
-    new-exceptions/bspsupport/ppc_exc_categories.c \
-    new-exceptions/bspsupport/ppc_exc_address.c \
-    new-exceptions/bspsupport/ppc_exc_alignment.c \
-    new-exceptions/bspsupport/ppc_exc_prologue.c
-endif
-
-new_exceptions_exc_bspsupport_rel_CPPFLAGS = $(AM_CPPFLAGS)
-new_exceptions_exc_bspsupport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-EXTRA_DIST += new-exceptions/bspsupport/README
-EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c
-
 EXTRA_DIST += ppc403/README ppc403/vectors/README
 if ppc4xx
 # ppc403/clock
@@ -105,13 +78,6 @@ noinst_PROGRAMS += mpc5xx/timer.rel
 mpc5xx_timer_rel_SOURCES = mpc5xx/timer/timer.c
 mpc5xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc5xx/vectors
-noinst_PROGRAMS += mpc5xx/vectors.rel
-mpc5xx_vectors_rel_SOURCES = mpc5xx/vectors/vectors_init.c mpc5xx/vectors/vectors.S \
-    new-exceptions/bspsupport/ppc_exc_print.c
-mpc5xx_vectors_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc5xx_vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
 if mpc6xx




More information about the vc mailing list