aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-03-30 16:30:49 +0000
committerUlrich Drepper <drepper@redhat.com>2000-03-30 16:30:49 +0000
commitdacc8ffa420575038f04c543c31065fea81d5732 (patch)
treee48ee55d563a39779776f3c7e02d76bc05a4cbb4 /sysdeps/i386
parent38e986ecd8aba6953cfa4e7f104c671100f00999 (diff)
downloadglibc-dacc8ffa420575038f04c543c31065fea81d5732.tar
glibc-dacc8ffa420575038f04c543c31065fea81d5732.tar.gz
glibc-dacc8ffa420575038f04c543c31065fea81d5732.tar.bz2
glibc-dacc8ffa420575038f04c543c31065fea81d5732.zip
Update.
2000-03-30 Ulrich Drepper <drepper@redhat.com> Implement dynamic determination of constructor/destructor order in the dynamic linker. * elf/Versions [ld.so] (GLIBC_2.0): Remove _dl_init_next. (GLIBC_2.2): Add _dl_init. * elf/dl-close.c: Also call all destructors in FINI_ARRAY. r_duplist is not anymore allocated separately. l_initfini is and therefore free it if necessary. * elf/dl-deps.c: If a searchlist has to be allocated, put all in one malloc block. Otherwise allocate l_initfini list only. Put dependencies for the object in l_initfini list. Sort dependencies for the object to be loaded topologically. * elf/dl-fini.c: Before running the destructors sort the topologically. * elf/dl-init.c (_dl_init): Renamed from _dl_init_next. Rewrite to call constructors instead of iterating over the pointers. Get list of objects for which to run constructors from l_initfini element. Accept argc, argv, and env as parameters and pass them to the constructors. * elf/ld-load.c (_dl_map_object_from_fd): Initialize l_ldnum member with size of dynamic section. * elf/dl-open.c (dl_open_worker): Only call _dl_init instead of _dl_init_next and calling constructors ourself. * elf/dl-preinit.c (_dl_preinit): Renamed from _dl_preinit_next. Take argc, argv, and env as parameters and pass them to the constructors. Rewrite to call all constructors and not iterate over the pointers. * elf/dynamic-link.h: Don't relocate DT_FINI_ARRAY entry. Don't precompute l_initcount and l_preinitcount. * elf/link.h (struct link_map): Add l_ldnum member. Make l_phdr_allocated part of the bitfield. Remove l_runcount, l_initcount, and l_preinitcount. Add l_initfini. * sysdeps/generic/ldsodefs.h: Replace _dl_init_next prototype with one for _dl_init. * sysdeps/i386/dl-machine (RTLD_START): Rewrite to match new init function interface. * sysdeps/unix/sysv/linux/init-first.h: Removed. * sysdeps/unix/sysv/linux/Dist: Delete file here as well. * sysdeps/unix/sysv/linux/init-first.c [PIC]: Don't use SYSDEP_CALL_INIT. Make _init a strong alias of init. The calling conventions now match. * sysdeps/generic/libc-start.c: Calling __libc_init_first has no effect for shared objects. Don't emit message and call only for static library.
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/dl-machine.h64
1 files changed, 25 insertions, 39 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 351b82af32..1256fbcdc0 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. i386 version.
- Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 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
@@ -217,47 +217,33 @@ _dl_start_user:\n\
movl _dl_skip_args@GOT(%ebx), %eax\n\
movl (%eax), %eax\n\
# Pop the original argument count.\n\
- popl %ecx\n\
+ popl %esi\n\
# Subtract _dl_skip_args from it.\n\
- subl %eax, %ecx\n\
+ subl %eax, %esi\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\
- # Push the searchlist of the main object as argument in\n\
- # _dl_init_next call below.\n\
- movl _dl_main_searchlist@GOT(%ebx), %eax\n\
- movl (%eax), %esi\n\
- # First run the pre-initializers.\n\
-0: movl %esi,%eax\n\
- # Call _dl_init_next to return the address of an initializer\n\
- # function to run.\n\
- call _dl_preinit_next@PLT\n\
- # Check for zero return, when out of initializers.\n\
- testl %eax, %eax\n\
- jz 0f\n\
- # Call the pre-initilizer.\n\
- call *%eax\n\
- # Loop to call _dl_preinit_next for the next initializer.\n\
- jmp 0b\n\
-0: movl %esi,%eax\n\
- # Call _dl_init_next to return the address of an initializer\n\
- # function to run.\n\
- call _dl_init_next@PLT\n\
- # Check for zero return, when out of initializers.\n\
- testl %eax, %eax\n\
- jz 1f\n\
- # Call the shared object initializer function.\n\
- # NOTE: We depend only on the registers (%ebx, %esi and %edi)\n\
- # 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\
-1: # Clear the startup flag.\n\
+ # Move the argv pointer in a register.\n\
+ leal 4(%esp,%esi,4), %edx\n\
+ movl %esp, %ecx\n\
+ pushl %edx\n\
+ movl %esi, %edx\n\
+ # Get the searchlist of the main object as argument for\n\
+ # _dl_preinit and _dl_init calls below.\n\
+ movl _dl_loaded@GOT(%ebx), %ebp\n\
+ movl (%ebp), %eax\n\
+ # Call the function to run the pre-initializers.\n\
+ call _dl_preinit@PLT\n\
+ # Load the parameters again.\n\
+ leal 4(%esp,%esi,4), %edx\n\
+ movl %esp, %ecx\n\
+ pushl %edx\n\
+ movl %esi, %edx\n\
+ movl (%ebp), %eax\n\
+ # Call the function to run the initializers.\n\
+ call _dl_init@PLT\n\
+ # Push argc back on the stack.\n\
+ push %esi\n\
+ # Clear the startup flag.\n\
movl _dl_starting_up@GOT(%ebx), %eax\n\
movl $0, (%eax)\n\
# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\