picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

_dl_init: Remove internal_function attribute

Browse source 
The function is called from the i386 startup code, which needs minor
adjustments due to the changed ABI.
This commit is contained in:
Florian Weimer 2017-08-14 12:57:50 +02:00
parent 630bf4916f
commit b3f85fd2e4
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2017-08-14 Florian Weimer <fweimer@redhat.com>
* elf/dl-init.c (_dl_init): Remove internal_function.
* sysdeps/generic/ldsodefs.h (_dl_init): Likewise.
* sysdeps/i386/dl-machine.h (RTLD_START): Adjust call to _dl_init.
2017-08-14 Florian Weimer <fweimer@redhat.com>
* elf/rtld.c (_dl_start): Remove internal_function.

1
elf/dl-init.c
View file

@ -75,7 +75,6 @@ call_init (struct link_map *l, int argc, char **argv, char **env)
void
internal_function
_dl_init (struct link_map *main_map, int argc, char **argv, char **env)
{
ElfW(Dyn) *preinit_array = main_map->l_info[DT_PREINIT_ARRAY];

2
sysdeps/generic/ldsodefs.h
View file

@ -964,7 +964,7 @@ extern int _dl_check_map_versions (struct link_map *map, int verbose,
/* Initialize the object in SCOPE by calling the constructors with
ARGC, ARGV, and ENV as the parameters. */
extern void _dl_init (struct link_map *main_map, int argc, char **argv,
char **env) internal_function attribute_hidden;
char **env) attribute_hidden;
/* Call the finalizer functions of all shared objects whose
initializer functions have completed. */

11
sysdeps/i386/dl-machine.h
View file

@ -177,17 +177,20 @@ _dl_start_user:\n\
# switch stacks if it moves these contents over.\n\
" RTLD_START_SPECIAL_INIT "\n\
# Load the parameters again.\n\
# (eax, edx, ecx, *--esp) = (_dl_loaded, argc, argv, envp)\n\
# (eax, edx, ecx, esi) = (_dl_loaded, argc, argv, envp)\n\
movl _rtld_local@GOTOFF(%ebx), %eax\n\
leal 8(%esp,%edx,4), %esi\n\
leal 4(%esp), %ecx\n\
movl %esp, %ebp\n\
# Make sure _dl_init is run with 16 byte aligned stack.\n\
andl $-16, %esp\n\
pushl %eax\n\
pushl %eax\n\
subl $12, %esp\n\
pushl %ebp\n\
# Arguments for _dl_init.\n\
pushl %esi\n\
pushl %ecx\n\
pushl %edx\n\
pushl %eax\n\
# Clear %ebp, so that even constructors have terminated backchain.\n\
xorl %ebp, %ebp\n\
# Call the function to run the initializers.\n\
@ -195,7 +198,7 @@ _dl_start_user:\n\
# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
leal _dl_fini@GOTOFF(%ebx), %edx\n\
# Restore %esp _start expects.\n\
movl (%esp), %esp\n\
movl 16(%esp), %esp\n\
# Jump to the user's entry point.\n\
jmp *%edi\n\
.previous\n\