* sysdeps/i386/dl-machine.h (RTLD_START): Remove call to _dl_preinit.
This commit is contained in:
Ulrich Drepper 2000-03-31 07:15:47 +00:00
parent d7926ed9fe
commit 758cb06107
2 changed files with 5 additions and 14 deletions

View File

@ -4,6 +4,7 @@
* elf/Versions: Remove _dl_preinit. * elf/Versions: Remove _dl_preinit.
* elf/dl-preinit.c: Removed. Move content into... * elf/dl-preinit.c: Removed. Move content into...
* elf/dl-init.c: ...here. * elf/dl-init.c: ...here.
* sysdeps/i386/dl-machine.h (RTLD_START): Remove call to _dl_preinit.
* sysdeps/generic/bits/shm.h (struct shmid_ds): Correct names of * sysdeps/generic/bits/shm.h (struct shmid_ds): Correct names of
with size of dynamic sectionelements. with size of dynamic sectionelements.

View File

@ -218,27 +218,17 @@ _dl_start_user:\n\
movl (%eax), %eax\n\ movl (%eax), %eax\n\
# Pop the original argument count.\n\ # Pop the original argument count.\n\
popl %esi\n\ popl %esi\n\
# Subtract _dl_skip_args from it.\n\
subl %eax, %esi\n\
# Adjust the stack pointer to skip _dl_skip_args words.\n\ # Adjust the stack pointer to skip _dl_skip_args words.\n\
leal (%esp,%eax,4), %esp\n\ leal (%esp,%eax,4), %esp\n\
# Move the argv pointer in a register.\n\ # Subtract _dl_skip_args from it.\n\
leal 4(%esp,%esi,4), %edx\n\ subl %eax, %esi\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\ # Load the parameters again.\n\
leal 4(%esp,%esi,4), %edx\n\ leal 4(%esp,%esi,4), %edx\n\
movl %esp, %ecx\n\ movl %esp, %ecx\n\
pushl %edx\n\ pushl %edx\n\
movl %esi, %edx\n\ movl %esi, %edx\n\
movl (%ebp), %eax\n\ movl _dl_loaded@GOT(%ebx), %eax\n\
movl (%eax), %eax\n\
# Call the function to run the initializers.\n\ # Call the function to run the initializers.\n\
call _dl_init@PLT\n\ call _dl_init@PLT\n\
# Push argc back on the stack.\n\ # Push argc back on the stack.\n\