diff mbox series

[17/17] elf: Remove _dl_skip_args

Message ID 20220526165003.705355-18-adhemerval.zanella@linaro.org
State Committed
Commit 81e7fdd7ccff3745db0b0d8ffa1ec9fab6dcee67
Headers
Series Remove _dl_skip_args |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Adhemerval Zanella May 26, 2022, 4:50 p.m. UTC 
  Now that no architecture uses it anymore.
---
 elf/rtld.c                    | 2 --
 sysdeps/generic/ldsodefs.h    | 4 ----
 sysdeps/mach/hurd/dl-sysdep.c | 1 -
 3 files changed, 7 deletions(-)
diff mbox series

Patch

diff --git a/elf/rtld.c b/elf/rtld.c
index 069940d73f..f5a3d1968f 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -158,8 +158,6 @@  static void process_envvars (struct dl_main_state *state);
 
 int _dl_argc attribute_relro attribute_hidden;
 char **_dl_argv attribute_relro = NULL;
-/* Always 0, only kept for not-yet-updated target start code.  */
-const unsigned int _dl_skip_args attribute_hidden;
 rtld_hidden_data_def (_dl_argv)
 
 #ifndef THREAD_SET_STACK_GUARD
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 6716e1f382..446d12a68c 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -755,10 +755,6 @@  rtld_hidden_proto (__libc_stack_end)
 extern int _dl_argc attribute_hidden attribute_relro;
 extern char **_dl_argv attribute_relro;
 rtld_hidden_proto (_dl_argv)
-#if IS_IN (rtld)
-/* Always 0, only kept for not-yet-updated target start code.  */
-extern const unsigned int _dl_skip_args attribute_hidden;
-#endif
 #define rtld_progname _dl_argv[0]
 
 /* Flag set at startup and cleared when the last initializer has run.  */
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 8373962e62..f23fdee058 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -139,7 +139,6 @@  _dl_sysdep_start (void **start_argptr,
 	    mach_port_t memobj;
 	    error_t err;
 
-	    ++_dl_skip_args;
 	    --_dl_argc;
 	    p = _dl_argv++[1] + 1;