Remove spurious references to _dl_open_hook

Message ID 87mtcopbpg.fsf@oldenburg.str.redhat.com
State Committed
Commit 032712621fd376def8ee4c1d997b414f29a30108
Headers
Series Remove spurious references to _dl_open_hook |

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

Florian Weimer Aug. 1, 2022, 9:14 a.m. UTC
  _dl_open_hook was removed in commit 466c1ea15f461edb8e3ffaf5d86d708
("dlfcn: Rework static dlopen hooks").

---
 libio/vtables.c | 4 ----
 malloc/arena.c  | 5 -----
 2 files changed, 9 deletions(-)
  

Comments

Adhemerval Zanella Netto Aug. 1, 2022, 1:42 p.m. UTC | #1
On 01/08/22 06:14, Florian Weimer via Libc-alpha wrote:
> _dl_open_hook was removed in commit 466c1ea15f461edb8e3ffaf5d86d708
> ("dlfcn: Rework static dlopen hooks").
> 


LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  libio/vtables.c | 4 ----
>  malloc/arena.c  | 5 -----
>  2 files changed, 9 deletions(-)
> 
> diff --git a/libio/vtables.c b/libio/vtables.c
> index 499f0039cb..50acab7f21 100644
> --- a/libio/vtables.c
> +++ b/libio/vtables.c
> @@ -25,10 +25,6 @@
>  
>  void (*IO_accept_foreign_vtables) (void) attribute_hidden;
>  
> -/* Used to detected multiple libcs.  */
> -extern struct dl_open_hook *_dl_open_hook;
> -libc_hidden_proto (_dl_open_hook);
> -
>  #else  /* !SHARED */
>  
>  /* Used to check whether static dlopen support is needed.  */
> diff --git a/malloc/arena.c b/malloc/arena.c
> index 0a684a720d..defd25c8a6 100644
> --- a/malloc/arena.c
> +++ b/malloc/arena.c
> @@ -300,11 +300,6 @@ next_env_entry (char ***position)
>  #endif
>  
>  
> -#ifdef SHARED
> -extern struct dl_open_hook *_dl_open_hook;
> -libc_hidden_proto (_dl_open_hook);
> -#endif
> -
>  #if USE_TCACHE
>  static void tcache_key_initialize (void);
>  #endif
>
  

Patch

diff --git a/libio/vtables.c b/libio/vtables.c
index 499f0039cb..50acab7f21 100644
--- a/libio/vtables.c
+++ b/libio/vtables.c
@@ -25,10 +25,6 @@ 
 
 void (*IO_accept_foreign_vtables) (void) attribute_hidden;
 
-/* Used to detected multiple libcs.  */
-extern struct dl_open_hook *_dl_open_hook;
-libc_hidden_proto (_dl_open_hook);
-
 #else  /* !SHARED */
 
 /* Used to check whether static dlopen support is needed.  */
diff --git a/malloc/arena.c b/malloc/arena.c
index 0a684a720d..defd25c8a6 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -300,11 +300,6 @@  next_env_entry (char ***position)
 #endif
 
 
-#ifdef SHARED
-extern struct dl_open_hook *_dl_open_hook;
-libc_hidden_proto (_dl_open_hook);
-#endif
-
 #if USE_TCACHE
 static void tcache_key_initialize (void);
 #endif