From 48729174301a8e17185c18c146f969c0fc2dd9f0 Mon Sep 17 00:00:00 2001 From: davidxu Date: Mon, 16 Aug 2004 03:27:29 +0000 Subject: 1. Add macro DTV_OFFSET to calculate dtv offset in tcb. 2. Export symbols needed by debugger. --- lib/libpthread/Makefile | 1 + lib/libpthread/arch/alpha/include/pthread_md.h | 1 + lib/libpthread/arch/amd64/include/pthread_md.h | 2 ++ lib/libpthread/arch/arm/include/pthread_md.h | 1 + lib/libpthread/arch/i386/include/pthread_md.h | 2 ++ lib/libpthread/arch/ia64/include/pthread_md.h | 1 + lib/libpthread/arch/powerpc/include/pthread_md.h | 1 + lib/libpthread/arch/sparc64/include/pthread_md.h | 1 + lib/libpthread/pthread.map | 22 +++++++++++++++++++--- lib/libpthread/thread/Makefile.inc | 1 + 10 files changed, 30 insertions(+), 3 deletions(-) (limited to 'lib/libpthread') diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index ba86f08..c0f0399 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -19,6 +19,7 @@ CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf +CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} CFLAGS+=-fno-builtin # Uncomment this if you want libpthread to contain debug information for diff --git a/lib/libpthread/arch/alpha/include/pthread_md.h b/lib/libpthread/arch/alpha/include/pthread_md.h index 5266a6d..908bcfd 100644 --- a/lib/libpthread/arch/alpha/include/pthread_md.h +++ b/lib/libpthread/arch/alpha/include/pthread_md.h @@ -34,6 +34,7 @@ #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_dtv) #define THR_GETCONTEXT(ucp) _alpha_save_context(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) PANIC("THR_SETCONTEXT() now in use!\n") diff --git a/lib/libpthread/arch/amd64/include/pthread_md.h b/lib/libpthread/arch/amd64/include/pthread_md.h index 86af4af..4f903c5 100644 --- a/lib/libpthread/arch/amd64/include/pthread_md.h +++ b/lib/libpthread/arch/amd64/include/pthread_md.h @@ -32,12 +32,14 @@ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ +#include #include #include #include #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) #define THR_GETCONTEXT(ucp) \ (void)_amd64_save_context(&(ucp)->uc_mcontext) diff --git a/lib/libpthread/arch/arm/include/pthread_md.h b/lib/libpthread/arch/arm/include/pthread_md.h index 2ba486c..e9d2b6f 100644 --- a/lib/libpthread/arch/arm/include/pthread_md.h +++ b/lib/libpthread/arch/arm/include/pthread_md.h @@ -38,6 +38,7 @@ #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_dtv) int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); int _thr_getcontext(mcontext_t *); diff --git a/lib/libpthread/arch/i386/include/pthread_md.h b/lib/libpthread/arch/i386/include/pthread_md.h index 2d4b0e0..d208d2e 100644 --- a/lib/libpthread/arch/i386/include/pthread_md.h +++ b/lib/libpthread/arch/i386/include/pthread_md.h @@ -31,6 +31,7 @@ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ +#include #include #include @@ -38,6 +39,7 @@ extern int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); extern int _thr_getcontext(mcontext_t *); #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) #define THR_GETCONTEXT(ucp) _thr_getcontext(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) _thr_setcontext(&(ucp)->uc_mcontext, 0, NULL) diff --git a/lib/libpthread/arch/ia64/include/pthread_md.h b/lib/libpthread/arch/ia64/include/pthread_md.h index 264909c..220077a 100644 --- a/lib/libpthread/arch/ia64/include/pthread_md.h +++ b/lib/libpthread/arch/ia64/include/pthread_md.h @@ -34,6 +34,7 @@ #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_dtv) #define THR_GETCONTEXT(ucp) _ia64_save_context(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) PANIC("THR_SETCONTEXT() now in use!\n") diff --git a/lib/libpthread/arch/powerpc/include/pthread_md.h b/lib/libpthread/arch/powerpc/include/pthread_md.h index 776d45b..5d00ab3 100644 --- a/lib/libpthread/arch/powerpc/include/pthread_md.h +++ b/lib/libpthread/arch/powerpc/include/pthread_md.h @@ -42,6 +42,7 @@ extern int _ppc32_setcontext(mcontext_t *, intptr_t, intptr_t *); extern int _ppc32_getcontext(mcontext_t *); #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb.tcb_tp.tp_dtv) #define THR_GETCONTEXT(ucp) _ppc32_getcontext(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) _ppc32_setcontext(&(ucp)->uc_mcontext, 0, NULL) diff --git a/lib/libpthread/arch/sparc64/include/pthread_md.h b/lib/libpthread/arch/sparc64/include/pthread_md.h index 4700d73..1abbe65 100644 --- a/lib/libpthread/arch/sparc64/include/pthread_md.h +++ b/lib/libpthread/arch/sparc64/include/pthread_md.h @@ -38,6 +38,7 @@ #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_dtv) int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); int _thr_getcontext(mcontext_t *); diff --git a/lib/libpthread/pthread.map b/lib/libpthread/pthread.map index 133f694..bb04272 100644 --- a/lib/libpthread/pthread.map +++ b/lib/libpthread/pthread.map @@ -331,10 +331,26 @@ global: # Debugger needs these. _libkse_debug; _thread_activated; - _thread_list; - _thread_keytable; _thread_active_threads; - + _thread_keytable; + _thread_list; + _thread_max_keys; + _thread_off_attr_flags; + _thread_off_dtv; + _thread_off_linkmap; + _thread_off_next; + _thread_off_tcb; + _thread_off_tmbx; + _thread_off_key_allocated; + _thread_off_key_destructor; + _thread_off_kse; + _thread_off_kse_locklevel; + _thread_off_state; + _thread_off_thr_locklevel; + _thread_off_tlsindex; + _thread_size_key; + _thread_state_running; + _thread_state_zoombie; local: *; }; diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index fb11adb..59fa21c 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -103,6 +103,7 @@ SRCS+= \ thr_suspend_np.c \ thr_switch_np.c \ thr_system.c \ + thr_symbols.c \ thr_tcdrain.c \ thr_vfork.c \ thr_wait.c \ -- cgit v1.1