mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-03 04:01:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Remove DL_FIND_ARG_COMPONENTS

Browse Source 
The generic definition is always used since the Native Client
port has been removed.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
(cherry picked from commit 2d47fa6862)
This commit is contained in:
Florian Weimer 2022-02-03 10:58:59 +01:00
parent 2139b1848e
commit 458733fffe
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sysdeps/unix/sysv/linux/dl-sysdep.c
View File

@ -59,19 +59,6 @@ void *__libc_stack_end attribute_relro = NULL;
rtld_hidden_data_def(__libc_stack_end) rtld_hidden_data_def(__libc_stack_end)
void *_dl_random attribute_relro = NULL; void *_dl_random attribute_relro = NULL;
#ifndef DL_FIND_ARG_COMPONENTS
# define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
do { \
void **_tmp; \
(argc) = *(long int *) cookie; \
(argv) = (char **) ((long int *) cookie + 1); \
(envp) = (argv) + (argc) + 1; \
for (_tmp = (void **) (envp); *_tmp; ++_tmp) \
continue; \
(auxp) = (void *) ++_tmp; \
} while (0)
#endif
#ifndef DL_STACK_END #ifndef DL_STACK_END
# define DL_STACK_END(cookie) ((void *) (cookie)) # define DL_STACK_END(cookie) ((void *) (cookie))
#endif #endif
@ -90,8 +77,16 @@ _dl_sysdep_start (void **start_argptr,
#endif #endif
__libc_stack_end = DL_STACK_END (start_argptr); __libc_stack_end = DL_STACK_END (start_argptr);
DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, _dl_argv, _environ, _dl_argc = (intptr_t) *start_argptr;
GLRO(dl_auxv)); _dl_argv = (char **) (start_argptr + 1); /* Necessary aliasing violation. */
_environ = _dl_argv + _dl_argc + 1;
for (char **tmp = _environ + 1; ; ++tmp)
if (*tmp == NULL)
{
/* Another necessary aliasing violation. */
GLRO(dl_auxv) = (ElfW(auxv_t) *) (tmp + 1);
break;
}
user_entry = (ElfW(Addr)) ENTRY_POINT; user_entry = (ElfW(Addr)) ENTRY_POINT;
GLRO(dl_platform) = NULL; /* Default to nothing known about the platform. */ GLRO(dl_platform) = NULL; /* Default to nothing known about the platform. */