From ba74ebde7461b28bf0261523d4e91e7c0e17b622 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 14 Feb 2020 19:09:56 +0100 Subject: libio: Add POSIX user environment pointer to TCB The IO library used a POSIX key to store an optional POSIX user environment pointer. This pulled in the POSIX keys support in every application configuration. Add a user environment pointer to the thread control block (TCB) instead. Applications which do not need the POSIX user environment will just get an overhead of one pointer per thread. Close #3882. --- cpukit/include/rtems/confdefs.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'cpukit/include/rtems/confdefs.h') diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 3741c9a706..0191392cfc 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -139,11 +139,6 @@ extern "C" { #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 3 #endif -/* - * POSIX key count used by the IO library. - */ -#define _CONFIGURE_LIBIO_POSIX_KEYS 1 - #ifdef CONFIGURE_INIT rtems_libio_t rtems_libio_iops[CONFIGURE_MAXIMUM_FILE_DESCRIPTORS]; @@ -2073,14 +2068,6 @@ struct _reent *__getreent(void) (CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_TASKS)) #endif -/* - * This macro is calculated to specify the total number of - * POSIX API keys required by the application and configured - * system capabilities. - */ -#define _CONFIGURE_POSIX_KEYS \ - (CONFIGURE_MAXIMUM_POSIX_KEYS + _CONFIGURE_LIBIO_POSIX_KEYS) - /** * This configuration parameter specifies the maximum number of * POSIX API threads. @@ -2550,8 +2537,8 @@ struct _reent *__getreent(void) CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS; #endif - #if _CONFIGURE_POSIX_KEYS > 0 - POSIX_KEYS_INFORMATION_DEFINE( _CONFIGURE_POSIX_KEYS ); + #if CONFIGURE_MAXIMUM_POSIX_KEYS > 0 + POSIX_KEYS_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_POSIX_KEYS ); #endif #if CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES > 0 -- cgit v1.2.3