darlinghq/darling-gdb
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-gdb.git synced 2024-12-12 14:37:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gold/

Browse Source 
* layout.cc (Layout::section_name_mapping): Add rules to handle
	exact match on .data.rel.ro.local or .data.rel.ro.
	(Layout::output_section_name): Check for exact matches.
This commit is contained in:
Cary Coutant 2012-05-24 01:02:15 +00:00
parent f3e0e9604d
commit 1be75daacf
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gold/ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-23 Cary Coutant <ccoutant@google.com>
* layout.cc (Layout::section_name_mapping): Add rules to handle
exact match on .data.rel.ro.local or .data.rel.ro.
(Layout::output_section_name): Check for exact matches.
2012-05-23 Cary Coutant <ccoutant@google.com>
* layout.cc (Layout::section_name_mapping): Match .data.rel.ro.*

21
gold/layout.cc
View File

@ -4569,12 +4569,15 @@ Layout::set_dynamic_symbol_size(const Symbol_table* symtab)
// based on the GNU linker default ELF linker script.
#define MAPPING_INIT(f, t) { f, sizeof(f) - 1, t, sizeof(t) - 1 }
#define MAPPING_INIT_EXACT(f, t) { f, 0, t, sizeof(t) - 1 }
const Layout::Section_name_mapping Layout::section_name_mapping[] =
{
MAPPING_INIT(".text.", ".text"),
MAPPING_INIT(".rodata.", ".rodata"),
MAPPING_INIT(".data.rel.ro.local.", ".data.rel.ro.local"),
MAPPING_INIT_EXACT(".data.rel.ro.local", ".data.rel.ro.local"),
MAPPING_INIT(".data.rel.ro.", ".data.rel.ro"),
MAPPING_INIT_EXACT(".data.rel.ro", ".data.rel.ro"),
MAPPING_INIT(".data.", ".data"),
MAPPING_INIT(".bss.", ".bss"),
MAPPING_INIT(".tdata.", ".tdata"),
@ -4613,6 +4616,7 @@ const Layout::Section_name_mapping Layout::section_name_mapping[] =
MAPPING_INIT(".gnu.linkonce.armexidx.", ".ARM.exidx"),
};
#undef MAPPING_INIT
#undef MAPPING_INIT_EXACT
const int Layout::section_name_mapping_count =
(sizeof(Layout::section_name_mapping)
@ -4664,10 +4668,21 @@ Layout::output_section_name(const Relobj* relobj, const char* name,
const Section_name_mapping* psnm = section_name_mapping;
for (int i = 0; i < section_name_mapping_count; ++i, ++psnm)
{
if (strncmp(name, psnm->from, psnm->fromlen) == 0)
if (psnm->fromlen > 0)
{
*plen = psnm->tolen;
return psnm->to;
if (strncmp(name, psnm->from, psnm->fromlen) == 0)
{
*plen = psnm->tolen;
return psnm->to;
}
}
else
{
if (strcmp(name, psnm->from) == 0)
{
*plen = psnm->tolen;
return psnm->to;
}
}
}