--- a/packages/hal/powerpc/mpc8xx/current/ChangeLog
+++ b/packages/hal/powerpc/mpc8xx/current/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-18  Jonathan Larmour  <jlarmour@redhat.co.uk>
+
+	* include/pkgconf/hal_powerpc_mpc8xx.h: Fix nesting of
+	CYGSEM_HAL_POWERPC_MPC860_CPM_ENABLE option
+	paernt -> parent
+	CYGSEM_HAL_POWERPC_MPC860_CPM_LVL -> CYGHWR_HAL_POWERPC_MPC860_CPM_LVL
+	which also doesn't need to be a component, only an option
+
 2000-02-14  Jesper Skov  <jskov@redhat.com>
 
 	* include/pkgconf/hal_powerpc_mpc8xx.h: Added simple config for

--- a/packages/hal/powerpc/mpc8xx/current/include/pkgconf/hal_powerpc_mpc8xx.h
+++ b/packages/hal/powerpc/mpc8xx/current/include/pkgconf/hal_powerpc_mpc8xx.h
@@ -71,29 +71,28 @@
            addition to the PowerPC processor core has built in peripherals
            such as memory controllers, DMA controllers, serial ports and
            timers/counters."               
-
+  }
 
-        cdl_component CYGSEM_HAL_POWERPC_MPC860_CPM_ENABLE {
-            display       "Enable CPM interrupts"
-            paernt        CYGPKG_HAL_POWERPC_MPC860
-            type          boolean
-            description   "
-                This option causes the CPM interrupt arbiter to be attached
-                at startup, and CPM interrupts are enabled. Enabling CPM
-                level interrupt arbitration and handling must still be
-                done by the application code. See intr0.c test for an
-                example."
+  cdl_component CYGSEM_HAL_POWERPC_MPC860_CPM_ENABLE {
+       display       "Enable CPM interrupts"
+       parent        CYGPKG_HAL_POWERPC_MPC860
+       type          boolean
+       description   "
+           This option causes the CPM interrupt arbiter to be attached
+           at startup, and CPM interrupts are enabled. Enabling CPM
+           level interrupt arbitration and handling must still be
+           done by the application code. See intr0.c test for an
+           example."
+  }
 
-            cdl_component CYGSEM_HAL_POWERPC_MPC860_CPM_LVL {
-                display       "CPM interrupt level on the SIU"
-                type          count
-                legal_values  0 to 7
-                parent        CYGSEM_HAL_POWERPC_MPC860_CPM_ENABLE
-                description   "
-                    This option selects which SIU level the CPM interrupts
-                    should be routed to."
-            }
-        }
+  cdl_option CYGHWR_HAL_POWERPC_MPC860_CPM_LVL {
+       display       "CPM interrupt level on the SIU"
+       type          count
+       legal_values  0 to 7
+       parent        CYGSEM_HAL_POWERPC_MPC860_CPM_ENABLE
+       description   "
+           This option selects which SIU level the CPM interrupts
+           should be routed to."
    }
 
  }}CFG_DATA */
@@ -110,7 +109,7 @@
 
 // CPM options
 #define CYGSEM_HAL_POWERPC_MPC860_CPM_ENABLE
-#define CYGSEM_HAL_POWERPC_MPC860_CPM_LVL 7
+#define CYGHWR_HAL_POWERPC_MPC860_CPM_LVL 7
 
 //----------------------------------------------------------------------
 #endif  // CYGONCE_PKGCONF_HAL_POWERPC_MPC8XX_H

--- a/packages/infra/current/ChangeLog
+++ b/packages/infra/current/ChangeLog
@@ -1,3 +1,20 @@
+2000-02-18  Hugo Tyson  <hmt@cygnus.co.uk>
+
+	* src/tcdiag.cxx (cyg_test_exit): Add the facility for a platform
+	HAL to define an action to take at CYG_TEST_EXIT time; this is
+	useful for some simulators that are not (yet) Gdb integrated.
+	The action is CYGHWR_TEST_PROGRAM_EXIT() if defined.
+
+	* src/simple.cxx (cyg_assert_fail): Add the facility for a
+	platform HAL to define an action to take when an assertion failure
+	occurs.  Ditto.
+
+	* src/fancy.cxx (cyg_assert_fail): Ditto.
+
+	* src/buffer.cxx (cyg_assert_fail): Ditto.
+
+	[no change to null.cxx because, well, it's null isn't it]
+
 2000-02-08  Jonathan Larmour  <jlarmour@redhat.co.uk>
 
 	* include/cyg_trac.h: Define and document CYG_TRACE_PRINT() and

--- a/packages/infra/current/src/buffer.cxx
+++ b/packages/infra/current/src/buffer.cxx
@@ -727,6 +727,9 @@ cyg_assert_fail( const char *psz_func, c
 
 #endif
     
+#ifdef CYGHWR_TEST_PROGRAM_EXIT
+    CYGHWR_TEST_PROGRAM_EXIT();
+#endif
     for(;;);
     
 //    DIAG_DEVICE_END_SYNC();

--- a/packages/infra/current/src/fancy.cxx
+++ b/packages/infra/current/src/fancy.cxx
@@ -605,6 +605,9 @@ cyg_assert_fail( const char *psz_func, c
     diag_write_string(psz_msg);
     diag_write_char('\n');
 
+#ifdef CYGHWR_TEST_PROGRAM_EXIT
+    CYGHWR_TEST_PROGRAM_EXIT();
+#endif
     for(;;);
     
 //    DIAG_DEVICE_END_SYNC();

--- a/packages/infra/current/src/simple.cxx
+++ b/packages/infra/current/src/simple.cxx
@@ -506,6 +506,9 @@ cyg_assert_fail( const char *psz_func, c
     diag_write_string(psz_msg);
     diag_write_char('\n');
 
+#ifdef CYGHWR_TEST_PROGRAM_EXIT
+    CYGHWR_TEST_PROGRAM_EXIT();
+#endif
     for(;;);
 
 //    DIAG_DEVICE_END_SYNC();

--- a/packages/infra/current/src/tcdiag.cxx
+++ b/packages/infra/current/src/tcdiag.cxx
@@ -43,6 +43,8 @@
 #include <cyg/infra/diag.h>            // HAL polled output
 #include <cyg/infra/testcase.h>        // what we implement
 
+#include <cyg/hal/hal_intr.h>          // exit macro, if defined
+
 int cyg_test_is_simulator = 0;         // infrastructure changes as necessary
 
 externC void
@@ -98,6 +100,10 @@ cyg_test_output(Cyg_test_code status, co
 externC void
 cyg_test_exit(void)
 {
+#ifdef CYGHWR_TEST_PROGRAM_EXIT
+    CYGHWR_TEST_PROGRAM_EXIT();
+#endif
+
     for(;;)
         ;
 }