Added --disable-multiprocessing flag and modified a lot of files to make

it work.

3 files changed, 20 insertions, 1 deletions

diff --git a/c/src/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in
index 1ed5d13cb1..62fac8b2e7 100644
--- a/c/src/libmisc/monitor/Makefile.in
+++ b/c/src/libmisc/monitor/Makefile.in
@@ -9,10 +9,15 @@ RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 LIB=${ARCH}/libmonitor-tmp.a
+
 # C source names, if any, go here -- minus the .c
+# We only build multiprocessing related files if HAS_MP was defined
+MP_PIECES_yes_V = mon-mpci
+MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
+
 C_PIECES=mon-command mon-symbols mon-prmisc mon-monitor mon-object mon-server \
 	 mon-task mon-queue mon-driver mon-dname mon-itask \
-	 mon-extension mon-manager mon-config mon-mpci
+	 mon-extension mon-manager mon-config $(MP_PIECES)
 C_FILES=$(C_PIECES:%=%.c)
 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
diff --git a/c/src/libmisc/monitor/mon-object.c b/c/src/libmisc/monitor/mon-object.c
index 8d5a9c395f..8112372d86 100644
--- a/c/src/libmisc/monitor/mon-object.c
+++ b/c/src/libmisc/monitor/mon-object.c
@@ -42,11 +42,19 @@ rtems_monitor_object_info_t rtems_monitor_object_info[] =
     },
     { RTEMS_MONITOR_OBJECT_MPCI,
       (void *) 0,
+#if defined(RTEMS_MULTIPROCESSING)
       sizeof(rtems_monitor_mpci_t),
       (rtems_monitor_object_next_fn)        rtems_monitor_mpci_next,
       (rtems_monitor_object_canonical_fn)   rtems_monitor_mpci_canonical,
       (rtems_monitor_object_dump_header_fn) rtems_monitor_mpci_dump_header,
       (rtems_monitor_object_dump_fn)        rtems_monitor_mpci_dump,
+#else
+      0,
+      (rtems_monitor_object_next_fn)        0,
+      (rtems_monitor_object_canonical_fn)   0,
+      (rtems_monitor_object_dump_header_fn) 0,
+      (rtems_monitor_object_dump_fn)        0,
+#endif
     },
     { RTEMS_MONITOR_OBJECT_INIT_TASK,
       (void *) 0,
diff --git a/c/src/libmisc/monitor/monitor.h b/c/src/libmisc/monitor/monitor.h
index 16efd7c41f..a9584808f3 100644
--- a/c/src/libmisc/monitor/monitor.h
+++ b/c/src/libmisc/monitor/monitor.h
@@ -200,6 +200,7 @@ typedef struct {
  * MPCI config
  */
 
+#if defined(RTEMS_MULTIPROCESSING)
 typedef struct {
     unsigned32  node;                   /* local node number */
     unsigned32  maximum_nodes;          /* maximum # nodes in system */
@@ -214,6 +215,7 @@ typedef struct {
     rtems_monitor_symbol_t   send_packet;
     rtems_monitor_symbol_t   receive_packet;
 } rtems_monitor_mpci_t;
+#endif
 
 /*
  * The generic canonical information union
@@ -227,7 +229,9 @@ typedef union {
     rtems_monitor_driver_t     driver;
     rtems_monitor_dname_t      dname;
     rtems_monitor_config_t     config;
+#if defined(RTEMS_MULTIPROCESSING)
     rtems_monitor_mpci_t       mpci;
+#endif
     rtems_monitor_init_task_t  itask;
 } rtems_monitor_union_t;
 
@@ -370,10 +374,12 @@ void       rtems_monitor_config_dump_header(boolean);
 void       rtems_monitor_config_dump(rtems_monitor_config_t *, boolean verbose);
 
 /* mpci.c */
+#if defined(RTEMS_MULTIPROCESSING)
 void       rtems_monitor_mpci_canonical(rtems_monitor_mpci_t *, void *);
 void      *rtems_monitor_mpci_next(void *, rtems_monitor_mpci_t *, rtems_id *);
 void       rtems_monitor_mpci_dump_header(boolean);
 void       rtems_monitor_mpci_dump(rtems_monitor_mpci_t *, boolean verbose);
+#endif
 
 /* itask.c */
 void       rtems_monitor_init_task_canonical(rtems_monitor_init_task_t *, void *);