mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
* elf/tls-macros.h (TLS_LD, TLS_GD): Use call insn, not callq.
* sysdeps/unix/x86_64/sysdep.S [USE_TLS && HAVE___THREAD] [! PIC]: Use direct-%fs form of TLS access for errno. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h: File removed, since the i386 version has all the same asm now. * sysdeps/i386/elf/configure.in: Add @GOTNTPOFF and @NTPOFF uses to the TLS support check. * sysdeps/i386/elf/configure: Regenerated. * sysdeps/unix/sysv/linux/i386/sysdep.h [USE_TLS && HAVE___THREAD] (SYSCALL_ERROR_HANDLER): Use direct-%gs form of TLS access for errno. * sysdeps/unix/i386/sysdep.S (syscall_error) [USE_TLS && HAVE___THREAD]: Use TLS access for errno.
This commit is contained in:
Roland McGrath
parent
7de490c686
commit
fe27057d17
18
ChangeLog
18
ChangeLog
@ -1,5 +1,23 @@
|
||||
2002-09-30 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* elf/tls-macros.h (TLS_LD, TLS_GD): Use call insn, not callq.
|
||||
|
||||
* sysdeps/unix/x86_64/sysdep.S [USE_TLS && HAVE___THREAD] [! PIC]:
|
||||
Use direct-%fs form of TLS access for errno.
|
||||
|
||||
* sysdeps/unix/sysv/linux/i386/i686/sysdep.h: File removed, since
|
||||
the i386 version has all the same asm now.
|
||||
|
||||
* sysdeps/i386/elf/configure.in: Add @GOTNTPOFF and @NTPOFF uses to
|
||||
the TLS support check.
|
||||
* sysdeps/i386/elf/configure: Regenerated.
|
||||
|
||||
* sysdeps/unix/sysv/linux/i386/sysdep.h [USE_TLS && HAVE___THREAD]
|
||||
(SYSCALL_ERROR_HANDLER): Use direct-%gs form of TLS access for errno.
|
||||
|
||||
* sysdeps/unix/i386/sysdep.S (syscall_error)
|
||||
[USE_TLS && HAVE___THREAD]: Use TLS access for errno.
|
||||
|
||||
* sysdeps/unix/sysv/linux/x86_64/sysdep.h
|
||||
[USE_TLS && HAVE___THREAD] (SYSCALL_ERROR_HANDLER): Use TLS access.
|
||||
|
||||
|
||||
@ -114,7 +114,7 @@
|
||||
# define TLS_LD(x) \
|
||||
({ int *__l, __c, __d; \
|
||||
asm ("leaq " #x "@tlsld(%%rip),%%rdi\n\t" \
|
||||
"callq __tls_get_addr@plt\n\t" \
|
||||
"call __tls_get_addr@plt\n\t" \
|
||||
"leaq " #x "@dtpoff(%%rax), %%rax" \
|
||||
: "=a" (__l), "=&c" (__c), "=&d" (__d) \
|
||||
: : "rdi", "rsi", "r8", "r9", "r10", "r11"); \
|
||||
@ -124,7 +124,7 @@
|
||||
({ int *__l, __c, __d; \
|
||||
asm (".long 0x66666666\n\t" \
|
||||
"leaq " #x "@tlsgd(%%rip),%%rdi\n\t" \
|
||||
"callq __tls_get_addr@plt" \
|
||||
"call __tls_get_addr@plt" \
|
||||
: "=a" (__l), "=&c" (__c), "=&d" (__d) \
|
||||
: : "rdi", "rsi", "r8", "r9", "r10", "r11"); \
|
||||
__l; })
|
||||
|
||||
5
sysdeps/i386/elf/configure
vendored
5
sysdeps/i386/elf/configure
vendored
@ -20,8 +20,11 @@ baz: leal bar@TLSLDM(%ebx), %eax
|
||||
leal bar@DTPOFF(%eax), %edx
|
||||
subl foo@GOTTPOFF(%edx), %eax
|
||||
subl $bar@TPOFF, %eax
|
||||
movl foo@GOTNTPOFF(%edx), %ecx
|
||||
movl %gs:(%ecx), %eax
|
||||
movl %gs:bar@NTPOFF, %eax
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:25: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
||||
if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:28: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
||||
libc_cv_386_tls=yes
|
||||
else
|
||||
libc_cv_386_tls=no
|
||||
|
||||
@ -18,6 +18,9 @@ baz: leal bar@TLSLDM(%ebx), %eax
|
||||
leal bar@DTPOFF(%eax), %edx
|
||||
subl foo@GOTTPOFF(%edx), %eax
|
||||
subl $bar@TPOFF, %eax
|
||||
movl foo@GOTNTPOFF(%edx), %ecx
|
||||
movl %gs:(%ecx), %eax
|
||||
movl %gs:bar@NTPOFF, %eax
|
||||
EOF
|
||||
dnl
|
||||
if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AC_FD_CC); then
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 2000 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 2000, 2002
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@ -41,7 +42,9 @@ syscall_error:
|
||||
notb:
|
||||
#endif
|
||||
#ifndef PIC
|
||||
# ifndef _LIBC_REENTRANT
|
||||
# if USE_TLS && HAVE___THREAD
|
||||
movl %eax, %gs:C_SYMBOL_NAME(errno@NTPOFF)
|
||||
# elif !defined _LIBC_REENTRANT
|
||||
movl %eax, C_SYMBOL_NAME(errno)
|
||||
# else
|
||||
pushl %eax
|
||||
@ -54,7 +57,13 @@ notb:
|
||||
#else
|
||||
/* The caller has pushed %ebx and then set it up to
|
||||
point to the GOT before calling us through the PLT. */
|
||||
# ifndef _LIBC_REENTRANT
|
||||
# if USE_TLS && HAVE___THREAD
|
||||
movl C_SYMBOL_NAME(errno@GOTNTPOFF)(%ebx), %ecx
|
||||
|
||||
/* Pop %ebx value saved before jumping here. */
|
||||
popl %ebx
|
||||
movl %eax, %gs:0(%ecx)
|
||||
# elif !defined _LIBC_REENTRANT
|
||||
movl C_SYMBOL_NAME(errno@GOT)(%ebx), %ecx
|
||||
|
||||
/* Pop %ebx value saved before jumping here. */
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper, <drepper@cygnus.com>, 1998.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#ifndef _LINUX_I386_I686_SYSDEP_H
|
||||
#define _LINUX_I386_I686_SYSDEP_H 1
|
||||
|
||||
/* There is some commonality. */
|
||||
#include <sysdeps/unix/sysv/linux/i386/sysdep.h>
|
||||
#include <bp-sym.h>
|
||||
#include <bp-asm.h>
|
||||
|
||||
/* We define special versions of the error handler code to match the i686's
|
||||
deep branch prediction mechanism. */
|
||||
#ifdef PIC
|
||||
# undef SYSCALL_ERROR_HANDLER
|
||||
|
||||
# undef SETUP_PIC_REG
|
||||
# ifndef HAVE_HIDDEN
|
||||
# define SETUP_PIC_REG(reg) \
|
||||
call 1f; \
|
||||
.subsection 1; \
|
||||
1:movl (%esp), %e##reg; \
|
||||
ret; \
|
||||
.previous
|
||||
# else
|
||||
# define SETUP_PIC_REG(reg) \
|
||||
.section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax",@progbits; \
|
||||
.globl __i686.get_pc_thunk.reg; \
|
||||
.hidden __i686.get_pc_thunk.reg; \
|
||||
.type __i686.get_pc_thunk.reg,@function; \
|
||||
__i686.get_pc_thunk.reg: \
|
||||
movl (%esp), %e##reg; \
|
||||
ret; \
|
||||
.previous; \
|
||||
call __i686.get_pc_thunk.reg
|
||||
# endif
|
||||
|
||||
/* Store (- %eax) into errno through the GOT. */
|
||||
# ifdef _LIBC_REENTRANT
|
||||
# if USE_TLS && HAVE___THREAD
|
||||
# define SYSCALL_ERROR_HANDLER \
|
||||
0:SETUP_PIC_REG (cx); \
|
||||
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
movl %gs:0, %eax; \
|
||||
subl errno@gottpoff(%ecx), %eax; \
|
||||
movl %edx, (%eax); \
|
||||
orl $-1, %eax; \
|
||||
jmp L(pseudo_end);
|
||||
# else
|
||||
# define SYSCALL_ERROR_HANDLER \
|
||||
0:pushl %ebx; \
|
||||
SETUP_PIC_REG(bx); \
|
||||
addl $_GLOBAL_OFFSET_TABLE_, %ebx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
pushl %edx; \
|
||||
PUSH_ERRNO_LOCATION_RETURN; \
|
||||
call BP_SYM (__errno_location)@PLT; \
|
||||
POP_ERRNO_LOCATION_RETURN; \
|
||||
popl %ecx; \
|
||||
popl %ebx; \
|
||||
movl %ecx, (%eax); \
|
||||
orl $-1, %eax; \
|
||||
jmp L(pseudo_end);
|
||||
/* A quick note: it is assumed that the call to `__errno_location' does
|
||||
not modify the stack! */
|
||||
# endif
|
||||
# else
|
||||
# define SYSCALL_ERROR_HANDLER \
|
||||
0:SETUP_PIC_REG(cx); \
|
||||
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
movl errno@GOT(%ecx), %ecx; \
|
||||
movl %edx, (%ecx); \
|
||||
orl $-1, %eax; \
|
||||
jmp L(pseudo_end);
|
||||
# endif /* _LIBC_REENTRANT */
|
||||
#endif /* PIC */
|
||||
|
||||
#endif /* linux/i386/i686/sysdep.h */
|
||||
@ -42,8 +42,12 @@ syscall_error:
|
||||
notb:
|
||||
#endif
|
||||
#if USE_TLS && HAVE___THREAD
|
||||
movq C_SYMBOL_NAME(errno)@GOTTPOFF(%rip), %rcx
|
||||
# ifdef PIC
|
||||
movq C_SYMBOL_NAME(errno@GOTTPOFF)(%rip), %rcx
|
||||
movl %eax, %fs:0(%rcx)
|
||||
# else
|
||||
movl %eax, %fs:C_SYMBOL_NAME(errno@TPOFF)
|
||||
# endif
|
||||
#elif !defined PIC
|
||||
# ifndef _LIBC_REENTRANT
|
||||
movl %eax, C_SYMBOL_NAME(errno)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user