mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
Update.
2002-07-19 Ulrich Drepper <drepper@redhat.com> * configure.in: Add test for __thread support in compiler. * config.h.in: Add HAVE___THREAD. * Makefile (headers): Remove errno.h, sys/errno.h, and bits/errno.h. * include/sys/errno.h: Moved to... * stdlib/sys/errno.h: ...here. New file. * stdlib/errno.h: New file. Moved from... * include/errno.h: ...here. Changed into an internal header defining libc-local things like __set_errno. * stdlib/Makefile (headers): Add errno.h, sys/errno.h, and bits/errno.h. * elf/dl-minimal.c: Include <tls.h>. Define errno as thread-local variable if USE_TLS && HAVE___THREAD. Don't define __errno_location either. * elf/rtld.c (_dl_start): Add code to initialize TLS for ld.so from... (_dl_start_final): ...here. Add code to initialize tls elements from bootstrap_map. * sysdeps/generic/errno-loc.c: Define errno as thread-local variable if USE_TLS && HAVE___THREAD. * sysdeps/generic/bits/errno.h: Remove __set_errno definition. * sysdeps/mach/hurd/bits/errno.h: Likewise. * sysdeps/standalone/arm/bits/errno.h: Likewise. * sysdeps/standalone/bits/errno.h: Likewise. * sysdeps/unix/bsd/bsd4.4/bits/errno.h: Likewise. * sysdeps/unix/sysv/aix/bits/errno.h: Likewise. * sysdeps/unix/sysv/hpux/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/errno.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/errno.h: Likewise. * sysdeps/i386/dl-machine.c (elf_machine_rel) [RTLD_BOOTSTRAP]: Don't use GL(dl_rtld_map), use map parameter. * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.S: Define errno in .tbss if USE_TLS && HAVE___THREAD. * sysdeps/unix/sysv/linux/i386/sysdep.h: Unify SETUP_PIC_REG definitions. If USE_TLS && HAVE___THREAD store errooor value using TLS code sequence. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: No real need to restore errno. * sysdeps/unix/sysv/linux/grantpt.c: Likewise. * sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise. * sysdeps/unix/sysv/linux/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise.
This commit is contained in:
@ -30,32 +30,44 @@
|
||||
#ifdef PIC
|
||||
# undef SYSCALL_ERROR_HANDLER
|
||||
|
||||
/* Store (- %eax) into errno through the GOT. */
|
||||
# ifdef _LIBC_REENTRANT
|
||||
|
||||
# ifndef HAVE_HIDDEN
|
||||
# define SETUP_PIC_REG \
|
||||
# undef SETUP_PIC_REG
|
||||
# ifndef HAVE_HIDDEN
|
||||
# define SETUP_PIC_REG(reg) \
|
||||
call 1f; \
|
||||
.subsection 1; \
|
||||
1:movl (%esp), %ebx; \
|
||||
1:movl (%esp), %e##reg; \
|
||||
ret; \
|
||||
.previous
|
||||
# else
|
||||
# define SETUP_PIC_REG \
|
||||
.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits; \
|
||||
.globl __i686.get_pc_thunk.bx; \
|
||||
.hidden __i686.get_pc_thunk.bx; \
|
||||
.type __i686.get_pc_thunk.bx,@function; \
|
||||
__i686.get_pc_thunk.bx: \
|
||||
movl (%esp), %ebx; \
|
||||
# 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.bx
|
||||
# endif
|
||||
call __i686.get_pc_thunk.reg
|
||||
# endif
|
||||
|
||||
# define SYSCALL_ERROR_HANDLER \
|
||||
/* 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; \
|
||||
SETUP_PIC_REG(bx); \
|
||||
addl $_GLOBAL_OFFSET_TABLE_, %ebx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
@ -70,30 +82,10 @@ __i686.get_pc_thunk.bx: \
|
||||
jmp L(pseudo_end);
|
||||
/* A quick note: it is assumed that the call to `__errno_location' does
|
||||
not modify the stack! */
|
||||
# else
|
||||
|
||||
# ifndef HAVE_HIDDEN
|
||||
# define SETUP_PIC_REG \
|
||||
call 1f; \
|
||||
.subsection 1; \
|
||||
1:movl (%esp), %ecx; \
|
||||
ret; \
|
||||
.previous
|
||||
# else
|
||||
# define SETUP_PIC_REG \
|
||||
.section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax",@progbits; \
|
||||
.globl __i686.get_pc_thunk.cx; \
|
||||
.hidden __i686.get_pc_thunk.cx; \
|
||||
.type __i686.get_pc_thunk.cx,@function; \
|
||||
__i686.get_pc_thunk.cx: \
|
||||
movl (%esp), %ecx; \
|
||||
ret; \
|
||||
.previous; \
|
||||
call __i686.get_pc_thunk.cx
|
||||
# endif
|
||||
|
||||
# else
|
||||
# define SYSCALL_ERROR_HANDLER \
|
||||
0:SETUP_PIC_REG; \
|
||||
0:SETUP_PIC_REG(cx); \
|
||||
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995, 1996, 1997, 1998, 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
|
||||
@ -17,6 +17,7 @@
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <tls.h>
|
||||
|
||||
/* Because the Linux version is in fact i386/ELF and the start.? file
|
||||
for this system (sysdeps/i386/elf/start.S) is also used by The Hurd
|
||||
@ -25,13 +26,21 @@
|
||||
it somewhere else.
|
||||
|
||||
...and this place is here. */
|
||||
#if USE_TLS && HAVE___THREAD
|
||||
.section .tbss
|
||||
#else
|
||||
.bss
|
||||
#endif
|
||||
.globl errno
|
||||
.type errno,@object
|
||||
.size errno,4
|
||||
.globl _errno
|
||||
.type _errno,@object
|
||||
.size _errno,4
|
||||
.align 4
|
||||
errno:
|
||||
_errno:
|
||||
.space 4
|
||||
weak_alias (errno, _errno)
|
||||
|
||||
/* The following code is only used in the shared library when we
|
||||
compile the reentrant version. Otherwise each system call defines
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <sysdeps/unix/i386/sysdep.h>
|
||||
#include <bp-sym.h>
|
||||
#include <bp-asm.h>
|
||||
#include <tls.h>
|
||||
|
||||
/* For Linux we can use the system call table in the header file
|
||||
/usr/include/asm/unistd.h
|
||||
@ -72,34 +73,47 @@
|
||||
END (name)
|
||||
|
||||
#ifndef PIC
|
||||
#define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
|
||||
# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
|
||||
#else
|
||||
/* Store (- %eax) into errno through the GOT. */
|
||||
#ifdef _LIBC_REENTRANT
|
||||
|
||||
# ifndef HAVE_HIDDEN
|
||||
# define SETUP_PIC_REG \
|
||||
# define SETUP_PIC_REG(reg) \
|
||||
call 1f; \
|
||||
.subsection 1; \
|
||||
1:movl (%esp), %ebx; \
|
||||
1:movl (%esp), %e##reg; \
|
||||
ret; \
|
||||
.previous
|
||||
# else
|
||||
# define SETUP_PIC_REG \
|
||||
.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits; \
|
||||
.globl __i686.get_pc_thunk.bx; \
|
||||
.hidden __i686.get_pc_thunk.bx; \
|
||||
.type __i686.get_pc_thunk.bx,@function; \
|
||||
__i686.get_pc_thunk.bx: \
|
||||
movl (%esp), %ebx; \
|
||||
# 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.bx
|
||||
call __i686.get_pc_thunk.reg
|
||||
# endif
|
||||
|
||||
#define SYSCALL_ERROR_HANDLER \
|
||||
/* 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; \
|
||||
SETUP_PIC_REG (bx); \
|
||||
addl $_GLOBAL_OFFSET_TABLE_, %ebx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
@ -114,30 +128,10 @@ __i686.get_pc_thunk.bx: \
|
||||
jmp L(pseudo_end);
|
||||
/* A quick note: it is assumed that the call to `__errno_location' does
|
||||
not modify the stack! */
|
||||
#else
|
||||
|
||||
# ifndef HAVE_HIDDEN
|
||||
# define SETUP_PIC_REG \
|
||||
call 1f; \
|
||||
.subsection 1; \
|
||||
1:movl (%esp), %ecx; \
|
||||
ret; \
|
||||
.previous
|
||||
# endif
|
||||
# else
|
||||
# define SETUP_PIC_REG \
|
||||
.section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax",@progbits; \
|
||||
.globl __i686.get_pc_thunk.cx; \
|
||||
.hidden __i686.get_pc_thunk.cx; \
|
||||
.type __i686.get_pc_thunk.cx,@function; \
|
||||
__i686.get_pc_thunk.cx: \
|
||||
movl (%esp), %ecx; \
|
||||
ret; \
|
||||
.previous; \
|
||||
call __i686.get_pc_thunk.cx
|
||||
# endif
|
||||
|
||||
#define SYSCALL_ERROR_HANDLER \
|
||||
0:define SETUP_PIC_REG; \
|
||||
# define SYSCALL_ERROR_HANDLER \
|
||||
0:define SETUP_PIC_REG(cx); \
|
||||
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
|
||||
xorl %edx, %edx; \
|
||||
subl %eax, %edx; \
|
||||
@ -145,7 +139,7 @@ __i686.get_pc_thunk.cx: \
|
||||
movl %edx, (%ecx); \
|
||||
orl $-1, %eax; \
|
||||
jmp L(pseudo_end);
|
||||
#endif /* _LIBC_REENTRANT */
|
||||
# endif /* _LIBC_REENTRANT */
|
||||
#endif /* PIC */
|
||||
|
||||
/* Linux takes system call arguments in registers:
|
||||
|
Reference in New Issue
Block a user