From 97e2729d1a3432b9792b82ce88ce6d804a104f7a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 23 Nov 1998 17:38:09 +0000 Subject: Added --disable-multiprocessing flag and modified a lot of files to make it work. --- c/src/exec/score/headers/Makefile.in | 8 ++++++-- c/src/exec/score/headers/object.h | 2 ++ c/src/exec/score/headers/thread.h | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'c/src/exec/score/headers') diff --git a/c/src/exec/score/headers/Makefile.in b/c/src/exec/score/headers/Makefile.in index 920e738c03..792ca73fce 100644 --- a/c/src/exec/score/headers/Makefile.in +++ b/c/src/exec/score/headers/Makefile.in @@ -8,10 +8,14 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +# We only build multiprocessing related files if HAS_MP was defined +MP_PIECES_yes_V = mpci mppkt objectmp threadmp +MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) + # H_FILES that get installed in the rtems/score subdirectoy H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \ - coresem heap interr isr mpci mppkt object objectmp \ - priority stack states sysstate thread threadmp threadq \ + coresem heap interr isr object \ + priority stack states sysstate thread threadq \ tod tqdata userext watchdog wkspace H_FILES=$(H_PIECES:%=$(srcdir)/%.h) diff --git a/c/src/exec/score/headers/object.h b/c/src/exec/score/headers/object.h index 0198731b96..a0bf3707b6 100644 --- a/c/src/exec/score/headers/object.h +++ b/c/src/exec/score/headers/object.h @@ -387,7 +387,9 @@ Objects_Information *_Objects_Get_information( */ #include +#if defined(RTEMS_MULTIPROCESSING) #include +#endif #ifdef __cplusplus } diff --git a/c/src/exec/score/headers/thread.h b/c/src/exec/score/headers/thread.h index 7fc3361c39..574d0493d2 100644 --- a/c/src/exec/score/headers/thread.h +++ b/c/src/exec/score/headers/thread.h @@ -23,7 +23,9 @@ extern "C" { #include #include +#if defined(RTEMS_MULTIPROCESSING) #include +#endif #include #include #include @@ -141,7 +143,9 @@ typedef struct { unsigned32 resource_count; Thread_Wait_information Wait; Watchdog_Control Timer; +#if defined(RTEMS_MULTIPROCESSING) MP_packet_Prefix *receive_packet; +#endif /****************** end of common block ********************/ Chain_Node Active; } Thread_Proxy_control; @@ -171,7 +175,9 @@ struct Thread_Control_struct { unsigned32 resource_count; Thread_Wait_information Wait; Watchdog_Control Timer; +#if defined(RTEMS_MULTIPROCESSING) MP_packet_Prefix *receive_packet; +#endif /****************** end of common block ********************/ boolean is_global; boolean do_post_task_switch_extension; @@ -619,7 +625,9 @@ Thread _Thread_Idle_body( #ifndef __RTEMS_APPLICATION__ #include #endif +#if defined(RTEMS_MULTIPROCESSING) #include +#endif #ifdef __cplusplus } -- cgit v1.2.3