diff options
Diffstat (limited to 'c/src/lib')
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/force386/Makefile.in | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/cvme961/Makefile.in | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/Makefile.in | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/Makefile.in | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/unix/posix/Makefile.in | 10 | ||||
| -rw-r--r-- | c/src/lib/libmisc/monitor/Makefile.in | 7 | ||||
| -rw-r--r-- | c/src/lib/libmisc/monitor/mon-object.c | 8 | ||||
| -rw-r--r-- | c/src/lib/libmisc/monitor/monitor.h | 6 |
10 files changed, 54 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in index 2dc18158d3..867e6d0ae7 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in @@ -11,7 +11,11 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg +# We only build the multiprocessing support if HAS_MP was defined +MP_SUPPORT_yes_V = shmsupp +MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories # NOTE: we pick up HPPA clock and timer from libcpu/hppa -SUB_DIRS=tools include start startup tty shmsupp wrapup +SUB_DIRS=tools include start startup tty $(MP_SUPPORT) wrapup diff --git a/c/src/lib/libbsp/i386/force386/Makefile.in b/c/src/lib/libbsp/i386/force386/Makefile.in index 47328bffdf..04cbc7bb97 100644 --- a/c/src/lib/libbsp/i386/force386/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/Makefile.in @@ -11,6 +11,10 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg +# We only build the multiprocessing support if HAS_MP was defined +MP_SUPPORT_yes_V = shmsupp +MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include start startup clock console shmsupp timer wrapup +SUB_DIRS=include start startup clock console $(MP_SUPPORT) timer wrapup diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.in b/c/src/lib/libbsp/i960/cvme961/Makefile.in index 7a8d6260ed..ea49dac82a 100644 --- a/c/src/lib/libbsp/i960/cvme961/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/Makefile.in @@ -11,6 +11,10 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg +# We only build the multiprocessing support if HAS_MP was defined +MP_SUPPORT_yes_V = shmsupp +MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include startup clock console shmsupp timer wrapup +SUB_DIRS=include startup clock console $(MP_SUPPORT) timer wrapup diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/Makefile.in index 7a8d6260ed..ea49dac82a 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.in @@ -11,6 +11,10 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg +# We only build the multiprocessing support if HAS_MP was defined +MP_SUPPORT_yes_V = shmsupp +MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include startup clock console shmsupp timer wrapup +SUB_DIRS=include startup clock console $(MP_SUPPORT) timer wrapup diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in index c1ea214afa..759ad635bd 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in @@ -11,7 +11,11 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg +# We only build the multiprocessing support if HAS_MP was defined +MP_SUPPORT_yes_V = shmsupp +MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include startup clock console timer shmsupp wrapup +SUB_DIRS=include startup clock console timer $(MP_SUPPORT) wrapup diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in index 1a32c77d85..18fdec1e6a 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in @@ -15,6 +15,10 @@ SRCS=README all: $(SRCS) +# We only build the multiprocessing support if HAS_MP was defined +MP_SUPPORT_yes_V = shmsupp +MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include startup clock console shmsupp timer wrapup +SUB_DIRS=include startup clock console $(MP_SUPPORT) timer wrapup diff --git a/c/src/lib/libbsp/unix/posix/Makefile.in b/c/src/lib/libbsp/unix/posix/Makefile.in index 856f926a51..72a3f29766 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/Makefile.in @@ -13,14 +13,12 @@ include $(RTEMS_ROOT)/make/directory.cfg SRCS=README -# MP_PARTS are the pieces of the BSP required in a MP environment -# We only build them if HAS_MP was defined - -MP_PARTS_yes_V = shmsupp -MP_PARTS = $(MP_PARTS_$(HAS_MP)_V) +# We only build the multiprocessing support if HAS_MP was defined +MP_SUPPORT_yes_V = shmsupp +MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include startup clock console timer $(MP_PARTS) wrapup tools +SUB_DIRS=include startup clock console timer $(MP_SUPPORT) wrapup tools diff --git a/c/src/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in index 1ed5d13cb1..62fac8b2e7 100644 --- a/c/src/lib/libmisc/monitor/Makefile.in +++ b/c/src/lib/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/lib/libmisc/monitor/mon-object.c b/c/src/lib/libmisc/monitor/mon-object.c index 8d5a9c395f..8112372d86 100644 --- a/c/src/lib/libmisc/monitor/mon-object.c +++ b/c/src/lib/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/lib/libmisc/monitor/monitor.h b/c/src/lib/libmisc/monitor/monitor.h index 16efd7c41f..a9584808f3 100644 --- a/c/src/lib/libmisc/monitor/monitor.h +++ b/c/src/lib/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 *); |