From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 17 May 2021 07:59:14 +0000 (+0200)
Subject: elf: Remove DL_STATIC_INIT
X-Git-Tag: glibc-2.34~409
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b3e92bdf3c11e8ca3271beb03ff16b87c23ed7f;p=thirdparty%2Fglibc.git

elf: Remove DL_STATIC_INIT

All users have been converted to the __rtld_static_init mechanism.

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

diff --git a/elf/dl-open.c b/elf/dl-open.c
index c2ac5ee94f7..d2240d87474 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -781,10 +781,6 @@ dl_open_worker (void *a)
       _dl_call_libc_early_init (libc_map, initial);
     }
 
-#ifndef SHARED
-  DL_STATIC_INIT (new);
-#endif
-
   /* Run the initializer functions of new objects.  Temporarily
      disable the exception handler, so that lazy binding failures are
      fatal.  */
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index e43d6f5ecd2..c288f3a2a1b 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -135,12 +135,6 @@ dl_symbol_visibility_binds_local_p (const ElfW(Sym) *sym)
 # define DL_UNMAP(map)	_dl_unmap_segments (map)
 #endif
 
-/* By default we do not need special support to initialize DSOs loaded
-   by statically linked binaries.  */
-#ifndef DL_STATIC_INIT
-# define DL_STATIC_INIT(map)
-#endif
-
 /* Reloc type classes as returned by elf_machine_type_class().
    ELF_RTYPE_CLASS_PLT means this reloc should not be satisfied by
    some PLT symbol, ELF_RTYPE_CLASS_COPY means this reloc should not be