all targets compile .. tony's patches in place

6 files changed, 41 insertions, 32 deletions

diff --git a/c/src/lib/libmisc/error/error.c b/c/src/lib/libmisc/error/error.c
index cfe1858e08..56224f2a56 100644
--- a/c/src/lib/libmisc/error/error.c
+++ b/c/src/lib/libmisc/error/error.c
@@ -39,7 +39,7 @@
  * EXAMPLE
  *        if ((fd = open(pathname, O_RDNLY)) < 0)
  *        {
- *            rtems_error(FLOSS_ERROR_ERRNO, "open of '%s' failed", pathname);
+ *            rtems_error(RTEMS_ERROR_ERRNO, "open of '%s' failed", pathname);
  *            goto failed;
  *        }
  */
diff --git a/c/src/lib/libmisc/monitor/mon-extension.c b/c/src/lib/libmisc/monitor/mon-extension.c
index 230fab9ddf..481a21e7dd 100644
--- a/c/src/lib/libmisc/monitor/mon-extension.c
+++ b/c/src/lib/libmisc/monitor/mon-extension.c
@@ -1,5 +1,5 @@
 /*
- *	@(#)extension.c	1.3 - 95/07/31
+ *	@(#)extension.c	1.6 - 95/09/25
  *	
  *
  * RTEMS Monitor extension support
@@ -21,22 +21,22 @@ rtems_monitor_extension_canonical(
     Extension_Control     *rtems_extension = (Extension_Control *) extension_void;
     rtems_extensions_table *e = &rtems_extension->Extension.Callouts;
 
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->create,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create,
                                             e->thread_create);
 
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->start,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_start,
                                             e->thread_start);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->restart,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_restart,
                                             e->thread_restart);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->delete,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_delete,
                                             e->thread_delete);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->tswitch,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_tswitch,
                                             e->thread_switch);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->begin,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_begin,
                                             e->thread_begin);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->exitted,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_exitted,
                                             e->thread_exitted);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->fatal,
+    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_fatal,
                                             e->fatal);
 }
 
@@ -72,29 +72,29 @@ rtems_monitor_extension_dump(
 
     length += rtems_monitor_pad(18, length);
     length += printf("create: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->create, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_create, verbose);
     length += printf(";  start: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->start, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_start, verbose);
     length += printf(";  restart: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->restart, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_restart, verbose);
     length += printf("\n");
     length = 0;
 
     length += rtems_monitor_pad(18, length);
     length += printf("delete: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->delete, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_delete, verbose);
     length += printf(";  switch: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->tswitch, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_tswitch, verbose);
     length += printf(";  begin: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->begin, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_begin, verbose);
     length += printf("\n");
     length = 0;
 
     length += rtems_monitor_pad(18, length);
     length += printf("exitted: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->exitted, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_exitted, verbose);
     length += printf(";  fatal: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->fatal, verbose);
+    length += rtems_monitor_symbol_dump(&monitor_extension->e_fatal, verbose);
     length += printf("\n");
     length = 0;
     printf("\n");
diff --git a/c/src/lib/libmisc/monitor/mon-symbols.c b/c/src/lib/libmisc/monitor/mon-symbols.c
index f0e3ed3bc2..9cbd76d280 100644
--- a/c/src/lib/libmisc/monitor/mon-symbols.c
+++ b/c/src/lib/libmisc/monitor/mon-symbols.c
@@ -184,7 +184,7 @@ rtems_symbol_string_compare(const void *e1,
 void
 rtems_symbol_sort(rtems_symbol_table_t *table)
 {
-#ifdef simhppa
+#ifdef RTEMS_ON_SIMULATOR
     printf("Sorting symbols ... ");         /* so slow we need a msg */
     fflush(stdout);
 #endif
@@ -195,7 +195,7 @@ rtems_symbol_sort(rtems_symbol_table_t *table)
     qsort((void *) table->symbols, (size_t) table->next,
           sizeof(rtems_symbol_t), rtems_symbol_string_compare);
 
