diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:04:43 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:07:46 +0200 |
| commit | 081c7aeb4d4de82ab615db565c60dd776a385c34 (patch) | |
| tree | 2730963b4c865851b0a17d65d03ba7131245785f /sysdeps/mach/hurd/pt-sysdep.h | |
| parent | 75f6fe21205a87d1942492cb34e8aab482008a78 (diff) | |
| parent | 577976c386d89696ec392fdfbb77ea153ddd6588 (diff) | |
Merge branch 'tls'
Conflicts:
ChangeLog
Makefile
pthread/pt-exit.c
pthread/pt-internal.h
sysdeps/mach/hurd/ia32/pt-setup.c
sysdeps/mach/hurd/pt-docancel.c
sysdeps/mach/hurd/pt-sysdep.h
Diffstat (limited to 'sysdeps/mach/hurd/pt-sysdep.h')
| -rw-r--r-- | sysdeps/mach/hurd/pt-sysdep.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/pt-sysdep.h b/sysdeps/mach/hurd/pt-sysdep.h index f14a136..13e235d 100644 --- a/sysdeps/mach/hurd/pt-sysdep.h +++ b/sysdeps/mach/hurd/pt-sysdep.h @@ -1,5 +1,5 @@ /* Internal defenitions for pthreads library. - Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -60,11 +60,13 @@ __pthread_stack_dealloc (void *stackaddr, size_t stacksize) __vm_deallocate (__mach_task_self (), (vm_offset_t) stackaddr, stacksize); } -/* Change thread THREAD's program counter to PC if SET_PC is true and - its stack pointer to SP if SET_IP is true. */ -extern int __thread_set_pcsp (thread_t thread, +/* Change thread THREAD's program counter to PC if SET_PC is true, + its stack pointer to SP if SET_IP is true, and its thread pointer + to TP if SET_TP is true. */ +extern int __thread_set_pcsptp (thread_t thread, int set_pc, void *pc, - int set_sp, void *sp); + int set_sp, void *sp, + int set_tp, void *tp); #endif /* pt-sysdep.h */ |