diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-17 11:44:55 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-17 13:09:49 +0200 |
| commit | 9c9b62d8ddc9d61abad5106b819bb3ca9912d572 (patch) | |
| tree | 1d1fb30e471d55ee053b6d98f31b6dde500bc374 /cpukit/score | |
| parent | score: Add _Thread_Get_executing() (diff) | |
| download | rtems-9c9b62d8ddc9d61abad5106b819bb3ca9912d572.tar.bz2 | |
score: Changes due to Newlib __DYNAMIC_REENT__
Delete _Thread_libc_reent and add __getreent() instead according to
__DYNAMIC_REENT__ define.
For SMP configurations __DYNAMIC_REENT__ must be defined.
A Newlib including the following patch is required:
2013-07-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libc/include/sys/config.h (__DYNAMIC_REENT__): Define for RTEMS.
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/include/rtems/score/thread.h | 3 | ||||
| -rw-r--r-- | cpukit/score/inline/rtems/score/thread.inl | 2 | ||||
| -rw-r--r-- | cpukit/score/src/threaddispatch.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index 5e8bc950a7..9ce8ad1fd1 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -499,6 +499,7 @@ SCORE_EXTERN uint32_t _Thread_Ticks_per_timeslice; SCORE_EXTERN Thread_Control *_Thread_Allocated_fp; #endif +#if !defined(__DYNAMIC_REENT__) /** * The C library re-enter-rant global pointer. Some C library implementations * such as newlib have a single global pointer that changed during a context @@ -506,6 +507,8 @@ SCORE_EXTERN Thread_Control *_Thread_Allocated_fp; * holds a pointer to the task specific data. */ SCORE_EXTERN struct _reent **_Thread_libc_reent; +#endif + /** * @brief Initialize thread handler. * diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl index 4576dea79e..88438d66bc 100644 --- a/cpukit/score/inline/rtems/score/thread.inl +++ b/cpukit/score/inline/rtems/score/thread.inl @@ -248,6 +248,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Dispatch_if_necessary( } } +#if !defined(__DYNAMIC_REENT__) /** * This routine returns the C library re-enterant pointer. */ @@ -267,6 +268,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Set_libc_reent ( { _Thread_libc_reent = libc_reent; } +#endif /** @}*/ diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index 4cd449d55b..adce3a18d3 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -143,6 +143,7 @@ void _Thread_Dispatch( void ) } #endif +#if !defined(__DYNAMIC_REENT__) /* * Switch libc's task specific data. */ @@ -150,6 +151,7 @@ void _Thread_Dispatch( void ) executing->libc_reent = *_Thread_libc_reent; *_Thread_libc_reent = heir->libc_reent; } +#endif _User_extensions_Thread_switch( executing, heir ); |