diff options
| author | Robert Mason <rbmj@verizon.net> | 2013-03-26 22:06:27 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <mkuvyrkov@gcc.gnu.org> | 2013-03-26 22:06:27 +0000 |
| commit | a7432b00cd4b2c792f258239764b76e4fc98b8b2 (patch) | |
| tree | b0c3d3797f0111d3932a6a9d5e2c853a98e54832 /libgcc | |
| parent | a6228a71b1a18663c83619db10684cc9ca805a72 (diff) | |
| download | gcc-a7432b00cd4b2c792f258239764b76e4fc98b8b2.tar.gz | |
re PR target/54805 (__gthread* on VxWorks)
2013-03-26 Robert Mason <rbmj@verizon.net>
PR target/54805
Backport from mainline:
2013-03-20 Robert Mason <rbmj@verizon.net>
* config/vxlib-tls.c (__gthread_get_tsd_data,)
(__gthread_set_tsd_data, __gthread_enter_tsd_dtor_context,)
(__gthread_leave_tsd_dtor_context): Add prototypes.
(tls_delete_hook): Update.
From-SVN: r197123
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 12 | ||||
| -rw-r--r-- | libgcc/config/vxlib-tls.c | 10 |
2 files changed, 21 insertions, 1 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 86dcc99a7af..00ec5f23007 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,15 @@ +2013-03-26 Robert Mason <rbmj@verizon.net> + + PR target/54805 + + Backport from mainline: + 2013-03-20 Robert Mason <rbmj@verizon.net> + + * config/vxlib-tls.c (__gthread_get_tsd_data,) + (__gthread_set_tsd_data, __gthread_enter_tsd_dtor_context,) + (__gthread_leave_tsd_dtor_context): Add prototypes. + (tls_delete_hook): Update. + 2013-03-26 Walter Lee <walt@tilera.com> Backport from mainline: diff --git a/libgcc/config/vxlib-tls.c b/libgcc/config/vxlib-tls.c index 8f88c6f2ab4..5c696034b37 100644 --- a/libgcc/config/vxlib-tls.c +++ b/libgcc/config/vxlib-tls.c @@ -102,6 +102,14 @@ extern void __gthread_set_tls_data (void *data); extern void __gthread_enter_tls_dtor_context (void); extern void __gthread_leave_tls_dtor_context (void); +#ifndef __RTP__ + +extern void *__gthread_get_tsd_data (WIND_TCB *tcb); +extern void __gthread_set_tsd_data (WIND_TCB *tcb, void *data); +extern void __gthread_enter_tsd_dtor_context (WIND_TCB *tcb); +extern void __gthread_leave_tsd_dtor_context (WIND_TCB *tcb); + +#endif /* __RTP__ */ /* This is a global structure which records all of the active keys. @@ -185,7 +193,7 @@ tls_delete_hook (void *tcb ATTRIBUTE_UNUSED) #ifdef __RTP__ __gthread_leave_tls_dtor_context (); #else - __gthread_leave_tsd_dtor_context (); + __gthread_leave_tsd_dtor_context (tcb); #endif #ifdef __RTP__ |