From ff3ce0b5bb6061a4b72d281e09042502fafc21f5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 3 Sep 2007 23:03:56 +0000 Subject: * debian/patches/patches/libpthread_tls.patch: New patch, replaces debian/patches/libpthread_tls_transitional.patch. * debian/patches/libpthread_inline.patch: New patch to fix extern inlines with gcc 4.3. --- debian/changelog | 4 + debian/control | 2 +- debian/patches/libpthread_inline.patch | 142 ++++++++ debian/patches/libpthread_tls.patch | 360 ++++++++++++++++++++ debian/patches/libpthread_tls_transitional.patch | 410 ----------------------- 5 files changed, 507 insertions(+), 411 deletions(-) create mode 100644 debian/patches/libpthread_inline.patch create mode 100644 debian/patches/libpthread_tls.patch delete mode 100644 debian/patches/libpthread_tls_transitional.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b18b075c..66e1edd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ hurd (20070606-4) UNRELEASED; urgency=low [ Samuel Thibault ] * debian/local/soundcard.h: Add _PATCHKEY definition. + * debian/patches/patches/libpthread_tls.patch: New patch, replaces + debian/patches/libpthread_tls_transitional.patch. + * debian/patches/libpthread_inline.patch: New patch to fix extern inlines + with gcc 4.3. -- Michael Banck Thu, 16 Aug 2007 16:55:53 +0200 diff --git a/debian/control b/debian/control index 9fbe1607..f7806b54 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: base Priority: required Maintainer: GNU Hurd Maintainers Standards-Version: 3.6.1.0 -Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526-1), libc0.3-dev (>= 2.5-5), texinfo, texi2html, libncursesw5-dev, cdbs, debhelper (>= 4.2.0) +Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526-1), libc0.3-dev (>= 2.6-3), texinfo, texi2html, libncursesw5-dev, cdbs, debhelper (>= 4.2.0) Uploaders: Jeff Bailey , Marcus Brinkmann , Neal H. Walfield , Michael Banck Package: hurd diff --git a/debian/patches/libpthread_inline.patch b/debian/patches/libpthread_inline.patch new file mode 100644 index 00000000..a2c62e22 --- /dev/null +++ b/debian/patches/libpthread_inline.patch @@ -0,0 +1,142 @@ +Index: libpthread/include/pthread/pthread.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/include/pthread/pthread.h,v +retrieving revision 1.9 +diff -u -p -r1.9 pthread.h +--- libpthread/include/pthread/pthread.h 24 Jun 2007 15:11:52 -0000 1.9 ++++ libpthread/include/pthread/pthread.h 3 Sep 2007 22:21:52 -0000 +@@ -454,31 +454,31 @@ extern int pthread_spin_unlock (pthread_ + + # ifdef __USE_EXTERN_INLINES + +-extern __inline int ++__extern_inline int + pthread_spin_destroy (pthread_spinlock_t *__lock) + { + return __pthread_spin_destroy (__lock); + } + +-extern __inline int ++__extern_inline int + pthread_spin_init (pthread_spinlock_t *__lock, int __pshared) + { + return __pthread_spin_init (__lock, __pshared); + } + +-extern __inline int ++__extern_inline int + pthread_spin_lock (pthread_spinlock_t *__lock) + { + return __pthread_spin_lock (__lock); + } + +-extern __inline int ++__extern_inline int + pthread_spin_trylock (pthread_spinlock_t *__lock) + { + return __pthread_spin_trylock (__lock); + } + +-extern __inline int ++__extern_inline int + pthread_spin_unlock (pthread_spinlock_t *__lock) + { + return __pthread_spin_unlock (__lock); +Index: libpthread/sysdeps/generic/bits/pthread.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/bits/pthread.h,v +retrieving revision 1.2 +diff -u -p -r1.2 pthread.h +--- libpthread/sysdeps/generic/bits/pthread.h 18 Jan 2005 09:57:35 -0000 1.2 ++++ libpthread/sysdeps/generic/bits/pthread.h 3 Sep 2007 22:21:52 -0000 +@@ -24,10 +24,15 @@ typedef int pthread_t; + + /* Return true if __T1 and __T2 both name the same thread. Otherwise, + false. */ +-extern __inline int ++extern int ++pthread_equal (pthread_t __t1, pthread_t __t2); ++ ++#ifdef __USE_EXTERN_INLINES ++__extern_inline int + pthread_equal (pthread_t __t1, pthread_t __t2) + { + return __t1 == __t2; + } ++#endif + + #endif /* bits/pthread.h */ +Index: libpthread/sysdeps/i386/bits/memory.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/i386/bits/memory.h,v +retrieving revision 1.1 +diff -u -p -r1.1 memory.h +--- libpthread/sysdeps/i386/bits/memory.h 10 Oct 2002 23:05:05 -0000 1.1 ++++ libpthread/sysdeps/i386/bits/memory.h 3 Sep 2007 22:21:52 -0000 +@@ -21,7 +21,7 @@ + #define _BITS_MEMORY_H 1 + + /* Prevent read and write reordering across this function. */ +-inline void ++static inline void + __memory_barrier (void) + { + int i; +Index: libpthread/sysdeps/i386/bits/spin-lock.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/i386/bits/spin-lock.h,v +retrieving revision 1.3 +diff -u -p -r1.3 spin-lock.h +--- libpthread/sysdeps/i386/bits/spin-lock.h 12 May 2005 20:55:37 -0000 1.3 ++++ libpthread/sysdeps/i386/bits/spin-lock.h 3 Sep 2007 22:21:52 -0000 +@@ -42,7 +42,7 @@ typedef __volatile int __pthread_spinloc + # endif + + # ifndef __PT_SPIN_INLINE +-# define __PT_SPIN_INLINE extern __inline ++# define __PT_SPIN_INLINE __extern_inline + # endif + + __PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock); +@@ -74,10 +74,10 @@ __pthread_spin_trylock (__pthread_spinlo + return __locked ? __EBUSY : 0; + } + +-extern __inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); ++__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); + extern int _pthread_spin_lock (__pthread_spinlock_t *__lock); + +-extern __inline int ++__extern_inline int + __pthread_spin_lock (__pthread_spinlock_t *__lock) + { + if (__pthread_spin_trylock (__lock)) +Index: libpthread/sysdeps/mach/bits/spin-lock.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/bits/spin-lock.h,v +retrieving revision 1.2 +diff -u -p -r1.2 spin-lock.h +--- libpthread/sysdeps/mach/bits/spin-lock.h 18 Jan 2005 09:57:34 -0000 1.2 ++++ libpthread/sysdeps/mach/bits/spin-lock.h 3 Sep 2007 22:21:52 -0000 +@@ -41,7 +41,7 @@ typedef __spin_lock_t __pthread_spinlock + # endif + + # ifndef __PT_SPIN_INLINE +-# define __PT_SPIN_INLINE extern __inline ++# define __PT_SPIN_INLINE __extern_inline + # endif + + __PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock); +@@ -70,10 +70,10 @@ __pthread_spin_trylock (__pthread_spinlo + return __spin_try_lock (__lock) ? 0 : __EBUSY; + } + +-extern __inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); ++__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); + extern int _pthread_spin_lock (__pthread_spinlock_t *__lock); + +-extern __inline int ++__extern_inline int + __pthread_spin_lock (__pthread_spinlock_t *__lock) + { + if (__pthread_spin_trylock (__lock)) diff --git a/debian/patches/libpthread_tls.patch b/debian/patches/libpthread_tls.patch new file mode 100644 index 00000000..8e01bb90 --- /dev/null +++ b/debian/patches/libpthread_tls.patch @@ -0,0 +1,360 @@ +Index: libpthread/pthread/pt-create.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-create.c,v +retrieving revision 1.4 +diff -u -p -r1.4 pt-create.c +--- libpthread/pthread/pt-create.c 4 May 2005 16:04:06 -0000 1.4 ++++ libpthread/pthread/pt-create.c 12 Aug 2007 11:34:11 -0000 +@@ -127,6 +127,11 @@ + if (err) + goto failed_thread_alloc; + ++ pthread->tcb = _dl_allocate_tls (NULL); ++ if (!pthread->tcb) ++ goto failed_thread_tls_alloc; ++ pthread->tcb->tcb = pthread->tcb; ++ + /* And initialize the rest of the machine context. This may include + additional machine- and system-specific initializations that + prove convenient. */ +@@ -192,6 +197,8 @@ + failed_sigstate: + __pthread_sigstate_destroy (pthread); + failed_setup: ++ _dl_deallocate_tls (pthread->tcb, 1); ++ failed_thread_tls_alloc: + __pthread_thread_dealloc (pthread); + __pthread_thread_halt (pthread, 0); + failed_thread_alloc: +Index: libpthread/pthread/pt-exit.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-exit.c,v +retrieving revision 1.2 +--- libpthread/pthread/pt-exit.c 4 May 2005 16:04:06 -0000 1.2 ++++ libpthread/pthread/pt-exit.c 12 Aug 2007 11:34:11 -0000 +@@ -70,6 +70,8 @@ + if (self->cancel_state == PTHREAD_CANCEL_ENABLE && self->cancel_pending) + status = PTHREAD_CANCELED; + ++ if (self->tcb) ++ _dl_deallocate_tls (self->tcb, 1); + __pthread_thread_dealloc (self); + + switch (self->state) +Index: libpthread/pthread/pt-internal.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-internal.h,v +retrieving revision 1.4 +diff -u -p -r1.4 pt-internal.h +--- libpthread/pthread/pt-internal.h 4 Mar 2007 00:05:21 -0000 1.4 ++++ libpthread/pthread/pt-internal.h 12 Aug 2007 11:34:11 -0000 +@@ -50,6 +50,14 @@ + # define PTHREAD_SYSDEP_MEMBERS + #endif + ++/* Type of the TCB. */ ++typedef struct ++{ ++ void *tcb; /* Points to this structure. */ ++ void *dtv; /* Vector of pointers to TLS data. */ ++ thread_t self; /* This thread's control port. */ ++} tcbhead_t; ++ + /* This structure describes a POSIX thread. */ + struct __pthread + { +@@ -85,6 +93,8 @@ + + PTHREAD_SYSDEP_MEMBERS + ++ tcbhead_t *tcb; ++ + struct __pthread *next, **prevp; + }; + +@@ -272,4 +282,13 @@ + /* Default condition attributes. */ + const struct __pthread_condattr __pthread_default_condattr; + ++ ++/* From glibc. */ ++ ++/* Dynamic linker TLS allocation. */ ++extern void *_dl_allocate_tls(void *); ++ ++/* Dynamic linker TLS deallocation. */ ++extern void _dl_deallocate_tls(void *, int); ++ + #endif /* pt-internal.h */ +Index: libpthread/sysdeps/mach/hurd/pt-docancel.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/pt-docancel.c,v +retrieving revision 1.2 +--- libpthread/sysdeps/mach/hurd/pt-docancel.c 18 Nov 2002 22:20:58 -0000 1.2 ++++ libpthread/sysdeps/mach/hurd/pt-docancel.c 12 Aug 2007 11:34:11 -0000 +@@ -52,8 +52,8 @@ + err = __thread_abort (p->kernel_thread); + assert_perror (err); + +- err = __thread_set_pcsp (p->kernel_thread, +- 1, (void *) call_exit, 0, 0); ++ err = __thread_set_pcsptp (p->kernel_thread, ++ 1, (void *) call_exit, 0, 0, 0, 0); + assert_perror (err); + + err = __thread_resume (p->kernel_thread); +Index: libpthread/sysdeps/mach/hurd/pt-sysdep.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/pt-sysdep.h,v +retrieving revision 1.3 +--- libpthread/sysdeps/mach/hurd/pt-sysdep.h 18 Jan 2005 10:08:52 -0000 1.3 ++++ libpthread/sysdeps/mach/hurd/pt-sysdep.h 12 Aug 2007 11:34:11 -0000 +@@ -59,11 +59,13 @@ + __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 */ +Index: libpthread/sysdeps/mach/hurd/i386/pt-machdep.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/i386/pt-machdep.c,v +retrieving revision 1.1 +--- libpthread/sysdeps/mach/hurd/i386/pt-machdep.c 10 Oct 2002 23:05:05 -0000 1.1 ++++ libpthread/sysdeps/mach/hurd/i386/pt-machdep.c 12 Aug 2007 11:34:11 -0000 +@@ -21,12 +21,28 @@ + + #include + #include ++#include ++#include + #include + ++#define HURD_TLS_DESC_DECL(desc, tcb) \ ++ struct descriptor desc = \ ++ { /* low word: */ \ ++ 0xffff /* limit 0..15 */ \ ++ | (((unsigned int) (tcb)) << 16) /* base 0..15 */ \ ++ , /* high word: */ \ ++ ((((unsigned int) (tcb)) >> 16) & 0xff) /* base 16..23 */ \ ++ | ((0x12 | 0x60 | 0x80) << 8) /* access = ACC_DATA_W|ACC_PL_U|ACC_P */ \ ++ | (0xf << 16) /* limit 16..19 */ \ ++ | ((4 | 8) << 20) /* granularity = SZ_32|SZ_G */ \ ++ | (((unsigned int) (tcb)) & 0xff000000) /* base 24..31 */ \ ++ } ++ + int +-__thread_set_pcsp (thread_t thread, ++__thread_set_pcsptp (thread_t thread, + int set_ip, void *ip, +- int set_sp, void *sp) ++ int set_sp, void *sp, ++ int set_tp, void *tp) + { + error_t err; + struct i386_thread_state state; +@@ -34,7 +50,7 @@ + + state_count = i386_THREAD_STATE_COUNT; + +- err = __thread_get_state (thread, i386_THREAD_STATE, ++ err = __thread_get_state (thread, i386_REGS_SEGS_STATE, + (thread_state_t) &state, &state_count); + if (err) + return err; +@@ -43,8 +59,21 @@ + state.uesp = (unsigned int) sp; + if (set_ip) + state.eip = (unsigned int) ip; ++ if (set_tp) { ++ HURD_TLS_DESC_DECL(desc, tp); ++ int sel; ++ ++ asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); ++ if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ ++ err = __i386_set_ldt (thread, sel, &desc, 1); ++ else ++ err = __i386_set_gdt (thread, &sel, desc); ++ if (err) ++ return err; ++ state.gs = sel; ++ } + +- err = __thread_set_state (thread, i386_THREAD_STATE, ++ err = __thread_set_state (thread, i386_REGS_SEGS_STATE, + (thread_state_t) &state, + i386_THREAD_STATE_COUNT); + if (err) +Index: libpthread/sysdeps/mach/hurd/i386/pt-setup.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/i386/pt-setup.c,v +retrieving revision 1.4 +--- libpthread/sysdeps/mach/hurd/i386/pt-setup.c 12 May 2005 20:55:37 -0000 1.4 ++++ libpthread/sysdeps/mach/hurd/i386/pt-setup.c 12 Aug 2007 11:34:11 -0000 +@@ -89,12 +89,15 @@ + thread->mcontext.pc = entry_point; + thread->mcontext.sp = stack_setup (thread, start_routine, arg); + ++ thread->tcb->self = thread->kernel_thread; ++ + ktid = __mach_thread_self (); + if (thread->kernel_thread != ktid) + { +- err = __thread_set_pcsp (thread->kernel_thread, ++ err = __thread_set_pcsptp (thread->kernel_thread, + 1, thread->mcontext.pc, +- 1, thread->mcontext.sp); ++ 1, thread->mcontext.sp, ++ 1, thread->tcb); + assert_perror (err); + } + __mach_port_deallocate (__mach_task_self (), ktid); +Index: libthreads/cprocs.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libthreads/cprocs.c,v +retrieving revision 1.17 +--- libthreads/cprocs.c 29 May 2002 00:01:24 -0000 1.17 ++++ libthreads/cprocs.c 12 Aug 2007 11:34:10 -0000 +@@ -730,10 +730,11 @@ + spin_lock(&n_kern_lock); + if (cthread_max_kernel_threads == 0 || + cthread_kernel_threads < cthread_max_kernel_threads) { ++ tcbhead_t *tcb = _dl_allocate_tls(NULL); + cthread_kernel_threads++; + spin_unlock(&n_kern_lock); + MACH_CALL(thread_create(mach_task_self(), &n), r); +- cproc_setup(child, n, cthread_body); /* machine dependent */ ++ cproc_setup(child, n, tcb, cthread_body); /* machine dependent */ + MACH_CALL(thread_resume(n), r); + #ifdef STATISTICS + spin_lock(&ready_lock); +Index: libthreads/cthread_internals.h +=================================================================== +RCS file: /cvsroot/hurd/hurd/libthreads/cthread_internals.h,v +retrieving revision 1.7 +--- libthreads/cthread_internals.h 14 Jun 2007 17:24:13 -0000 1.7 ++++ libthreads/cthread_internals.h 12 Aug 2007 11:34:10 -0000 +@@ -166,6 +166,14 @@ + # endif + #endif + ++/* Type of the TCB. */ ++typedef struct ++{ ++ void *tcb; /* Points to this structure. */ ++ void *dtv; /* Vector of pointers to TLS data. */ ++ thread_t self; /* This thread's control port. */ ++} tcbhead_t; ++ + /* + * Low-level thread implementation. + * This structure must agree with struct ur_cthread in cthreads.h +@@ -312,4 +320,10 @@ + void (*cthread_body_pc)()); + + extern void cproc_setup(cproc_t _child, thread_t _mach_thread, +- void (*_routine)(cproc_t)); ++ tcbhead_t *tcb, void (*_routine)(cproc_t)); ++ ++ ++/* From glibc. */ ++ ++/* Dynamic linker TLS allocation. */ ++extern void *_dl_allocate_tls(void *); +Index: libthreads/alpha/thread.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libthreads/alpha/thread.c,v +retrieving revision 1.2 +--- libthreads/alpha/thread.c 27 May 2002 02:50:13 -0000 1.2 ++++ libthreads/alpha/thread.c 12 Aug 2007 11:34:10 -0000 +@@ -74,6 +74,7 @@ + cproc_setup( + register cproc_t child, + thread_t thread, ++ tcbhead_t *tcb, /* TODO */ + void (*routine)(cproc_t)) + { + register integer_t *top; +Index: libthreads/i386/thread.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libthreads/i386/thread.c,v +retrieving revision 1.7 +--- libthreads/i386/thread.c 27 May 2002 02:50:10 -0000 1.7 ++++ libthreads/i386/thread.c 12 Aug 2007 11:34:10 -0000 +@@ -75,6 +75,21 @@ + #include + #include "cthread_internals.h" + #include ++#include ++#include ++ ++#define HURD_TLS_DESC_DECL(desc, tcb) \ ++ struct descriptor desc = \ ++ { /* low word: */ \ ++ 0xffff /* limit 0..15 */ \ ++ | (((unsigned int) (tcb)) << 16) /* base 0..15 */ \ ++ , /* high word: */ \ ++ ((((unsigned int) (tcb)) >> 16) & 0xff) /* base 16..23 */ \ ++ | ((0x12 | 0x60 | 0x80) << 8) /* access = ACC_DATA_W|ACC_PL_U|ACC_P */ \ ++ | (0xf << 16) /* limit 16..19 */ \ ++ | ((4 | 8) << 20) /* granularity = SZ_32|SZ_G */ \ ++ | (((unsigned int) (tcb)) & 0xff000000) /* base 24..31 */ \ ++ } + + /* + * Set up the initial state of a MACH thread +@@ -82,7 +97,7 @@ + * when it is resumed. + */ + void +-cproc_setup(register cproc_t child, thread_t thread, void (*routine)(cproc_t)) ++cproc_setup(register cproc_t child, thread_t thread, tcbhead_t *tcb, void (*routine)(cproc_t)) + { + extern unsigned int __hurd_threadvar_max; /* GNU */ + register int *top = (int *) +@@ -95,13 +110,15 @@ + register struct i386_thread_state *ts = &state; + kern_return_t r; + unsigned int count; ++ HURD_TLS_DESC_DECL(desc, tcb); ++ int sel; + + /* + * Set up i386 call frame and registers. + * Read registers first to get correct segment values. + */ + count = i386_THREAD_STATE_COUNT; +- MACH_CALL(thread_get_state(thread,i386_THREAD_STATE,(thread_state_t) &state,&count),r); ++ MACH_CALL(thread_get_state(thread,i386_REGS_SEGS_STATE,(thread_state_t) &state,&count),r); + + ts->eip = (int) routine; + *--top = (int) child; /* argument to function */ +@@ -109,7 +126,16 @@ + ts->uesp = (int) top; /* set stack pointer */ + ts->ebp = 0; /* clear frame pointer */ + +- MACH_CALL(thread_set_state(thread,i386_THREAD_STATE,(thread_state_t) &state,i386_THREAD_STATE_COUNT),r); ++ asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); ++ tcb->tcb = tcb; ++ tcb->self = thread; ++ if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ ++ __i386_set_ldt (thread, sel, &desc, 1); ++ else ++ __i386_set_gdt (thread, &sel, desc); ++ ts->gs = sel; ++ ++ MACH_CALL(thread_set_state(thread,i386_REGS_SEGS_STATE,(thread_state_t) &state,i386_THREAD_STATE_COUNT),r); + } + + #if defined(cthread_sp) diff --git a/debian/patches/libpthread_tls_transitional.patch b/debian/patches/libpthread_tls_transitional.patch deleted file mode 100644 index 03d0881b..00000000 --- a/debian/patches/libpthread_tls_transitional.patch +++ /dev/null @@ -1,410 +0,0 @@ -Index: libpthread/pthread/pt-create.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-create.c,v -retrieving revision 1.4 -diff -u -p -r1.4 pt-create.c ---- libpthread/pthread/pt-create.c 4 May 2005 16:04:06 -0000 1.4 -+++ libpthread/pthread/pt-create.c 13 Jul 2007 01:43:42 -0000 -@@ -127,6 +127,15 @@ - if (err) - goto failed_thread_alloc; - -+ if (_dl_allocate_tls) { -+ pthread->tcb = _dl_allocate_tls (NULL); -+ if (!pthread->tcb) -+ goto failed_thread_tls_alloc; -+ pthread->tcb->tcb = pthread->tcb; -+ } else { -+ pthread->tcb = NULL; -+ } -+ - /* And initialize the rest of the machine context. This may include - additional machine- and system-specific initializations that - prove convenient. */ -@@ -192,6 +201,9 @@ - failed_sigstate: - __pthread_sigstate_destroy (pthread); - failed_setup: -+ if (_dl_deallocate_tls && pthread->tcb) -+ _dl_deallocate_tls (pthread->tcb, 1); -+ failed_thread_tls_alloc: - __pthread_thread_dealloc (pthread); - __pthread_thread_halt (pthread, 0); - failed_thread_alloc: -Index: libpthread/pthread/pt-exit.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-exit.c,v -retrieving revision 1.2 ---- libpthread/pthread/pt-exit.c 4 May 2005 16:04:06 -0000 1.2 -+++ libpthread/pthread/pt-exit.c 13 Jul 2007 01:43:42 -0000 -@@ -70,6 +70,8 @@ - if (self->cancel_state == PTHREAD_CANCEL_ENABLE && self->cancel_pending) - status = PTHREAD_CANCELED; - -+ if (_dl_deallocate_tls && self->tcb) -+ _dl_deallocate_tls (self->tcb, 1); - __pthread_thread_dealloc (self); - - switch (self->state) -Index: libpthread/pthread/pt-initialize.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-initialize.c,v -retrieving revision 1.1 ---- libpthread/pthread/pt-initialize.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/pthread/pt-initialize.c 13 Jul 2007 01:43:42 -0000 -@@ -31,3 +31,15 @@ - { - RUN_HOOK (__pthread_init, ()); - } -+ -+void -+__pthread_initialize_minimal (void) -+{ -+#ifndef PIC -+ if (__libc_setup_tls) { -+ __libc_setup_tls (sizeof(tcbhead_t), __alignof__(tcbhead_t)); -+ -+ asm volatile (""); -+ } -+#endif -+} -Index: libpthread/pthread/pt-internal.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-internal.h,v -retrieving revision 1.4 ---- libpthread/pthread/pt-internal.h 4 Mar 2007 00:05:21 -0000 1.4 -+++ libpthread/pthread/pt-internal.h 13 Jul 2007 01:43:42 -0000 -@@ -50,6 +50,14 @@ - # define PTHREAD_SYSDEP_MEMBERS - #endif - -+/* Type of the TCB. */ -+typedef struct -+{ -+ void *tcb; /* Points to this structure. */ -+ void *dtv; /* Vector of pointers to TLS data. */ -+ thread_t self; /* This thread's control port. */ -+} tcbhead_t; -+ - /* This structure describes a POSIX thread. */ - struct __pthread - { -@@ -85,6 +93,8 @@ - - PTHREAD_SYSDEP_MEMBERS - -+ tcbhead_t *tcb; -+ - struct __pthread *next, **prevp; - }; - -@@ -272,4 +282,21 @@ - /* Default condition attributes. */ - const struct __pthread_condattr __pthread_default_condattr; - -+ -+/* From glibc. */ -+#ifdef __i386__ -+#define libc_internal_function __attribute__ ((regparm (3), stdcall)) -+#else -+#define libc_internal_function -+#endif -+ -+/* Dynamic linker TLS allocation. */ -+extern void *_dl_allocate_tls(void *) libc_internal_function __attribute__((weak)); -+ -+/* Dynamic linker TLS deallocation. */ -+extern void _dl_deallocate_tls(void *, int) libc_internal_function __attribute__((weak)); -+ -+/* Static TLS setup. */ -+extern void __libc_setup_tls(size_t, size_t) __attribute__((weak)); -+ - #endif /* pt-internal.h */ -Index: libpthread/sysdeps/mach/hurd/pt-docancel.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/pt-docancel.c,v -retrieving revision 1.2 ---- libpthread/sysdeps/mach/hurd/pt-docancel.c 18 Nov 2002 22:20:58 -0000 1.2 -+++ libpthread/sysdeps/mach/hurd/pt-docancel.c 13 Jul 2007 01:43:43 -0000 -@@ -52,8 +52,8 @@ - err = __thread_abort (p->kernel_thread); - assert_perror (err); - -- err = __thread_set_pcsp (p->kernel_thread, -- 1, (void *) call_exit, 0, 0); -+ err = __thread_set_pcsptp (p->kernel_thread, -+ 1, (void *) call_exit, 0, 0, 0, 0); - assert_perror (err); - - err = __thread_resume (p->kernel_thread); -Index: libpthread/sysdeps/mach/hurd/pt-sysdep.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/pt-sysdep.h,v -retrieving revision 1.3 ---- libpthread/sysdeps/mach/hurd/pt-sysdep.h 18 Jan 2005 10:08:52 -0000 1.3 -+++ libpthread/sysdeps/mach/hurd/pt-sysdep.h 13 Jul 2007 01:43:43 -0000 -@@ -59,11 +59,13 @@ - __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 */ -Index: libpthread/sysdeps/mach/hurd/i386/pt-machdep.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/i386/pt-machdep.c,v -retrieving revision 1.1 ---- libpthread/sysdeps/mach/hurd/i386/pt-machdep.c 10 Oct 2002 23:05:05 -0000 1.1 -+++ libpthread/sysdeps/mach/hurd/i386/pt-machdep.c 13 Jul 2007 01:43:43 -0000 -@@ -21,12 +21,28 @@ - - #include - #include -+#include -+#include - #include - -+#define HURD_TLS_DESC_DECL(desc, tcb) \ -+ struct descriptor desc = \ -+ { /* low word: */ \ -+ 0xffff /* limit 0..15 */ \ -+ | (((unsigned int) (tcb)) << 16) /* base 0..15 */ \ -+ , /* high word: */ \ -+ ((((unsigned int) (tcb)) >> 16) & 0xff) /* base 16..23 */ \ -+ | ((0x12 | 0x60 | 0x80) << 8) /* access = ACC_DATA_W|ACC_PL_U|ACC_P */ \ -+ | (0xf << 16) /* limit 16..19 */ \ -+ | ((4 | 8) << 20) /* granularity = SZ_32|SZ_G */ \ -+ | (((unsigned int) (tcb)) & 0xff000000) /* base 24..31 */ \ -+ } -+ - int --__thread_set_pcsp (thread_t thread, -+__thread_set_pcsptp (thread_t thread, - int set_ip, void *ip, -- int set_sp, void *sp) -+ int set_sp, void *sp, -+ int set_tp, void *tp) - { - error_t err; - struct i386_thread_state state; -@@ -34,7 +50,7 @@ - - state_count = i386_THREAD_STATE_COUNT; - -- err = __thread_get_state (thread, i386_THREAD_STATE, -+ err = __thread_get_state (thread, i386_REGS_SEGS_STATE, - (thread_state_t) &state, &state_count); - if (err) - return err; -@@ -43,8 +59,21 @@ - state.uesp = (unsigned int) sp; - if (set_ip) - state.eip = (unsigned int) ip; -+ if (set_tp) { -+ HURD_TLS_DESC_DECL(desc, tp); -+ int sel; -+ -+ asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); -+ if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ -+ err = __i386_set_ldt (thread, sel, &desc, 1); -+ else -+ err = __i386_set_gdt (thread, &sel, desc); -+ if (err) -+ return err; -+ state.gs = sel; -+ } - -- err = __thread_set_state (thread, i386_THREAD_STATE, -+ err = __thread_set_state (thread, i386_REGS_SEGS_STATE, - (thread_state_t) &state, - i386_THREAD_STATE_COUNT); - if (err) -Index: libpthread/sysdeps/mach/hurd/i386/pt-setup.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/i386/pt-setup.c,v -retrieving revision 1.4 ---- libpthread/sysdeps/mach/hurd/i386/pt-setup.c 12 May 2005 20:55:37 -0000 1.4 -+++ libpthread/sysdeps/mach/hurd/i386/pt-setup.c 13 Jul 2007 01:43:43 -0000 -@@ -89,12 +89,16 @@ - thread->mcontext.pc = entry_point; - thread->mcontext.sp = stack_setup (thread, start_routine, arg); - -+ if (thread->tcb) -+ thread->tcb->self = thread->kernel_thread; -+ - ktid = __mach_thread_self (); - if (thread->kernel_thread != ktid) - { -- err = __thread_set_pcsp (thread->kernel_thread, -+ err = __thread_set_pcsptp (thread->kernel_thread, - 1, thread->mcontext.pc, -- 1, thread->mcontext.sp); -+ 1, thread->mcontext.sp, -+ 1, thread->tcb); - assert_perror (err); - } - __mach_port_deallocate (__mach_task_self (), ktid); -Index: libthreads/cprocs.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/cprocs.c,v -retrieving revision 1.17 ---- libthreads/cprocs.c 29 May 2002 00:01:24 -0000 1.17 -+++ libthreads/cprocs.c 13 Jul 2007 01:43:43 -0000 -@@ -725,15 +725,20 @@ - extern void cproc_prepare(); - extern void cthread_body(); - thread_t n; -+ tcbhead_t *tcb; - - alloc_stack(child); -+ if (_dl_allocate_tls) -+ tcb = _dl_allocate_tls(NULL); -+ else -+ tcb = NULL; - spin_lock(&n_kern_lock); - if (cthread_max_kernel_threads == 0 || - cthread_kernel_threads < cthread_max_kernel_threads) { - cthread_kernel_threads++; - spin_unlock(&n_kern_lock); - MACH_CALL(thread_create(mach_task_self(), &n), r); -- cproc_setup(child, n, cthread_body); /* machine dependent */ -+ cproc_setup(child, n, tcb, cthread_body); /* machine dependent */ - MACH_CALL(thread_resume(n), r); - #ifdef STATISTICS - spin_lock(&ready_lock); -Index: libthreads/cthread_internals.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/cthread_internals.h,v -retrieving revision 1.7 ---- libthreads/cthread_internals.h 14 Jun 2007 17:24:13 -0000 1.7 -+++ libthreads/cthread_internals.h 13 Jul 2007 01:43:43 -0000 -@@ -166,6 +166,14 @@ - # endif - #endif - -+/* Type of the TCB. */ -+typedef struct -+{ -+ void *tcb; /* Points to this structure. */ -+ void *dtv; /* Vector of pointers to TLS data. */ -+ thread_t self; /* This thread's control port. */ -+} tcbhead_t; -+ - /* - * Low-level thread implementation. - * This structure must agree with struct ur_cthread in cthreads.h -@@ -312,4 +320,18 @@ - void (*cthread_body_pc)()); - - extern void cproc_setup(cproc_t _child, thread_t _mach_thread, -- void (*_routine)(cproc_t)); -+ tcbhead_t *tcb, void (*_routine)(cproc_t)); -+ -+ -+/* From glibc. */ -+#ifdef __i386__ -+#define libc_internal_function __attribute__ ((regparm (3), stdcall)) -+#else -+#define libc_internal_function -+#endif -+ -+/* Dynamic linker TLS allocation. */ -+extern void *_dl_allocate_tls(void *) libc_internal_function __attribute__((weak)); -+ -+/* Dynamic linker TLS deallocation. */ -+extern void _dl_deallocate_tls(void *, int) libc_internal_function __attribute__((weak)); -Index: libthreads/alpha/thread.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/alpha/thread.c,v -retrieving revision 1.2 -diff -u -p -r1.2 thread.c ---- libthreads/alpha/thread.c 27 May 2002 02:50:13 -0000 1.2 -+++ libthreads/alpha/thread.c 13 Jul 2007 01:43:43 -0000 -@@ -74,6 +74,7 @@ - cproc_setup( - register cproc_t child, - thread_t thread, -+ tcbhead_t *tcb, /* TODO */ - void (*routine)(cproc_t)) - { - register integer_t *top; -Index: libthreads/i386/thread.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/i386/thread.c,v -retrieving revision 1.7 ---- libthreads/i386/thread.c 27 May 2002 02:50:10 -0000 1.7 -+++ libthreads/i386/thread.c 13 Jul 2007 01:43:43 -0000 -@@ -75,6 +75,21 @@ - #include - #include "cthread_internals.h" - #include -+#include -+#include -+ -+#define HURD_TLS_DESC_DECL(desc, tcb) \ -+ struct descriptor desc = \ -+ { /* low word: */ \ -+ 0xffff /* limit 0..15 */ \ -+ | (((unsigned int) (tcb)) << 16) /* base 0..15 */ \ -+ , /* high word: */ \ -+ ((((unsigned int) (tcb)) >> 16) & 0xff) /* base 16..23 */ \ -+ | ((0x12 | 0x60 | 0x80) << 8) /* access = ACC_DATA_W|ACC_PL_U|ACC_P */ \ -+ | (0xf << 16) /* limit 16..19 */ \ -+ | ((4 | 8) << 20) /* granularity = SZ_32|SZ_G */ \ -+ | (((unsigned int) (tcb)) & 0xff000000) /* base 24..31 */ \ -+ } - - /* - * Set up the initial state of a MACH thread -@@ -82,7 +97,7 @@ - * when it is resumed. - */ - void --cproc_setup(register cproc_t child, thread_t thread, void (*routine)(cproc_t)) -+cproc_setup(register cproc_t child, thread_t thread, tcbhead_t *tcb, void (*routine)(cproc_t)) - { - extern unsigned int __hurd_threadvar_max; /* GNU */ - register int *top = (int *) -@@ -101,7 +116,7 @@ - * Read registers first to get correct segment values. - */ - count = i386_THREAD_STATE_COUNT; -- MACH_CALL(thread_get_state(thread,i386_THREAD_STATE,(thread_state_t) &state,&count),r); -+ MACH_CALL(thread_get_state(thread,i386_REGS_SEGS_STATE,(thread_state_t) &state,&count),r); - - ts->eip = (int) routine; - *--top = (int) child; /* argument to function */ -@@ -109,7 +124,21 @@ - ts->uesp = (int) top; /* set stack pointer */ - ts->ebp = 0; /* clear frame pointer */ - -- MACH_CALL(thread_set_state(thread,i386_THREAD_STATE,(thread_state_t) &state,i386_THREAD_STATE_COUNT),r); -+ if (tcb) { -+ HURD_TLS_DESC_DECL(desc, tcb); -+ int sel; -+ -+ asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); -+ tcb->tcb = tcb; -+ tcb->self = thread; -+ if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ -+ __i386_set_ldt (thread, sel, &desc, 1); -+ else -+ __i386_set_gdt (thread, &sel, desc); -+ ts->gs = sel; -+ } -+ -+ MACH_CALL(thread_set_state(thread,i386_REGS_SEGS_STATE,(thread_state_t) &state,i386_THREAD_STATE_COUNT),r); - } - - #if defined(cthread_sp) -- cgit v1.2.3