elf: Remove spurios SHARED conditional from elf/rtld.c

Message ID 87leh5syl6.fsf@oldenburg.str.redhat.com
State Committed
Commit b376bb01fb343c4bd9a4ec30604dcd1fcbc04ff1
Headers
Series elf: Remove spurios SHARED conditional from elf/rtld.c |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 pending Patch applied
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Florian Weimer May 30, 2023, 2:06 p.m. UTC
  elf/rtld.c is only ever built in SHARED mode.

---
 elf/rtld.c | 2 --
 1 file changed, 2 deletions(-)


--
  

Comments

Andreas Schwab May 30, 2023, 2:27 p.m. UTC | #1
On Mai 30 2023, Florian Weimer via Libc-alpha wrote:

> elf/rtld.c is only ever built in SHARED mode.

Ok.
  

Patch

diff --git a/elf/rtld.c b/elf/rtld.c
index 37a2d8b3e9..ca5e8b9ec3 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2409,10 +2409,8 @@  dl_main (const ElfW(Phdr) *phdr,
      _dl_relocate_object might need to call `mprotect' for DT_TEXTREL.  */
   _dl_sysdep_start_cleanup ();
 
-#ifdef SHARED
   /* Auditing checkpoint: we have added all objects.  */
   _dl_audit_activity_nsid (LM_ID_BASE, LA_ACT_CONSISTENT);
-#endif
 
   /* Notify the debugger all new objects are now ready to go.  We must re-get
      the address since by now the variable might be in another object.  */