1995-05-02 06:35:55 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. i386 version.
|
1997-01-28 03:59:29 +00:00
|
|
|
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
1996-12-04 01:41:39 +00:00
|
|
|
This file is part of the GNU C Library.
|
1995-05-02 06:35:55 +00:00
|
|
|
|
1996-12-04 01:41:39 +00:00
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public License as
|
|
|
|
published by the Free Software Foundation; either version 2 of the
|
|
|
|
License, or (at your option) any later version.
|
1995-05-02 06:35:55 +00:00
|
|
|
|
1996-12-04 01:41:39 +00:00
|
|
|
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
|
|
|
|
Library General Public License for more details.
|
1995-05-02 06:35:55 +00:00
|
|
|
|
1996-12-04 01:41:39 +00:00
|
|
|
You should have received a copy of the GNU Library General Public
|
1996-12-22 00:32:43 +00:00
|
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1995-05-02 06:35:55 +00:00
|
|
|
|
1996-07-14 11:39:25 +00:00
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
1995-05-02 06:35:55 +00:00
|
|
|
#define ELF_MACHINE_NAME "i386"
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
/* Return nonzero iff E_MACHINE is compatible with the running host. */
|
1996-08-02 05:27:50 +00:00
|
|
|
static inline int __attribute__ ((unused))
|
1995-05-02 06:35:55 +00:00
|
|
|
elf_machine_matches_host (Elf32_Half e_machine)
|
|
|
|
{
|
|
|
|
switch (e_machine)
|
|
|
|
{
|
|
|
|
case EM_386:
|
|
|
|
case EM_486:
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1996-12-04 01:41:39 +00:00
|
|
|
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
|
|
|
|
first element of the GOT. This must be inlined in a function which
|
|
|
|
uses global data. */
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_dynamic (void)
|
1995-05-02 06:35:55 +00:00
|
|
|
{
|
|
|
|
register Elf32_Addr *got asm ("%ebx");
|
1996-12-04 01:41:39 +00:00
|
|
|
return *got;
|
1995-05-02 06:35:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
1996-08-02 05:27:50 +00:00
|
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
1995-05-02 06:35:55 +00:00
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
|
|
|
Elf32_Addr addr;
|
|
|
|
asm (" call here\n"
|
|
|
|
"here: popl %0\n"
|
|
|
|
" subl $here, %0"
|
|
|
|
: "=r" (addr));
|
|
|
|
return addr;
|
|
|
|
}
|
|
|
|
/* The `subl' insn above will contain an R_386_32 relocation entry
|
|
|
|
intended to insert the run-time address of the label `here'.
|
|
|
|
This will be the first relocation in the text of the dynamic linker;
|
|
|
|
we skip it to avoid trying to modify read-only text in this early stage. */
|
|
|
|
#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \
|
1995-09-01 22:25:08 +00:00
|
|
|
++(const Elf32_Rel *) (dynamic_info)[DT_REL]->d_un.d_ptr; \
|
1995-08-31 00:02:32 +00:00
|
|
|
(dynamic_info)[DT_RELSZ]->d_un.d_val -= sizeof (Elf32_Rel);
|
1995-05-02 06:35:55 +00:00
|
|
|
|
|
|
|
|
1997-03-21 20:00:48 +00:00
|
|
|
#ifndef PROF
|
1997-01-28 03:59:29 +00:00
|
|
|
/* We add a declaration of this function here so that in dl-runtime.c
|
|
|
|
the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters
|
1997-03-21 20:00:48 +00:00
|
|
|
in registers.
|
|
|
|
|
|
|
|
We cannot use this scheme for profiling because the _mcount call
|
|
|
|
destroys the passed register information. */
|
1997-01-28 03:59:29 +00:00
|
|
|
static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset)
|
|
|
|
__attribute__ ((regparm (2), unused));
|
1997-03-21 20:00:48 +00:00
|
|
|
#endif
|
1997-01-28 03:59:29 +00:00
|
|
|
|
1995-05-02 06:35:55 +00:00
|
|
|
/* Set up the loaded object described by L so its unrelocated PLT
|
|
|
|
entries will jump to the on-demand fixup code in dl-runtime.c. */
|
|
|
|
|
1996-08-02 05:27:50 +00:00
|
|
|
static inline void __attribute__ ((unused))
|
1996-01-07 10:00:21 +00:00
|
|
|
elf_machine_runtime_setup (struct link_map *l, int lazy)
|
1995-05-02 06:35:55 +00:00
|
|
|
{
|
1995-05-31 13:23:14 +00:00
|
|
|
Elf32_Addr *got;
|
1995-05-02 06:35:55 +00:00
|
|
|
extern void _dl_runtime_resolve (Elf32_Word);
|
1995-05-31 13:23:14 +00:00
|
|
|
|
1996-01-07 10:00:21 +00:00
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
|
|
{
|
|
|
|
/* The GOT entries for functions in the PLT have not yet been filled
|
|
|
|
in. Their initial contents will arrange when called to push an
|
|
|
|
offset into the .rel.plt section, push _GLOBAL_OFFSET_TABLE_[1],
|
|
|
|
and then jump to _GLOBAL_OFFSET_TABLE[2]. */
|
|
|
|
got = (Elf32_Addr *) (l->l_addr + l->l_info[DT_PLTGOT]->d_un.d_ptr);
|
|
|
|
got[1] = (Elf32_Addr) l; /* Identify this shared object. */
|
|
|
|
/* This function will get called to fix up the GOT entry indicated by
|
|
|
|
the offset on the stack, and then jump to the resolved address. */
|
|
|
|
got[2] = (Elf32_Addr) &_dl_runtime_resolve;
|
|
|
|
}
|
1995-05-02 06:35:55 +00:00
|
|
|
|
1997-01-28 03:59:29 +00:00
|
|
|
|
1996-02-13 07:05:16 +00:00
|
|
|
/* This code is used in dl-runtime.c to call the `fixup' function
|
|
|
|
and then redirect to the address it returns. */
|
1997-03-21 20:00:48 +00:00
|
|
|
#ifndef PROF
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
1996-02-13 07:05:16 +00:00
|
|
|
.globl _dl_runtime_resolve
|
|
|
|
.type _dl_runtime_resolve, @function
|
|
|
|
_dl_runtime_resolve:
|
1997-01-28 03:59:29 +00:00
|
|
|
pushl %eax # Preserve registers otherwise clobbered.
|
|
|
|
pushl %ecx
|
|
|
|
pushl %edx
|
|
|
|
movl 16(%esp), %edx # Copy args pushed by PLT in register. Note
|
|
|
|
movl 12(%esp), %eax # that `fixup' takes its parameters in regs.
|
|
|
|
call fixup # Call resolver.
|
|
|
|
popl %edx # Get register content back.
|
|
|
|
popl %ecx
|
|
|
|
xchgl %eax, (%esp) # Get %eax contents end store function address.
|
|
|
|
ret $8 # Jump to function address.
|
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve
|
1996-02-13 07:05:16 +00:00
|
|
|
");
|
1997-03-21 20:00:48 +00:00
|
|
|
#else
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
|
|
.globl _dl_runtime_resolve
|
|
|
|
.type _dl_runtime_resolve, @function
|
|
|
|
_dl_runtime_resolve:
|
|
|
|
pushl %eax # Preserve registers otherwise clobbered.
|
|
|
|
pushl %ecx
|
|
|
|
pushl %edx
|
|
|
|
movl 16(%esp), %edx # Push the arguments for `fixup'
|
|
|
|
movl 12(%esp), %eax
|
|
|
|
pushl %edx
|
|
|
|
pushl %eax
|
|
|
|
call fixup # Call resolver.
|
|
|
|
popl %edx # Pop the parameters
|
|
|
|
popl %ecx
|
|
|
|
popl %edx # Get register content back.
|
|
|
|
popl %ecx
|
|
|
|
xchgl %eax, (%esp) # Get %eax contents end store function address.
|
|
|
|
ret $8 # Jump to function address.
|
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve
|
|
|
|
");
|
|
|
|
#endif
|
1996-02-13 07:05:16 +00:00
|
|
|
/* The PLT uses Elf32_Rel relocs. */
|
|
|
|
#define elf_machine_relplt elf_machine_rel
|
|
|
|
}
|
1995-05-02 06:35:55 +00:00
|
|
|
|
1995-06-08 09:00:23 +00:00
|
|
|
/* Mask identifying addresses reserved for the user program,
|
|
|
|
where the dynamic linker should not map anything. */
|
|
|
|
#define ELF_MACHINE_USER_ADDRESS_MASK 0xf8000000UL
|
|
|
|
|
|
|
|
|
|
|
|
|
1995-05-02 06:35:55 +00:00
|
|
|
/* Initial entry point code for the dynamic linker.
|
|
|
|
The C function `_dl_start' is the real entry point;
|
|
|
|
its return value is the user program's entry point. */
|
|
|
|
|
|
|
|
#define RTLD_START asm ("\
|
|
|
|
.text\n\
|
|
|
|
.globl _start\n\
|
1995-05-08 09:11:25 +00:00
|
|
|
.globl _dl_start_user\n\
|
|
|
|
_start:\n\
|
1996-06-12 01:54:21 +00:00
|
|
|
pushl %esp\n\
|
1995-05-08 09:11:25 +00:00
|
|
|
call _dl_start\n\
|
1996-06-12 01:54:21 +00:00
|
|
|
popl %ebx\n\
|
1995-05-08 09:11:25 +00:00
|
|
|
_dl_start_user:\n\
|
|
|
|
# Save the user entry point address in %edi.\n\
|
|
|
|
movl %eax, %edi\n\
|
|
|
|
# Point %ebx at the GOT.
|
1995-05-31 13:23:14 +00:00
|
|
|
call 0f\n\
|
|
|
|
0: popl %ebx\n\
|
|
|
|
addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx\n\
|
|
|
|
# See if we were run as a command with the executable file\n\
|
|
|
|
# name as an extra leading argument.\n\
|
1995-09-28 18:42:29 +00:00
|
|
|
movl _dl_skip_args@GOT(%ebx), %eax\n\
|
update from main archive 960906
Sat Sep 7 05:15:45 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
* libio/iofopen: Likewise.
* libio/iofopncook.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/memstream.c: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vdprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
Sat Sep 7 03:55:47 1996 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig (soversions.mk): Also use shlib-versions files
in add-on directories.
* config.make.in (config-defines): Remove. Not used anymore.
(defines): New variable. Initiliazed by @DEFINES@.
* configure.in: Add AC_SUBST(DEFINES).
* libio/Makefile (routines): When compiling reentrant libc add
clearerr_u, feof_u, ferror_u, fputc_u, getc_u, getchar_u,
iofflush_u, putc_u, putchar_u, ioflockfile.
(CPPFLAGS): Add -D_IO_MTSAFE_IO for reentrant libc.
* sysdeps/stub/libc-lock.h: Add stubs for __libc_cleanup_region_start
and __libc_cleanup_region_end.
* sysdeps/unix/i386/sysdep.S [_LIBC_REENTRANT]: Set errno
using __errno_location function.
* sysdeps/unix/sysv/linux/i386/sysdep.S [_LIBC_REENTRANT]: Set errno
using __errno_location function.
(__errno_location): New function.
* sysdeps/unix/sysv/linux/i386/sysdep.h [PIC]: Add second
syscall_error handler for reentrant libc.
* sysdeps/unix/opendir.c: Remove unneeded `;'.
* libio.h [_IO_MTSAFE_IO]: Include <pthread.h>.
[!_IO_MTSAFE_IO]: Define _IO_flockfile and _IO_funlockfile
as empty macros.
* libioP.h: Include <libc-lock.h>.
* libio/stdio.h: Add prototypes for *_locked and *_unlocked
functions.
* libio/clearerr.c: Use _IO_ protected versions of flockfile
and funlockfile to be namespace clean.
* libio/genops.c: Use __libc_lock_* macros for handling lock.
* libio/iofdopen: Add initialization of _lock in _IO_FILE.
* libio/iofopen: Likewise.
* libio/iofopncook.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/memstream.c: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vdprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
* libio/fgetc.c: Use __libc_cleanup_region_* macros instead
of flockfile etc.
* libio/fputc.c: Likewise.
* libio/freopen.c: Likewise.
* libio/fseek.c: Likewise.
* libio/getc.c: Likewise.
* libio/getchar.c: Likewise.
* libio/iofclose.c: Likewise.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/putc.c: Likewise.
* libio/putchar.c: Likewise.
* libio/rewind.c: Likewise.
* stdio-common/vfprintf.c: Likewise.
* stdio-common/vfscanf.c: Likewise.
* libio/clearerr_u.c: Correct alias name.
* libio/ferror_u.c: Likewise.
* libio/fileno.c: Likewise.
* libio/fputc_u.c: Likewise.
* libio/getc.c: Likewise.
* libio/getc_u.c: Likewise.
* libio/getchar.c: Likewise.
* libio/getchar_u.c: Likewise.
* libio/putc.c: Likewise.
* libio/putchar.c: Likewise.
* libio/feof_u.c: Undefine macro with name of function before
definition of function itself.
* libio/ioflockfile.c: New file. Implementation of flockfile and
funlockfile.
* libio/putchar_u.c: Fix typo. Use stdout instead of fp.
* malloc/malloc.h: Don't include <libc-lock.h> and don't declare
_malloc_loc.
* malloc/free.c: Include <libc-lock.h>.
* malloc/realloc.c: Likewise.
* malloc/malloc-find.c: Likewise.
* malloc/malloc-size.c: Likewise.
* malloc/malloc-walk.c: Likewise.
* malloc/memalign.c: Likewise.
* malloc/malloc.c: Likewise.
* sysdeps/i386/dl-machine.h: Correct clearing of _dl_starting_up.
Fri Sep 6 19:38:49 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/stub/libc-lock.h: Define __libc_lock_critical_start
and __libc_lock_critical_end as empty macros.
* malloc/malloc.h: Don't include <libc-lock.h> and don't declare
__libc_malloc_lock.
* malloc/free.c: Include <libc-lock.h>.
* malloc/malloc-find.c: Likewise.
* malloc/malloc-size.c: Likewise.
* malloc/malloc-walk.c: Likewise.
* malloc/malloc.c: Likewise.
* malloc/memalign.c: Likewise.
* malloc/realloc.c: Likewise.
* Makefile: Undo change from Mon Sep 2 22:15:14 1996. No more
extra_solibs pass.
* Rules: Likewise.
* extra-lib.mk: Likewise.
* manual/Makefile: Likewise.
* db/Makefile (makedb): Choose dependecies based on build-shared.
Patch by Andres Schwab.
* sysdeps/posix/sysconf.c: Don't use PTHREAD_DESTRUCTOR_ITERATIONS
but _POSIX_THREAD_DESTRUCTOR_ITERATIONS.
* sysdeps/unix/sysv/linux/errnos.h: New file.
* sysdeps/unix/sysv/linux/schedbits.h: New file.
* sysdeps/unix/sysv/linux/waitflags.h: New file.
* sysdeps/unix/sysv/linux/gnu/types.h: Add definition of `key_t'.
Fri Sep 6 08:26:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* rpm/template: Fix typo in %build section.
Fri Sep 6 03:31:07 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/errnos.h: Don't define errno macro when
building libc without thread support.
* resolv/netdb.h: Likewise for h_errno macro.
Thu Sep 5 23:01:48 1996 Ulrich Drepper <drepper@cygnus.com>
* libc-symbols.h: Add new macro weak_const_function. It's like
weak_function, but the function is additionally marked as const.
* features.h: Only include <sys/cdefs.h> if !__ASSEMBLER__.
Thu Sep 5 22:55:49 1996 Richard Henderson <rth@tamu.edu>
* inet/herrno.c (__h_errno_location): New function.
(h_errno): Make strong_alias __h_errno so that we can access
the variable even if `h_errno' is a macro.
* resolv/netdb.h: Define macro h_errno to access thread specific
version of h_errno variable. Declare alias __h_errno for h_errno.
* resolv/res_query (h_errno): Remove definition.
* sysdeps/unix/sysv/linux/errnos.h [!__ASSEMBLER__ && __USE_REENTRANT]:
Add macro `errno' to get thread specific variable.
* sysdeps/unix/alpha/sysdep.S [_LIBC_REENTRANT]: Set errno using
__errno_location function.
(__errno_location): New function.
Thu Sep 5 21:08:44 1996 Ulrich Drepper <drepper@cygnus.com>
* posix/gnu/types.h: Remove definition of key_t.
* sysdeps/generic/gnu/types.h: Move it to here.
* sysdeps/unix/sysv/linux/gnu/types.h: Add Linux specific
definition of key_t.
* sysdeps/unix/sysv/linux/waitflags.h: New file. Linux specific
definitions.
* sysdeps/unix/sysv/linux/schedbits.h: New file. Include
clone prototypes and associated flags.
Thu Sep 5 08:58:47 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/alpha/elf/start.S: Make _start global again.
hertz.
here.
Wed Sep 4 16:16:13 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/send.c (__send): De-ANSI-fy.
* sysdeps/mach/hurd/sendto.c (sendto): Likewise.
1996-09-07 04:10:57 +00:00
|
|
|
movl (%eax), %eax\n\
|
1995-09-28 18:42:29 +00:00
|
|
|
# Pop the original argument count.\n\
|
|
|
|
popl %ecx\n\
|
|
|
|
# Subtract _dl_skip_args from it.\n\
|
|
|
|
subl %eax, %ecx\n\
|
|
|
|
# Adjust the stack pointer to skip _dl_skip_args words.\n\
|
|
|
|
leal (%esp,%eax,4), %esp\n\
|
|
|
|
# Push back the modified argument count.\n\
|
|
|
|
pushl %ecx\n\
|
1996-06-10 20:19:39 +00:00
|
|
|
# Push _dl_default_scope[2] as argument in _dl_init_next call below.\n\
|
|
|
|
movl _dl_default_scope@GOT(%ebx), %eax\n\
|
|
|
|
movl 8(%eax), %esi\n\
|
1996-06-04 23:06:02 +00:00
|
|
|
0: pushl %esi\n\
|
1995-05-02 06:35:55 +00:00
|
|
|
# Call _dl_init_next to return the address of an initializer\n\
|
|
|
|
# function to run.\n\
|
1996-06-04 23:06:02 +00:00
|
|
|
call _dl_init_next@PLT\n\
|
|
|
|
addl $4, %esp # Pop argument.\n\
|
1995-05-02 06:35:55 +00:00
|
|
|
# Check for zero return, when out of initializers.\n\
|
update from main archive 960906
Sat Sep 7 05:15:45 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
* libio/iofopen: Likewise.
* libio/iofopncook.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/memstream.c: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vdprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
Sat Sep 7 03:55:47 1996 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig (soversions.mk): Also use shlib-versions files
in add-on directories.
* config.make.in (config-defines): Remove. Not used anymore.
(defines): New variable. Initiliazed by @DEFINES@.
* configure.in: Add AC_SUBST(DEFINES).
* libio/Makefile (routines): When compiling reentrant libc add
clearerr_u, feof_u, ferror_u, fputc_u, getc_u, getchar_u,
iofflush_u, putc_u, putchar_u, ioflockfile.
(CPPFLAGS): Add -D_IO_MTSAFE_IO for reentrant libc.
* sysdeps/stub/libc-lock.h: Add stubs for __libc_cleanup_region_start
and __libc_cleanup_region_end.
* sysdeps/unix/i386/sysdep.S [_LIBC_REENTRANT]: Set errno
using __errno_location function.
* sysdeps/unix/sysv/linux/i386/sysdep.S [_LIBC_REENTRANT]: Set errno
using __errno_location function.
(__errno_location): New function.
* sysdeps/unix/sysv/linux/i386/sysdep.h [PIC]: Add second
syscall_error handler for reentrant libc.
* sysdeps/unix/opendir.c: Remove unneeded `;'.
* libio.h [_IO_MTSAFE_IO]: Include <pthread.h>.
[!_IO_MTSAFE_IO]: Define _IO_flockfile and _IO_funlockfile
as empty macros.
* libioP.h: Include <libc-lock.h>.
* libio/stdio.h: Add prototypes for *_locked and *_unlocked
functions.
* libio/clearerr.c: Use _IO_ protected versions of flockfile
and funlockfile to be namespace clean.
* libio/genops.c: Use __libc_lock_* macros for handling lock.
* libio/iofdopen: Add initialization of _lock in _IO_FILE.
* libio/iofopen: Likewise.
* libio/iofopncook.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/memstream.c: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vdprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
* libio/fgetc.c: Use __libc_cleanup_region_* macros instead
of flockfile etc.
* libio/fputc.c: Likewise.
* libio/freopen.c: Likewise.
* libio/fseek.c: Likewise.
* libio/getc.c: Likewise.
* libio/getchar.c: Likewise.
* libio/iofclose.c: Likewise.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/putc.c: Likewise.
* libio/putchar.c: Likewise.
* libio/rewind.c: Likewise.
* stdio-common/vfprintf.c: Likewise.
* stdio-common/vfscanf.c: Likewise.
* libio/clearerr_u.c: Correct alias name.
* libio/ferror_u.c: Likewise.
* libio/fileno.c: Likewise.
* libio/fputc_u.c: Likewise.
* libio/getc.c: Likewise.
* libio/getc_u.c: Likewise.
* libio/getchar.c: Likewise.
* libio/getchar_u.c: Likewise.
* libio/putc.c: Likewise.
* libio/putchar.c: Likewise.
* libio/feof_u.c: Undefine macro with name of function before
definition of function itself.
* libio/ioflockfile.c: New file. Implementation of flockfile and
funlockfile.
* libio/putchar_u.c: Fix typo. Use stdout instead of fp.
* malloc/malloc.h: Don't include <libc-lock.h> and don't declare
_malloc_loc.
* malloc/free.c: Include <libc-lock.h>.
* malloc/realloc.c: Likewise.
* malloc/malloc-find.c: Likewise.
* malloc/malloc-size.c: Likewise.
* malloc/malloc-walk.c: Likewise.
* malloc/memalign.c: Likewise.
* malloc/malloc.c: Likewise.
* sysdeps/i386/dl-machine.h: Correct clearing of _dl_starting_up.
Fri Sep 6 19:38:49 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/stub/libc-lock.h: Define __libc_lock_critical_start
and __libc_lock_critical_end as empty macros.
* malloc/malloc.h: Don't include <libc-lock.h> and don't declare
__libc_malloc_lock.
* malloc/free.c: Include <libc-lock.h>.
* malloc/malloc-find.c: Likewise.
* malloc/malloc-size.c: Likewise.
* malloc/malloc-walk.c: Likewise.
* malloc/malloc.c: Likewise.
* malloc/memalign.c: Likewise.
* malloc/realloc.c: Likewise.
* Makefile: Undo change from Mon Sep 2 22:15:14 1996. No more
extra_solibs pass.
* Rules: Likewise.
* extra-lib.mk: Likewise.
* manual/Makefile: Likewise.
* db/Makefile (makedb): Choose dependecies based on build-shared.
Patch by Andres Schwab.
* sysdeps/posix/sysconf.c: Don't use PTHREAD_DESTRUCTOR_ITERATIONS
but _POSIX_THREAD_DESTRUCTOR_ITERATIONS.
* sysdeps/unix/sysv/linux/errnos.h: New file.
* sysdeps/unix/sysv/linux/schedbits.h: New file.
* sysdeps/unix/sysv/linux/waitflags.h: New file.
* sysdeps/unix/sysv/linux/gnu/types.h: Add definition of `key_t'.
Fri Sep 6 08:26:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* rpm/template: Fix typo in %build section.
Fri Sep 6 03:31:07 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/errnos.h: Don't define errno macro when
building libc without thread support.
* resolv/netdb.h: Likewise for h_errno macro.
Thu Sep 5 23:01:48 1996 Ulrich Drepper <drepper@cygnus.com>
* libc-symbols.h: Add new macro weak_const_function. It's like
weak_function, but the function is additionally marked as const.
* features.h: Only include <sys/cdefs.h> if !__ASSEMBLER__.
Thu Sep 5 22:55:49 1996 Richard Henderson <rth@tamu.edu>
* inet/herrno.c (__h_errno_location): New function.
(h_errno): Make strong_alias __h_errno so that we can access
the variable even if `h_errno' is a macro.
* resolv/netdb.h: Define macro h_errno to access thread specific
version of h_errno variable. Declare alias __h_errno for h_errno.
* resolv/res_query (h_errno): Remove definition.
* sysdeps/unix/sysv/linux/errnos.h [!__ASSEMBLER__ && __USE_REENTRANT]:
Add macro `errno' to get thread specific variable.
* sysdeps/unix/alpha/sysdep.S [_LIBC_REENTRANT]: Set errno using
__errno_location function.
(__errno_location): New function.
Thu Sep 5 21:08:44 1996 Ulrich Drepper <drepper@cygnus.com>
* posix/gnu/types.h: Remove definition of key_t.
* sysdeps/generic/gnu/types.h: Move it to here.
* sysdeps/unix/sysv/linux/gnu/types.h: Add Linux specific
definition of key_t.
* sysdeps/unix/sysv/linux/waitflags.h: New file. Linux specific
definitions.
* sysdeps/unix/sysv/linux/schedbits.h: New file. Include
clone prototypes and associated flags.
Thu Sep 5 08:58:47 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/alpha/elf/start.S: Make _start global again.
hertz.
here.
Wed Sep 4 16:16:13 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/send.c (__send): De-ANSI-fy.
* sysdeps/mach/hurd/sendto.c (sendto): Likewise.
1996-09-07 04:10:57 +00:00
|
|
|
testl %eax, %eax\n\
|
1995-05-02 06:35:55 +00:00
|
|
|
jz 1f\n\
|
|
|
|
# Call the shared object initializer function.\n\
|
1996-06-04 23:06:02 +00:00
|
|
|
# NOTE: We depend only on the registers (%ebx, %esi and %edi)\n\
|
1995-05-02 06:35:55 +00:00
|
|
|
# and the return address pushed by this call;\n\
|
|
|
|
# the initializer is called with the stack just\n\
|
|
|
|
# as it appears on entry, and it is free to move\n\
|
|
|
|
# the stack around, as long as it winds up jumping to\n\
|
|
|
|
# the return address on the top of the stack.\n\
|
|
|
|
call *%eax\n\
|
|
|
|
# Loop to call _dl_init_next for the next initializer.\n\
|
|
|
|
jmp 0b\n\
|
1996-08-19 01:07:44 +00:00
|
|
|
1: # Clear the startup flag.\n\
|
update from main archive 960906
Sat Sep 7 05:15:45 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
* libio/iofopen: Likewise.
* libio/iofopncook.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/memstream.c: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vdprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
Sat Sep 7 03:55:47 1996 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig (soversions.mk): Also use shlib-versions files
in add-on directories.
* config.make.in (config-defines): Remove. Not used anymore.
(defines): New variable. Initiliazed by @DEFINES@.
* configure.in: Add AC_SUBST(DEFINES).
* libio/Makefile (routines): When compiling reentrant libc add
clearerr_u, feof_u, ferror_u, fputc_u, getc_u, getchar_u,
iofflush_u, putc_u, putchar_u, ioflockfile.
(CPPFLAGS): Add -D_IO_MTSAFE_IO for reentrant libc.
* sysdeps/stub/libc-lock.h: Add stubs for __libc_cleanup_region_start
and __libc_cleanup_region_end.
* sysdeps/unix/i386/sysdep.S [_LIBC_REENTRANT]: Set errno
using __errno_location function.
* sysdeps/unix/sysv/linux/i386/sysdep.S [_LIBC_REENTRANT]: Set errno
using __errno_location function.
(__errno_location): New function.
* sysdeps/unix/sysv/linux/i386/sysdep.h [PIC]: Add second
syscall_error handler for reentrant libc.
* sysdeps/unix/opendir.c: Remove unneeded `;'.
* libio.h [_IO_MTSAFE_IO]: Include <pthread.h>.
[!_IO_MTSAFE_IO]: Define _IO_flockfile and _IO_funlockfile
as empty macros.
* libioP.h: Include <libc-lock.h>.
* libio/stdio.h: Add prototypes for *_locked and *_unlocked
functions.
* libio/clearerr.c: Use _IO_ protected versions of flockfile
and funlockfile to be namespace clean.
* libio/genops.c: Use __libc_lock_* macros for handling lock.
* libio/iofdopen: Add initialization of _lock in _IO_FILE.
* libio/iofopen: Likewise.
* libio/iofopncook.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/memstream.c: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vdprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
* libio/fgetc.c: Use __libc_cleanup_region_* macros instead
of flockfile etc.
* libio/fputc.c: Likewise.
* libio/freopen.c: Likewise.
* libio/fseek.c: Likewise.
* libio/getc.c: Likewise.
* libio/getchar.c: Likewise.
* libio/iofclose.c: Likewise.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/putc.c: Likewise.
* libio/putchar.c: Likewise.
* libio/rewind.c: Likewise.
* stdio-common/vfprintf.c: Likewise.
* stdio-common/vfscanf.c: Likewise.
* libio/clearerr_u.c: Correct alias name.
* libio/ferror_u.c: Likewise.
* libio/fileno.c: Likewise.
* libio/fputc_u.c: Likewise.
* libio/getc.c: Likewise.
* libio/getc_u.c: Likewise.
* libio/getchar.c: Likewise.
* libio/getchar_u.c: Likewise.
* libio/putc.c: Likewise.
* libio/putchar.c: Likewise.
* libio/feof_u.c: Undefine macro with name of function before
definition of function itself.
* libio/ioflockfile.c: New file. Implementation of flockfile and
funlockfile.
* libio/putchar_u.c: Fix typo. Use stdout instead of fp.
* malloc/malloc.h: Don't include <libc-lock.h> and don't declare
_malloc_loc.
* malloc/free.c: Include <libc-lock.h>.
* malloc/realloc.c: Likewise.
* malloc/malloc-find.c: Likewise.
* malloc/malloc-size.c: Likewise.
* malloc/malloc-walk.c: Likewise.
* malloc/memalign.c: Likewise.
* malloc/malloc.c: Likewise.
* sysdeps/i386/dl-machine.h: Correct clearing of _dl_starting_up.
Fri Sep 6 19:38:49 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/stub/libc-lock.h: Define __libc_lock_critical_start
and __libc_lock_critical_end as empty macros.
* malloc/malloc.h: Don't include <libc-lock.h> and don't declare
__libc_malloc_lock.
* malloc/free.c: Include <libc-lock.h>.
* malloc/malloc-find.c: Likewise.
* malloc/malloc-size.c: Likewise.
* malloc/malloc-walk.c: Likewise.
* malloc/malloc.c: Likewise.
* malloc/memalign.c: Likewise.
* malloc/realloc.c: Likewise.
* Makefile: Undo change from Mon Sep 2 22:15:14 1996. No more
extra_solibs pass.
* Rules: Likewise.
* extra-lib.mk: Likewise.
* manual/Makefile: Likewise.
* db/Makefile (makedb): Choose dependecies based on build-shared.
Patch by Andres Schwab.
* sysdeps/posix/sysconf.c: Don't use PTHREAD_DESTRUCTOR_ITERATIONS
but _POSIX_THREAD_DESTRUCTOR_ITERATIONS.
* sysdeps/unix/sysv/linux/errnos.h: New file.
* sysdeps/unix/sysv/linux/schedbits.h: New file.
* sysdeps/unix/sysv/linux/waitflags.h: New file.
* sysdeps/unix/sysv/linux/gnu/types.h: Add definition of `key_t'.
Fri Sep 6 08:26:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* rpm/template: Fix typo in %build section.
Fri Sep 6 03:31:07 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/errnos.h: Don't define errno macro when
building libc without thread support.
* resolv/netdb.h: Likewise for h_errno macro.
Thu Sep 5 23:01:48 1996 Ulrich Drepper <drepper@cygnus.com>
* libc-symbols.h: Add new macro weak_const_function. It's like
weak_function, but the function is additionally marked as const.
* features.h: Only include <sys/cdefs.h> if !__ASSEMBLER__.
Thu Sep 5 22:55:49 1996 Richard Henderson <rth@tamu.edu>
* inet/herrno.c (__h_errno_location): New function.
(h_errno): Make strong_alias __h_errno so that we can access
the variable even if `h_errno' is a macro.
* resolv/netdb.h: Define macro h_errno to access thread specific
version of h_errno variable. Declare alias __h_errno for h_errno.
* resolv/res_query (h_errno): Remove definition.
* sysdeps/unix/sysv/linux/errnos.h [!__ASSEMBLER__ && __USE_REENTRANT]:
Add macro `errno' to get thread specific variable.
* sysdeps/unix/alpha/sysdep.S [_LIBC_REENTRANT]: Set errno using
__errno_location function.
(__errno_location): New function.
Thu Sep 5 21:08:44 1996 Ulrich Drepper <drepper@cygnus.com>
* posix/gnu/types.h: Remove definition of key_t.
* sysdeps/generic/gnu/types.h: Move it to here.
* sysdeps/unix/sysv/linux/gnu/types.h: Add Linux specific
definition of key_t.
* sysdeps/unix/sysv/linux/waitflags.h: New file. Linux specific
definitions.
* sysdeps/unix/sysv/linux/schedbits.h: New file. Include
clone prototypes and associated flags.
Thu Sep 5 08:58:47 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/alpha/elf/start.S: Make _start global again.
hertz.
here.
Wed Sep 4 16:16:13 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/send.c (__send): De-ANSI-fy.
* sysdeps/mach/hurd/sendto.c (sendto): Likewise.
1996-09-07 04:10:57 +00:00
|
|
|
movl _dl_starting_up@GOT(%ebx), %eax\n\
|
|
|
|
movl $0, (%eax)\n\
|
1996-08-19 01:07:44 +00:00
|
|
|
# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
|
1995-05-31 13:23:14 +00:00
|
|
|
movl _dl_fini@GOT(%ebx), %edx\n\
|
1995-05-08 09:11:25 +00:00
|
|
|
# Jump to the user's entry point.\n\
|
|
|
|
jmp *%edi\n\
|
1995-05-02 06:35:55 +00:00
|
|
|
");
|
1996-07-14 11:39:25 +00:00
|
|
|
|
1997-03-25 02:25:35 +00:00
|
|
|
/* Nonzero iff TYPE should not be allowed to resolve to one of
|
|
|
|
the main executable's symbols, as for a COPY reloc. */
|
1997-03-23 01:54:07 +00:00
|
|
|
#define elf_machine_lookup_noexec_p(type) ((type) == R_386_COPY)
|
|
|
|
|
|
|
|
/* Nonzero iff TYPE describes relocation of a PLT entry, so
|
|
|
|
PLT entries should not be allowed to define the value. */
|
|
|
|
#define elf_machine_lookup_noplt_p(type) ((type) == R_386_JMP_SLOT)
|
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
|
|
|
#define ELF_MACHINE_RELOC_NOPLT R_386_JMP_SLOT
|
1996-07-14 11:39:25 +00:00
|
|
|
|
|
|
|
/* The i386 never uses Elf32_Rela relocations. */
|
|
|
|
#define ELF_MACHINE_NO_RELA 1
|
|
|
|
|
|
|
|
#endif /* !dl_machine_h */
|
|
|
|
|
|
|
|
#ifdef RESOLVE
|
|
|
|
|
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
|
|
MAP is the object containing the reloc. */
|
|
|
|
|
|
|
|
static inline void
|
1997-02-15 04:31:36 +00:00
|
|
|
elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
1997-02-19 04:43:53 +00:00
|
|
|
const Elf32_Sym *sym, const struct r_found_version *version)
|
1996-07-14 11:39:25 +00:00
|
|
|
{
|
|
|
|
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
|
|
|
|
|
1997-03-23 01:54:07 +00:00
|
|
|
if (ELF32_R_TYPE (reloc->r_info) == R_386_RELATIVE)
|
1996-07-14 11:39:25 +00:00
|
|
|
{
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
if (map != &_dl_rtld_map) /* Already done in rtld itself. */
|
|
|
|
#endif
|
|
|
|
*reloc_addr += map->l_addr;
|
|
|
|
}
|
1997-03-23 01:54:07 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
|
|
|
#endif
|
|
|
|
Elf32_Addr value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info));
|
|
|
|
if (sym)
|
|
|
|
value += sym->st_value;
|
|
|
|
|
|
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
|
|
{
|
|
|
|
case R_386_COPY:
|
|
|
|
memcpy (reloc_addr, (void *) value, sym->st_size);
|
|
|
|
break;
|
|
|
|
case R_386_GLOB_DAT:
|
|
|
|
case R_386_JMP_SLOT:
|
|
|
|
*reloc_addr = value;
|
|
|
|
break;
|
|
|
|
case R_386_32:
|
|
|
|
{
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
/* This is defined in rtld.c, but nowhere in the static
|
|
|
|
libc.a; make the reference weak so static programs can
|
|
|
|
still link. This declaration cannot be done when
|
|
|
|
compiling rtld.c (i.e. #ifdef RTLD_BOOTSTRAP) because
|
|
|
|
rtld.c contains the common defn for _dl_rtld_map, which
|
|
|
|
is incompatible with a weak decl in the same file. */
|
|
|
|
weak_extern (_dl_rtld_map);
|
|
|
|
if (map == &_dl_rtld_map)
|
|
|
|
/* Undo the relocation done here during bootstrapping.
|
|
|
|
Now we will relocate it anew, possibly using a
|
|
|
|
binding found in the user program or a loaded library
|
|
|
|
rather than the dynamic linker's built-in definitions
|
|
|
|
used while loading those libraries. */
|
|
|
|
value -= map->l_addr + refsym->st_value;
|
|
|
|
#endif
|
|
|
|
*reloc_addr += value;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case R_386_PC32:
|
|
|
|
*reloc_addr += (value - (Elf32_Addr) reloc_addr);
|
|
|
|
break;
|
|
|
|
case R_386_NONE: /* Alright, Wilbur. */
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
assert (! "unexpected dynamic reloc type");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1996-07-14 11:39:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
elf_machine_lazy_rel (struct link_map *map, const Elf32_Rel *reloc)
|
|
|
|
{
|
|
|
|
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
|
|
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
|
|
{
|
|
|
|
case R_386_JMP_SLOT:
|
|
|
|
*reloc_addr += map->l_addr;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
assert (! "unexpected PLT reloc type");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* RESOLVE */
|