[prev in list] [next in list] [prev in thread] [next in thread] 

List:       glibc-cvs
Subject:    [glibc/google/grte/v5-2.27/master] Revert clang workaround for _begin that is no longer needed
From:       Fangrui Song via Glibc-cvs <glibc-cvs () sourceware ! org>
Date:       2021-08-28 0:43:01
Message-ID: 20210828004301.AD4A0385843B () sourceware ! org
[Download RAW message or body]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=66c8103bdf54c1335efe8181f6110358f0277671

commit 66c8103bdf54c1335efe8181f6110358f0277671
Author: Stan Shebs <stanshebs@google.com>
Date:   Tue Oct 8 07:07:18 2019 -0700

    Revert clang workaround for _begin that is no longer needed

Diff:
---
 elf/rtld.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/elf/rtld.c b/elf/rtld.c
index 9c942add0b..8071e2f5f5 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -402,13 +402,7 @@ _dl_start_final (void *arg, struct dl_start_final_info *info)
 #endif
   _dl_setup_hash (&GL(dl_rtld_map));
   GL(dl_rtld_map).l_real = &GL(dl_rtld_map);
-#if defined(__clang__)
-  /* Work around an lld complaint that _begin cannot have a reloc and
-     also be absolute because of _begin=0 on linker line.  */
-  GL(dl_rtld_map).l_map_start = (ElfW(Addr)) 0;
-#else
   GL(dl_rtld_map).l_map_start = (ElfW(Addr)) _begin;
-#endif
   GL(dl_rtld_map).l_map_end = (ElfW(Addr)) _end;
   GL(dl_rtld_map).l_text_end = (ElfW(Addr)) _etext;
   /* Copy the TLS related data if necessary.  */
[prev in list] [next in list] [prev in thread] [next in thread]