2011-05-11 Jennifer Averett <Jennifer.Averett@OARcorp.com>

* score/Makefile.am, score/preinstall.am,
	score/include/rtems/score/percpu.h, score/src/percpu.c,
	score/src/threadcreateidle.c: Modifications to restrict compilation
	of SMP only code to when SMP is enabled. Entire SMP specific files
	are disabled via Makefile.am.
This commit is contained in:
Jennifer Averett
2011-05-11 14:22:35 +00:00
parent f3ea49920f
commit 42bb344e49
6 changed files with 29 additions and 5 deletions
+8
View File
@@ -1,3 +1,11 @@
2011-05-11 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* score/Makefile.am, score/preinstall.am,
score/include/rtems/score/percpu.h, score/src/percpu.c,
score/src/threadcreateidle.c: Modifications to restrict compilation
of SMP only code to when SMP is enabled. Entire SMP specific files
are disabled via Makefile.am.
2011-05-11 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libblock/include/rtems/bdbuf.h: Documentation.
+8 -1
View File
@@ -36,8 +36,13 @@ include_rtems_score_HEADERS = include/rtems/score/address.h \
include/rtems/score/timestamp64.h include/rtems/score/tod.h \
include/rtems/score/tqdata.h include/rtems/score/userext.h \
include/rtems/score/watchdog.h include/rtems/score/wkspace.h \
include/rtems/score/cpuopts.h include/rtems/score/basedefs.h \
include/rtems/score/cpuopts.h include/rtems/score/basedefs.h
if HAS_SMP
include_rtems_score_HEADERS += \
include/rtems/score/smplock.h include/rtems/score/smp.h
endif
if HAS_PTHREADS
include_rtems_score_HEADERS += include/rtems/score/corespinlock.h \
@@ -91,7 +96,9 @@ if HAS_MP
libscore_a_SOURCES += src/mpci.c src/objectmp.c src/threadmp.c
endif
if HAS_SMP
libscore_a_SOURCES += src/smp.c src/smplock.c
endif
## CORE_APIMUTEX_C_FILES
libscore_a_SOURCES += src/apimutex.c src/apimutexallocate.c \
@@ -27,6 +27,11 @@
#if defined(RTEMS_SMP)
#include <rtems/score/smplock.h>
#endif
/*
* NOTE: This file MUST be included on non-smp systems as well
* in order to define bsp_smp_processor_id.
*/
#include <rtems/bspsmp.h>
#endif
+2 -1
View File
@@ -195,6 +195,7 @@ $(PROJECT_INCLUDE)/rtems/score/basedefs.h: include/rtems/score/basedefs.h $(PROJ
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/basedefs.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h
if HAS_SMP
$(PROJECT_INCLUDE)/rtems/score/smplock.h: include/rtems/score/smplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplock.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplock.h
@@ -202,7 +203,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplock.h
$(PROJECT_INCLUDE)/rtems/score/smp.h: include/rtems/score/smp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smp.h
endif
if HAS_PTHREADS
$(PROJECT_INCLUDE)/rtems/score/corespinlock.h: include/rtems/score/corespinlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.h
+3 -2
View File
@@ -17,12 +17,13 @@
#include <rtems/score/thread.h>
#include <rtems/score/percpu.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/wkspace.h>
#include <rtems/config.h>
#include <rtems/score/smp.h>
#include <string.h>
#if defined(RTEMS_SMP)
#include <rtems/score/smp.h>
void _SMP_Handler_initialize(void)
{
int cpu;
+3 -1
View File
@@ -30,7 +30,9 @@
#include <rtems/score/userext.h>
#include <rtems/score/wkspace.h>
#include <rtems/config.h>
#include <rtems/score/smp.h>
#if defined(RTEMS_SMP)
#include <rtems/score/smp.h>
#endif
static inline void _Thread_Create_idle_helper(
uint32_t name_u32,