diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/exec/score/cpu/configure.in | 5 | ||||
-rw-r--r-- | c/src/exec/score/cpu/unix/cpu.c | 9 | ||||
-rw-r--r-- | c/src/exec/score/cpu/unix/rtems/score/cpu.h | 3 | ||||
-rw-r--r-- | cpukit/score/cpu/unix/cpu.c | 9 | ||||
-rw-r--r-- | cpukit/score/cpu/unix/rtems/score/cpu.h | 3 |
5 files changed, 26 insertions, 3 deletions
diff --git a/c/src/exec/score/cpu/configure.in b/c/src/exec/score/cpu/configure.in index dc468089ae..5a83394fba 100644 --- a/c/src/exec/score/cpu/configure.in +++ b/c/src/exec/score/cpu/configure.in @@ -38,7 +38,10 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_POSIX_API(RTEMS_BSP) RTEMS_CHECK_ITRON_API(RTEMS_BSP) -RTEMS_CHECK_SYSV_UNIX +# The only use of System V IPC is the UNIX port when multiprocessing. +if test "$HAS_MP" = "yes"; then + RTEMS_CHECK_SYSV_UNIX +fi # find all the Executive Makefiles RTEMS_CHECK_MAKEFILE($RTEMS_CPU) diff --git a/c/src/exec/score/cpu/unix/cpu.c b/c/src/exec/score/cpu/unix/cpu.c index d29bb03963..7f9f9c8047 100644 --- a/c/src/exec/score/cpu/unix/cpu.c +++ b/c/src/exec/score/cpu/unix/cpu.c @@ -29,9 +29,11 @@ #include <sys/time.h> #include <errno.h> #include <unistd.h> +#if defined(RTEMS_MULTIPROCESSING) #include <sys/ipc.h> #include <sys/shm.h> #include <sys/sem.h> +#endif #include <string.h> /* memset */ #ifndef SA_RESTART @@ -922,8 +924,10 @@ void _CPU_Stop_clock( void ) setitimer(ITIMER_REAL, &new, 0); } +extern void fix_syscall_errno( void ); + +#if defined(RTEMS_MULTIPROCESSING) int _CPU_SHM_Semid; -extern void fix_syscall_errno( void ); void _CPU_SHM_Init( unsigned32 maximum_nodes, @@ -1015,12 +1019,14 @@ void _CPU_SHM_Init( *shm_length = shm_size; } +#endif int _CPU_Get_pid( void ) { return getpid(); } +#if defined(RTEMS_MULTIPROCESSING) /* * Define this to use signals for MPCI shared memory driver. * If undefined, the shared memory driver will poll from the @@ -1108,3 +1114,4 @@ void _CPU_SHM_Unlock( } } +#endif diff --git a/c/src/exec/score/cpu/unix/rtems/score/cpu.h b/c/src/exec/score/cpu/unix/rtems/score/cpu.h index 96c7522b53..75eb07af74 100644 --- a/c/src/exec/score/cpu/unix/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/unix/rtems/score/cpu.h @@ -1061,6 +1061,8 @@ void _CPU_Start_clock( void _CPU_Stop_clock( void ); +#if defined(RTEMS_MULTIPROCESSING) + void _CPU_SHM_Init( unsigned32 maximum_nodes, boolean is_master_node, @@ -1084,6 +1086,7 @@ void _CPU_SHM_Lock( void _CPU_SHM_Unlock( int semaphore ); +#endif #ifdef __cplusplus } diff --git a/cpukit/score/cpu/unix/cpu.c b/cpukit/score/cpu/unix/cpu.c index d29bb03963..7f9f9c8047 100644 --- a/cpukit/score/cpu/unix/cpu.c +++ b/cpukit/score/cpu/unix/cpu.c @@ -29,9 +29,11 @@ #include <sys/time.h> #include <errno.h> #include <unistd.h> +#if defined(RTEMS_MULTIPROCESSING) #include <sys/ipc.h> #include <sys/shm.h> #include <sys/sem.h> +#endif #include <string.h> /* memset */ #ifndef SA_RESTART @@ -922,8 +924,10 @@ void _CPU_Stop_clock( void ) setitimer(ITIMER_REAL, &new, 0); } +extern void fix_syscall_errno( void ); + +#if defined(RTEMS_MULTIPROCESSING) int _CPU_SHM_Semid; -extern void fix_syscall_errno( void ); void _CPU_SHM_Init( unsigned32 maximum_nodes, @@ -1015,12 +1019,14 @@ void _CPU_SHM_Init( *shm_length = shm_size; } +#endif int _CPU_Get_pid( void ) { return getpid(); } +#if defined(RTEMS_MULTIPROCESSING) /* * Define this to use signals for MPCI shared memory driver. * If undefined, the shared memory driver will poll from the @@ -1108,3 +1114,4 @@ void _CPU_SHM_Unlock( } } +#endif diff --git a/cpukit/score/cpu/unix/rtems/score/cpu.h b/cpukit/score/cpu/unix/rtems/score/cpu.h index 96c7522b53..75eb07af74 100644 --- a/cpukit/score/cpu/unix/rtems/score/cpu.h +++ b/cpukit/score/cpu/unix/rtems/score/cpu.h @@ -1061,6 +1061,8 @@ void _CPU_Start_clock( void _CPU_Stop_clock( void ); +#if defined(RTEMS_MULTIPROCESSING) + void _CPU_SHM_Init( unsigned32 maximum_nodes, boolean is_master_node, @@ -1084,6 +1086,7 @@ void _CPU_SHM_Lock( void _CPU_SHM_Unlock( int semaphore ); +#endif #ifdef __cplusplus } |