diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-11-06 13:04:11 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-11-07 07:52:55 +0100 |
| commit | d1f7204649ff7c8bed36eab5af20c1a108af8b14 (patch) | |
| tree | d61f8e715001e2e7538186c142f0c3d04a6fe1f8 /cpukit/include/rtems/confdefs.h | |
| parent | spconfig02: Check object methods in default config (diff) | |
| download | rtems-d1f7204649ff7c8bed36eab5af20c1a108af8b14.tar.bz2 | |
config: Fix CONFIGURE_DISABLE_NEWLIB_REENTRANCY
Move the __getreent() variant using the global reentrancy structure to
librtemscpu.a. This avoids a definition of __getreent() in the
configuration module if CONFIGURE_DISABLE_NEWLIB_REENTRANCY is defined.
This avoids all the dependencies which would be exposed by a reference
to the global reentrancy structure.
This change is only possible since the default configuration moved to
librtemsdefaultconfig.a recently.
Diffstat (limited to 'cpukit/include/rtems/confdefs.h')
| -rw-r--r-- | cpukit/include/rtems/confdefs.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 64577b92d7..15d0947ea3 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -2242,15 +2242,11 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #define _CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS 0 #endif -#if defined(RTEMS_NEWLIB) - struct _reent *__getreent(void) - { - #ifdef CONFIGURE_DISABLE_NEWLIB_REENTRANCY - return _GLOBAL_REENT; - #else - return _Thread_Get_executing()->libc_reent; - #endif - } +#if defined(RTEMS_NEWLIB) && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY) +struct _reent *__getreent(void) +{ + return _Thread_Get_executing()->libc_reent; +} #endif #endif |