-#ifdef simhppa
+#ifdef RTEMS_ON_SIMULATOR
     /* so slow we need a msg */
     printf("done\n");
 #endif
@@ -401,11 +401,11 @@ rtems_monitor_symbol_dump(
     {
         if (canonical_symbol->offset == 0)
             length += printf("%.*s",
-                             sizeof(canonical_symbol->name),
+                             (int) sizeof(canonical_symbol->name),
                              canonical_symbol->name);
         else
             length += printf("<%.*s+0x%x>",
-                             sizeof(canonical_symbol->name),
+                             (int) sizeof(canonical_symbol->name),
                              canonical_symbol->name,
                              canonical_symbol->offset);
         if (verbose)
diff --git a/c/src/lib/libmisc/monitor/monitor.h b/c/src/lib/libmisc/monitor/monitor.h
index c9df923928..2ee03f570b 100644
--- a/c/src/lib/libmisc/monitor/monitor.h
+++ b/c/src/lib/libmisc/monitor/monitor.h
@@ -140,14 +140,14 @@ typedef struct {
     rtems_id                 id;
     rtems_name               name;
   /* end of common portion */
-    rtems_monitor_symbol_t  create;
-    rtems_monitor_symbol_t  start;
-    rtems_monitor_symbol_t  restart;
-    rtems_monitor_symbol_t  delete;
-    rtems_monitor_symbol_t  tswitch;
-    rtems_monitor_symbol_t  begin;
-    rtems_monitor_symbol_t  exitted;
-    rtems_monitor_symbol_t  fatal;
+    rtems_monitor_symbol_t  e_create;
+    rtems_monitor_symbol_t  e_start;
+    rtems_monitor_symbol_t  e_restart;
+    rtems_monitor_symbol_t  e_delete;
+    rtems_monitor_symbol_t  e_tswitch;
+    rtems_monitor_symbol_t  e_begin;
+    rtems_monitor_symbol_t  e_exitted;
+    rtems_monitor_symbol_t  e_fatal;
 } rtems_monitor_extension_t;
 
 /*
diff --git a/c/src/lib/libmisc/stackchk/check.c b/c/src/lib/libmisc/stackchk/check.c
index c2ee9a0a10..29939d6d4c 100644
--- a/c/src/lib/libmisc/stackchk/check.c
+++ b/c/src/lib/libmisc/stackchk/check.c
@@ -128,10 +128,12 @@ void Stack_check_Initialize( void )
   rtems_status_code    status;
   Objects_Id           id_ignored;
   unsigned32          *p;
+#if 0
   unsigned32           i;
   unsigned32           class_index;
   Thread_Control      *the_thread;
   Objects_Information *information;
+#endif
 
   if (stack_check_initialized)
       return;
@@ -420,7 +422,11 @@ void Stack_check_Dump_threads_usage(
  *  Stack_check_Fatal_extension
  */
 
-void Stack_check_Fatal_extension( unsigned32 status )
+void Stack_check_Fatal_extension( 
+    Internal_errors_Source  source,
+    boolean                 is_internal,
+    unsigned32              status
+)
 {
     if (status == 0)
         Stack_check_Dump_usage();
@@ -443,6 +449,7 @@ void Stack_check_Dump_usage( void )
   if (stack_check_initialized == 0)
       return;
 
+  printf("Stack usage by thread\n");
   printf(
     "   ID          NAME         LOW        HIGH      AVAILABLE     USED\n"
   );
diff --git a/c/src/lib/libmisc/stackchk/internal.h b/c/src/lib/libmisc/stackchk/internal.h
index 7cecbd6e1a..e98ec7e92e 100644
--- a/c/src/lib/libmisc/stackchk/internal.h
+++ b/c/src/lib/libmisc/stackchk/internal.h
@@ -77,7 +77,9 @@ void Stack_check_Switch_extension(
  */
 
 void Stack_check_Fatal_extension(
-  unsigned32
+    Internal_errors_Source  source,
+    boolean                 is_internal,
+    unsigned32              status
 );
 
 /*