summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/sapi/include/confdefs.h32
2 files changed, 23 insertions, 14 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d27dc1e425..537130b340 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2007-06-20 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * sapi/include/confdefs.h: Do not instantiate initialization
+ thas/thread pointer tables for an API that is not configured.
+
+2007-06-20 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* libcsupport/Makefile.am:
* libcsupport/src/open_dev_console.c: New file.
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 663bf4c048..bde070772c 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -1219,13 +1219,15 @@ rtems_configuration_table Configuration = {
* If the user has configured a set of POSIX Initialization Threads,
* then we need to install the code that runs that loop.
*/
-#ifdef CONFIGURE_INIT
- #ifdef CONFIGURE_POSIX_INIT_THREAD_TABLE
- void _POSIX_Threads_Initialize_user_threads_body(void);
- void (*_POSIX_Threads_Initialize_user_threads_p)(void) =
- _POSIX_Threads_Initialize_user_threads_body;
- #else
- void (*_POSIX_Threads_Initialize_user_threads_p)(void) = NULL;
+#ifdef RTEMS_POSIX_API
+ #ifdef CONFIGURE_INIT
+ #ifdef CONFIGURE_POSIX_INIT_THREAD_TABLE
+ void _POSIX_Threads_Initialize_user_threads_body(void);
+ void (*_POSIX_Threads_Initialize_user_threads_p)(void) =
+ _POSIX_Threads_Initialize_user_threads_body;
+ #else
+ void (*_POSIX_Threads_Initialize_user_threads_p)(void) = NULL;
+ #endif
#endif
#endif
@@ -1233,13 +1235,15 @@ rtems_configuration_table Configuration = {
* If the user has configured a set of ITRON Initialization Tasks,
* then we need to install the code that runs that loop.
*/
-#ifdef CONFIGURE_INIT
- #ifdef CONFIGURE_ITRON_INIT_TASK_TABLE
- void _ITRON_Task_Initialize_user_tasks_body(void);
- void (*_ITRON_Initialize_user_tasks_p)(void) =
- _ITRON_Task_Initialize_user_tasks_body;
- #else
- void (*_ITRON_Initialize_user_tasks_p)(void) = NULL;
+#ifdef RTEMS_ITRON_API
+ #ifdef CONFIGURE_INIT
+ #ifdef CONFIGURE_ITRON_INIT_TASK_TABLE
+ void _ITRON_Task_Initialize_user_tasks_body(void);
+ void (*_ITRON_Initialize_user_tasks_p)(void) =
+ _ITRON_Task_Initialize_user_tasks_body;
+ #else
+ void (*_ITRON_Initialize_user_tasks_p)(void) = NULL;
+ #endif
#endif
#endif