OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* config/vxlib.c (tls_delete_hook): Use TCB for kernel tasks. 

From-SVN: r123086
This commit is contained in:
Nathan Sidwell 2007-03-20 14:13:30 +00:00 committed by Nathan Sidwell
parent 2b31200511
commit caaf5345bb
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,3 +1,7 @@
2007-03-20 Nathan Sidwell <nathan@codesourcery.com>
* config/vxlib.c (tls_delete_hook): Use TCB for kernel tasks.
2007-03-19 Andrew Haley <aph@redhat.com> 2007-03-19 Andrew Haley <aph@redhat.com>
PR tree-optimization/31264 PR tree-optimization/31264

16
gcc/config/vxlib-tls.c
View File

@ -155,9 +155,18 @@ static __gthread_once_t tls_init_guard = __GTHREAD_ONCE_INIT;
static void static void
tls_delete_hook (void *tcb ATTRIBUTE_UNUSED) tls_delete_hook (void *tcb ATTRIBUTE_UNUSED)
{ {
struct tls_data *data = __gthread_get_tls_data (); struct tls_data *data;
__gthread_key_t key; __gthread_key_t key;
#ifdef __RTP__
data = __gthread_get_tls_data ();
#else
/* In kernel mode, we can be called in the context of the thread
doing the killing, so must use the TCB to determine the data of
the thread being killed. */
data = __gthread_get_tsd_data (tcb);
#endif
if (data && data->owner == &self_owner) if (data && data->owner == &self_owner)
{ {
__gthread_enter_tls_dtor_context (); __gthread_enter_tls_dtor_context ();
@ -182,8 +191,11 @@ tls_delete_hook (void *tcb ATTRIBUTE_UNUSED)
taskDeleteHookDelete ((FUNCPTR)tls_delete_hook); taskDeleteHookDelete ((FUNCPTR)tls_delete_hook);
__gthread_mutex_unlock (&tls_lock); __gthread_mutex_unlock (&tls_lock);
} }
#ifdef __RTP__
__gthread_set_tls_data (0); __gthread_set_tls_data (0);
#else
__gthread_set_tsd_data (tcb, 0);
#endif
__gthread_leave_tls_dtor_context (); __gthread_leave_tls_dtor_context ();
} }
} }