2007-05-15 Ray Xu <rayx@gmail.com>

	* Makefile.am: Add abort.rel since it is now in the BSP shared source,
	not in score/cpu.

12 files changed, 63 insertions, 5 deletions

diff --git a/c/src/lib/libbsp/arm/ChangeLog b/c/src/lib/libbsp/arm/ChangeLog
index b62479c4a2..0012cef5c4 100644
--- a/c/src/lib/libbsp/arm/ChangeLog
+++ b/c/src/lib/libbsp/arm/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15	Ray Xu <rayx@gmail.com>
+
+	* Makefile.am: Add abort.rel since it is now in the BSP shared source,
+	not in score/cpu.
+
 2007-04-25	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* acinclude.m4: Regenerate.
diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index 2e5024f3d4..85803cd8f5 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -20,5 +20,8 @@ EXTRA_DIST += shared/comm/uart.c
 EXTRA_DIST += shared/irq/irq_asm.S
 EXTRA_DIST += shared/irq/irq_init.c
 
+# abort
+EXTRA_DIST += shared/abort/simple_abort.c
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog
index d45ba58233..dfd781dab8 100644
--- a/c/src/lib/libbsp/arm/csb336/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb336/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15	Ray Xu <rayx@gmail.com>
+
+	* Makefile.am: Add abort.rel since it is now in the BSP shared source,
+	not in score/cpu.
+
 2007-04-12	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove qrtems_debug.
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 55e13fdc2f..701e664302 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -38,6 +38,11 @@ console_rel_SOURCES = console/uart.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+noinst_PROGRAMS += abort.rel
+abort_rel_SOURCES = ../shared/abort/abort.c
+abort_rel_CPPFLAGS = $(AM_CPPFLAGS)
+abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 noinst_PROGRAMS += network.rel
@@ -48,7 +53,7 @@ endif
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel console.rel
+libbsp_a_LIBADD = startup.rel console.rel abort.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index 7315401482..d056cbe051 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15	Ray Xu <rayx@gmail.com>
+
+	* Makefile.am: Add abort.rel since it is now in the BSP shared source,
+	not in score/cpu.
+
 2007-04-12	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove qrtems_debug.
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 9104f25f0e..786d314aa5 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -38,6 +38,11 @@ console_rel_SOURCES = console/uarts.c ../../shared/console.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+noinst_PROGRAMS += abort.rel
+abort_rel_SOURCES = ../shared/abort/abort.c
+abort_rel_CPPFLAGS = $(AM_CPPFLAGS)
+abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 noinst_PROGRAMS += network.rel
@@ -48,7 +53,7 @@ endif
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel console.rel
+libbsp_a_LIBADD = startup.rel console.rel abort.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index d73e2f887a..b507f4204d 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15	Ray Xu <rayx@gmail.com>
+
+	* Makefile.am: Add abort.rel since it is now in the BSP shared source,
+	not in score/cpu.
+
 2007-04-12	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove qrtems_debug.
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index f530b4e52b..681b7d4750 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -50,6 +50,11 @@ timer_rel_SOURCES = timer/timer.c
 timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+noinst_PROGRAMS += abort.rel
+abort_rel_SOURCES = ../shared/abort/abort.c
+abort_rel_CPPFLAGS = $(AM_CPPFLAGS)
+abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 include_HEADERS += irq/irq.h
 
 noinst_PROGRAMS += irq.rel
@@ -69,7 +74,7 @@ endif
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = clock.rel console.rel startup.rel irq.rel timer.rel
+libbsp_a_LIBADD = clock.rel console.rel startup.rel irq.rel timer.rel abort.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog
index b6e881141c..7b8b8161e2 100644
--- a/c/src/lib/libbsp/arm/gp32/ChangeLog
+++ b/c/src/lib/libbsp/arm/gp32/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15	Ray Xu <rayx@gmail.com>
+
+	* Makefile.am: Add abort.rel since it is now in the BSP shared source,
+	not in score/cpu.
+
 2007-04-12	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove qrtems_debug.
diff --git a/c/src/lib/libbsp/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am
index be2724b393..77c99c47b8 100644
--- a/c/src/lib/libbsp/arm/gp32/Makefile.am
+++ b/c/src/lib/libbsp/arm/gp32/Makefile.am
@@ -39,6 +39,11 @@ console_rel_SOURCES = console/uart.c ../../shared/console.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+noinst_PROGRAMS += abort.rel
+abort_rel_SOURCES = ../shared/abort/abort.c
+abort_rel_CPPFLAGS = $(AM_CPPFLAGS)
+abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 noinst_PROGRAMS += smc.rel
 smc_rel_SOURCES = smc/smc.c smc/smc.h
 smc_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -46,7 +51,7 @@ smc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel console.rel smc.rel
+libbsp_a_LIBADD = startup.rel console.rel smc.rel abort.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
index e721158e54..ddd2db5ae4 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
+++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15	Ray Xu <rayx@gmail.com>
+
+	* Makefile.am: Add abort.rel since it is now in the BSP shared source,
+	not in score/cpu.
+
 2007-05-09	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspclean.c: Remove incldue stdio.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index ec7ff80457..e1fbc81c03 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -40,6 +40,11 @@ console_rel_SOURCES = ../../shared/console.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+noinst_PROGRAMS += simple_abort.rel
+simple_abort_rel_SOURCES = ../shared/abort/simple_abort.c
+simple_abort_rel_CPPFLAGS = $(AM_CPPFLAGS)
+simple_abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 noinst_PROGRAMS += debugio.rel
 debugio_rel_SOURCES = console/uart.c 
 debugio_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -55,7 +60,7 @@ endif
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD =  console.rel debugio.rel
+libbsp_a_LIBADD =  console.rel debugio.rel simple_abort.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif