[1/3] Remove _dl_skip_args_internal declaration

Message ID ee142507fe416492b087df65a77ef33e05936082.1649767418.git.szabolcs.nagy@arm.com
State Committed
Headers
Series Args adjustment with ./ld.so exe [BZ #23293] |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Szabolcs Nagy April 12, 2022, 12:55 p.m. UTC
  It does not seem to be used.
---
 sysdeps/generic/ldsodefs.h | 5 -----
 1 file changed, 5 deletions(-)
  

Comments

Florian Weimer April 12, 2022, 1:40 p.m. UTC | #1
* Szabolcs Nagy via Libc-alpha:

> It does not seem to be used.
> ---
>  sysdeps/generic/ldsodefs.h | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
> index 44750461a9..29f005499b 100644
> --- a/sysdeps/generic/ldsodefs.h
> +++ b/sysdeps/generic/ldsodefs.h
> @@ -781,11 +781,6 @@ extern char **_dl_argv
>  rtld_hidden_proto (_dl_argv)
>  #if IS_IN (rtld)
>  extern unsigned int _dl_skip_args attribute_hidden
> -# ifndef DL_ARGV_NOT_RELRO
> -     attribute_relro
> -# endif
> -     ;
> -extern unsigned int _dl_skip_args_internal attribute_hidden
>  # ifndef DL_ARGV_NOT_RELRO
>       attribute_relro
>  # endif

Looks okay.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

Thanks,
Florian
  
Andreas Schwab April 12, 2022, 1:51 p.m. UTC | #2
On Apr 12 2022, Szabolcs Nagy via Libc-alpha wrote:

> It does not seem to be used.

Ok.  Looks like it has never been defined even when it was added.
  

Patch

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 44750461a9..29f005499b 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -781,11 +781,6 @@  extern char **_dl_argv
 rtld_hidden_proto (_dl_argv)
 #if IS_IN (rtld)
 extern unsigned int _dl_skip_args attribute_hidden
-# ifndef DL_ARGV_NOT_RELRO
-     attribute_relro
-# endif
-     ;
-extern unsigned int _dl_skip_args_internal attribute_hidden
 # ifndef DL_ARGV_NOT_RELRO
      attribute_relro
 # endif