diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/dl-reloc-static-pie.c | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index b9684f4875..efd0bec672 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-05-29 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #23206] + * elf/dl-reloc-static-pie.c (_dl_relocate_static_pie): Initialize + _r_debug and update DT_DEBUG for debugger. + 2018-05-29 Florian Weimer <fweimer@redhat.com> * stdlib/Makefile (tst-strtod1i.out): Depend on generated locales. diff --git a/elf/dl-reloc-static-pie.c b/elf/dl-reloc-static-pie.c index bd2d516e5d..ab1ce0eacc 100644 --- a/elf/dl-reloc-static-pie.c +++ b/elf/dl-reloc-static-pie.c @@ -48,5 +48,21 @@ _dl_relocate_static_pie (void) data access using the global offset table. */ ELF_DYNAMIC_RELOCATE (main_map, 0, 0, 0); main_map->l_relocated = 1; + + /* Initialize _r_debug. */ + struct r_debug *r = _dl_debug_initialize (0, LM_ID_BASE); + r->r_state = RT_CONSISTENT; + + /* Set up debugging before the debugger is notified for the first + time. */ +# ifdef ELF_MACHINE_DEBUG_SETUP + /* Some machines (e.g. MIPS) don't use DT_DEBUG in this way. */ + ELF_MACHINE_DEBUG_SETUP (main_map, r); +# else + if (main_map->l_info[DT_DEBUG] != NULL) + /* There is a DT_DEBUG entry in the dynamic section. Fill it in + with the run-time address of the r_debug structure */ + main_map->l_info[DT_DEBUG]->d_un.d_ptr = (ElfW(Addr)) r; +# endif } #endif |