diff options
Diffstat (limited to 'cpukit/include/rtems/confdefs.h')
-rw-r--r-- | cpukit/include/rtems/confdefs.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index f4cbe43908..0e5038cf92 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -56,15 +56,12 @@ #include <rtems/confdefs/libpci.h> #include <rtems/confdefs/malloc.h> #include <rtems/confdefs/mpci.h> +#include <rtems/confdefs/newlib.h> #include <rtems/confdefs/percpu.h> #include <rtems/confdefs/scheduler.h> #include <limits.h> -#ifdef RTEMS_NEWLIB - #include <sys/reent.h> -#endif - #ifdef __cplusplus extern "C" { #endif @@ -99,14 +96,6 @@ extern "C" { */ /** - * This macro determines whether the RTEMS reentrancy support for - * the Newlib C Library is enabled. - */ -#ifdef RTEMS_SCHEDSIM - #undef RTEMS_NEWLIB -#endif - -/** * @defgroup ConfigurationHelpers Configuration Helpers * * @ingroup Configuration @@ -645,13 +634,6 @@ extern "C" { ); #endif -#if defined(RTEMS_NEWLIB) && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY) -struct _reent *__getreent(void) -{ - return _Thread_Get_executing()->libc_reent; -} -#endif - #endif /** @@ -1005,9 +987,7 @@ struct _reent *__getreent(void) #if CONFIGURE_MAXIMUM_THREAD_NAME_SIZE > 1 char name[ CONFIGURE_MAXIMUM_THREAD_NAME_SIZE ]; #endif - #if !defined(RTEMS_SCHEDSIM) \ - && defined(RTEMS_NEWLIB) \ - && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY) + #ifdef _CONFIGURE_ENABLE_NEWLIB_REENTRANCY struct _reent Newlib; #else struct { /* Empty */ } Newlib; |