mirror of
git://sourceware.org/git/glibc.git
synced 2025-02-17 13:00:43 +08:00
2005-01-23 Roland McGrath <roland@redhat.com>
* sysdeps/i386/Makefile (defines): If -mno-tls-direct-seg-refs appears in $(CFLAGS), add -DNO_TLS_DIRECT_SEG_REFS. * sysdeps/unix/sysv/linux/i386/sysdep.h [USE___THREAD] (SYSCALL_ERROR_HANDLER) [NO_TLS_DIRECT_SEG_REFS]: Load thread pointer from %gs:0 and add to that value, rather that direct %gs:OFFSET access. * sysdeps/unix/i386/sysdep.S [NO_TLS_DIRECT_SEG_REFS]: Likewise.
This commit is contained in:
parent
792dcd77cd
commit
70a8119bf0
@ -61,3 +61,7 @@ CFLAGS-dlopenold.c += -mpreferred-stack-boundary=4
|
||||
CFLAGS-dlclose.c += -mpreferred-stack-boundary=4
|
||||
CFLAGS-dlerror.c += -mpreferred-stack-boundary=4
|
||||
endif
|
||||
|
||||
ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
|
||||
defines += -DNO_TLS_DIRECT_SEG_REFS
|
||||
endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 2000, 2002, 2004
|
||||
/* Copyright (C) 1991,1992,1993,1994,1995,1996,1997,2000,2002,2004,2005
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -47,7 +47,12 @@ notb:
|
||||
#endif
|
||||
#ifndef PIC
|
||||
# if USE___THREAD
|
||||
# ifndef NO_TLS_DIRECT_SEG_REFS
|
||||
movl %eax, %gs:C_SYMBOL_NAME(errno@NTPOFF)
|
||||
# else
|
||||
movl %gs:0, %ecx
|
||||
movl %eax, C_SYMBOL_NAME(errno@NTPOFF)(%ecx)
|
||||
# endif
|
||||
# elif !defined _LIBC_REENTRANT
|
||||
movl %eax, C_SYMBOL_NAME(errno)
|
||||
# else
|
||||
@ -66,7 +71,12 @@ notb:
|
||||
|
||||
/* Pop %ebx value saved before jumping here. */
|
||||
popl %ebx
|
||||
# ifndef NO_TLS_DIRECT_SEG_REFS
|
||||
addl %gs:0, %ecx
|
||||
movl %eax, (%ecx)
|
||||
# else
|
||||
movl %eax, %gs:0(%ecx)
|
||||
# endif
|
||||
# elif RTLD_PRIVATE_ERRNO
|
||||
movl %eax, C_SYMBOL_NAME(rtld_errno@GOTOFF)(%ebx)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* Copyright (C) 1992,1993,1995-2000,2002,2003,2004
|
||||
Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1992,1993,1995,1996,1997,1998,1999,2000,2002,2003,2004,2005
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper, <drepper@gnu.org>, August 1995.
|
||||
|
||||
@ -154,9 +154,17 @@ __i686.get_pc_thunk.reg: \
|
||||
movl SYSCALL_ERROR_ERRNO@GOTNTPOFF(%ecx), %ecx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
movl %edx, %gs:0(%ecx); \
|
||||
SYSCALL_ERROR_HANDLER_TLS_STORE (%edx, %ecx); \
|
||||
orl $-1, %eax; \
|
||||
jmp L(pseudo_end);
|
||||
# ifndef NO_TLS_DIRECT_SEG_REFS
|
||||
# define SYSCALL_ERROR_HANDLER_TLS_STORE(src, destoff) \
|
||||
movl src, %gs:0(destoff)
|
||||
# else
|
||||
# define SYSCALL_ERROR_HANDLER_TLS_STORE(src, destoff) \
|
||||
addl %gs:0, destoff; \
|
||||
movl src, (destoff)
|
||||
# endif
|
||||
# else
|
||||
# define SYSCALL_ERROR_HANDLER \
|
||||
0:pushl %ebx; \
|
||||
|
Loading…
Reference in New Issue
Block a user