diff options
| author | peter <peter@FreeBSD.org> | 2004-11-06 03:35:51 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2004-11-06 03:35:51 +0000 |
| commit | 09f7cb0cecca520d07df899f6b877af03bf785dc (patch) | |
| tree | e98ec8d6e7236a74f53ac5a0e96a16a7b62cb89b /lib/libpthread/arch | |
| parent | 1028f02dbd2f69077dfa64d7eb25bae225e0bf93 (diff) | |
| download | FreeBSD-src-09f7cb0cecca520d07df899f6b877af03bf785dc.zip FreeBSD-src-09f7cb0cecca520d07df899f6b877af03bf785dc.tar.gz | |
i386_set_ldt() is not available when running 32 bit binaries on amd64
kernels. Use the recently exposed direct-set routines instead. This is
only activated for when we compile i386 support libraries on amd64.
Diffstat (limited to 'lib/libpthread/arch')
| -rw-r--r-- | lib/libpthread/arch/i386/i386/pthread_md.c | 6 | ||||
| -rw-r--r-- | lib/libpthread/arch/i386/include/pthread_md.h | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/libpthread/arch/i386/i386/pthread_md.c b/lib/libpthread/arch/i386/i386/pthread_md.c index 3d9bd36..cca4339 100644 --- a/lib/libpthread/arch/i386/i386/pthread_md.c +++ b/lib/libpthread/arch/i386/i386/pthread_md.c @@ -76,7 +76,9 @@ _tcb_dtor(struct tcb *tcb) struct kcb * _kcb_ctor(struct kse *kse) { +#ifndef COMPAT_32BIT union descriptor ldt; +#endif struct kcb *kcb; kcb = malloc(sizeof(struct kcb)); @@ -84,6 +86,7 @@ _kcb_ctor(struct kse *kse) bzero(kcb, sizeof(struct kcb)); kcb->kcb_self = kcb; kcb->kcb_kse = kse; +#ifndef COMPAT_32BIT ldt.sd.sd_hibase = (unsigned int)kcb >> 24; ldt.sd.sd_lobase = (unsigned int)kcb & 0xFFFFFF; ldt.sd.sd_hilimit = (sizeof(struct kcb) >> 16) & 0xF; @@ -99,6 +102,7 @@ _kcb_ctor(struct kse *kse) free(kcb); return (NULL); } +#endif } return (kcb); } @@ -106,9 +110,11 @@ _kcb_ctor(struct kse *kse) void _kcb_dtor(struct kcb *kcb) { +#ifndef COMPAT_32BIT if (kcb->kcb_ldt >= 0) { i386_set_ldt(kcb->kcb_ldt, NULL, 1); kcb->kcb_ldt = -1; /* just in case */ } +#endif free(kcb); } diff --git a/lib/libpthread/arch/i386/include/pthread_md.h b/lib/libpthread/arch/i386/include/pthread_md.h index da97c5c..92d4275 100644 --- a/lib/libpthread/arch/i386/include/pthread_md.h +++ b/lib/libpthread/arch/i386/include/pthread_md.h @@ -32,7 +32,9 @@ #define _PTHREAD_MD_H_ #include <stddef.h> +#include <sys/types.h> #include <sys/kse.h> +#include <machine/sysarch.h> #include <ucontext.h> extern int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); @@ -150,10 +152,15 @@ void _kcb_dtor(struct kcb *); static __inline void _kcb_set(struct kcb *kcb) { +#ifndef COMPAT_32BIT int val; val = (kcb->kcb_ldt << 3) | 7; __asm __volatile("movl %0, %%gs" : : "r" (val)); +#else + _amd64_set_gsbase(kcb); +#endif + } /* Get the current kcb. */ |
