|
 |
076f82 |
commit 458733fffe2c410418b5f633ffd6ed65efd2aac0
|
|
|
076f82 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
076f82 |
Date: Thu Feb 3 10:58:59 2022 +0100
|
|
|
076f82 |
|
|
|
076f82 |
Linux: Remove DL_FIND_ARG_COMPONENTS
|
|
|
076f82 |
|
|
|
076f82 |
The generic definition is always used since the Native Client
|
|
|
076f82 |
port has been removed.
|
|
|
076f82 |
|
|
|
076f82 |
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
076f82 |
(cherry picked from commit 2d47fa68628e831a692cba8fc9050cef435afc5e)
|
|
|
076f82 |
|
|
|
076f82 |
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
|
076f82 |
index aae983777ba15fae..e36b3e6b63b1aa7e 100644
|
|
|
076f82 |
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
|
076f82 |
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
|
076f82 |
@@ -59,19 +59,6 @@ void *__libc_stack_end attribute_relro = NULL;
|
|
|
076f82 |
rtld_hidden_data_def(__libc_stack_end)
|
|
|
076f82 |
void *_dl_random attribute_relro = NULL;
|
|
|
076f82 |
|
|
|
076f82 |
-#ifndef DL_FIND_ARG_COMPONENTS
|
|
|
076f82 |
-# define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
|
|
|
076f82 |
- do { \
|
|
|
076f82 |
- void **_tmp; \
|
|
|
076f82 |
- (argc) = *(long int *) cookie; \
|
|
|
076f82 |
- (argv) = (char **) ((long int *) cookie + 1); \
|
|
|
076f82 |
- (envp) = (argv) + (argc) + 1; \
|
|
|
076f82 |
- for (_tmp = (void **) (envp); *_tmp; ++_tmp) \
|
|
|
076f82 |
- continue; \
|
|
|
076f82 |
- (auxp) = (void *) ++_tmp; \
|
|
|
076f82 |
- } while (0)
|
|
|
076f82 |
-#endif
|
|
|
076f82 |
-
|
|
|
076f82 |
#ifndef DL_STACK_END
|
|
|
076f82 |
# define DL_STACK_END(cookie) ((void *) (cookie))
|
|
|
076f82 |
#endif
|
|
|
076f82 |
@@ -90,8 +77,16 @@ _dl_sysdep_start (void **start_argptr,
|
|
|
076f82 |
#endif
|
|
|
076f82 |
|
|
|
076f82 |
__libc_stack_end = DL_STACK_END (start_argptr);
|
|
|
076f82 |
- DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, _dl_argv, _environ,
|
|
|
076f82 |
- GLRO(dl_auxv));
|
|
|
076f82 |
+ _dl_argc = (intptr_t) *start_argptr;
|
|
|
076f82 |
+ _dl_argv = (char **) (start_argptr + 1); /* Necessary aliasing violation. */
|
|
|
076f82 |
+ _environ = _dl_argv + _dl_argc + 1;
|
|
|
076f82 |
+ for (char **tmp = _environ + 1; ; ++tmp)
|
|
|
076f82 |
+ if (*tmp == NULL)
|
|
|
076f82 |
+ {
|
|
|
076f82 |
+ /* Another necessary aliasing violation. */
|
|
|
076f82 |
+ GLRO(dl_auxv) = (ElfW(auxv_t) *) (tmp + 1);
|
|
|
076f82 |
+ break;
|
|
|
076f82 |
+ }
|
|
|
076f82 |
|
|
|
076f82 |
user_entry = (ElfW(Addr)) ENTRY_POINT;
|
|
|
076f82 |
GLRO(dl_platform) = NULL; /* Default to nothing known about the platform. */
|