RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libdl/debugger: Fix the broken list delete when unloading an object module.

Browse Source 
Closes #3777
This commit is contained in:
Chris Johns
2019-08-05 09:58:07 +10:00
parent 886956afd2
commit 9cb19ded5c
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
bsps/arm/raspberrypi/start/linkcmds → bsps/arm/raspberrypi/start/linkcmds.in
View File

16
cpukit/libdl/rtl-debugger.c
View File

@@ -64,13 +64,13 @@ _rtld_linkmap_add (rtems_rtl_obj* obj)
if (_rtld_debug.r_map == NULL) if (_rtld_debug.r_map == NULL)
{ {
_rtld_debug.r_map = l; _rtld_debug.r_map = l;
return true;
} }
else
{
for (prev = _rtld_debug.r_map; prev->l_next != NULL; prev = prev->l_next); for (prev = _rtld_debug.r_map; prev->l_next != NULL; prev = prev->l_next);
l->l_prev = prev; l->l_prev = prev;
prev->l_next = l; prev->l_next = l;
}
return true; return true;
} }
@@ -79,20 +79,20 @@ void
_rtld_linkmap_delete (rtems_rtl_obj* obj) _rtld_linkmap_delete (rtems_rtl_obj* obj)
{ {
struct link_map* l = obj->linkmap; struct link_map* l = obj->linkmap;
/* /*
* link_maps are allocated together if not 1 * link_maps are allocated together if not 1
*/ */
struct link_map* e = l + obj->obj_num - 1; struct link_map* e = l + obj->obj_num - 1;
while (e && e->l_next) e = e->l_next;
if (l->l_prev == NULL) if (l->l_prev == NULL)
{ {
if ((_rtld_debug.r_map = e->l_next) != NULL) if ((_rtld_debug.r_map = e->l_next) != NULL)
e->l_next->l_prev = NULL; _rtld_debug.r_map->l_prev = NULL;
return;
} }
else
{
if ((l->l_prev->l_next = e->l_next) != NULL) if ((l->l_prev->l_next = e->l_next) != NULL)
e->l_next->l_prev = l->l_prev; e->l_next->l_prev = l->l_prev;
}
} }

2
cpukit/libdl/rtl-elf.c
View File

@@ -1593,8 +1593,6 @@ rtems_rtl_elf_load_linkmap (rtems_rtl_obj* obj)
obj->linkmap->sec_addr[rap_bss] = obj->bss_base; obj->linkmap->sec_addr[rap_bss] = obj->bss_base;
sd = obj->linkmap->sec_detail; sd = obj->linkmap->sec_detail;
sections = &obj->sections;
node = rtems_chain_first (sections);
for (m = 0; m < sect_masks; ++m) for (m = 0; m < sect_masks; ++m)
{ {