From d78ce054e2a3b23fed53f42ea7aa6e1c2ff6d748 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 20 Aug 2002 10:14:15 +0000
Subject: Update.
* elf/rtld.c (_dl_start): Pass extra argument 1 to TLS_INIT_TP.
(dl_main): Padd extra argument 0 to TLS_INIT_TP.
* sysdeps/generic/libc-tls.c (__libc_setup_tls): Pass extra
argument 1 to TLS_INIT_TP.
* sysdeps/generic/tls.h (TLS_INIT_TP): Describe new parameter.
* locale/loadarchive.c (_nl_load_locale_from_archive): Store strdup of
---
linuxthreads/sysdeps/i386/tls.h | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
(limited to 'linuxthreads/sysdeps/i386')
diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h
index 5de8eca..098b11c 100644
--- a/linuxthreads/sysdeps/i386/tls.h
+++ b/linuxthreads/sysdeps/i386/tls.h
@@ -115,12 +115,16 @@ typedef struct
__builtin_expect (result, 0) != 0 ? -1 : nr * 8 + 7; \
})
-# define TLS_DO_SET_THREAD_AREA(descr) \
+# define TLS_DO_SET_THREAD_AREA(descr, firstcall) \
({ \
struct modify_ldt_ldt_s ldt_entry = \
{ -1, (unsigned long int) (descr), sizeof (struct _pthread_descr_struct), \
1, 0, 0, 0, 0, 1, 0 }; \
int result; \
+ if (!firstcall) \
+ ldt_entry.entry_number = ({ int _gs; \
+ asm ("movw %%gs, %w0" : "=q" (_gs)); \
+ (_gs & 0xffff) >> 3; }); \
asm volatile (TLS_LOAD_EBX \
"int $0x80\n\t" \
TLS_LOAD_EBX \
@@ -134,10 +138,11 @@ typedef struct
})
# ifdef __ASSUME_SET_THREAD_AREA_SYSCALL
-# define TLS_SETUP_GS_SEGMENT(descr) TLS_DO_SET_THREAD_AREA (descr)
+# define TLS_SETUP_GS_SEGMENT(descr, firstcall) \
+ TLS_DO_SET_THREAD_AREA (descr, firstcall)
# elif defined __NR_set_thread_area
-# define TLS_SETUP_GS_SEGMENT(descr) \
- ({ int __seg = TLS_DO_SET_THREAD_AREA (descr); \
+# define TLS_SETUP_GS_SEGMENT(descr, firstcall) \
+ ({ int __seg = TLS_DO_SET_THREAD_AREA (descr, firstcall); \
__seg == -1 ? TLS_DO_MODIFY_LDT (descr, 0) : __seg; })
# else
# define TLS_SETUP_GS_SEGMENT(descr) TLS_DO_MODIFY_LDT ((descr), 0)
@@ -146,7 +151,7 @@ typedef struct
/* Code to initially initialize the thread pointer. This might need
special attention since 'errno' is not yet available and if the
operation can cause a failure 'errno' must not be touched. */
-# define TLS_INIT_TP(descr) \
+# define TLS_INIT_TP(descr, firstcall) \
({ \
void *_descr = (descr); \
tcbhead_t *head = _descr; \
@@ -156,7 +161,7 @@ typedef struct
/* For now the thread descriptor is at the same address. */ \
head->self = _descr; \
\
- __gs = TLS_SETUP_GS_SEGMENT (_descr); \
+ __gs = TLS_SETUP_GS_SEGMENT (_descr, firstcall); \
if (__builtin_expect (__gs, 7) != -1) \
{ \
asm ("movw %w0, %%gs" : : "q" (__gs)); \
--
cgit v1.1