rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-06-16 06:51:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix relocation records order

Browse Source
This commit is contained in:
Peng Fan 2013-07-22 00:39:21 +08:00
parent c14133efaf
commit f2915943d1
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linkers/rld-rap.cpp
View File

@ -80,6 +80,18 @@ namespace rld
*/
typedef std::vector < relocation > relocations;
/**
* Relocation symname sorter for the relocations container.
*/
class reloc_symname_compare
{
public:
bool operator () (const relocation& lhs,
const relocation& rhs) const {
return lhs.symname < rhs.symname;
}
};
/**
* Relocation offset sorter for the relocations container.
*/
@ -88,7 +100,9 @@ namespace rld
public:
bool operator () (const relocation& lhs,
const relocation& rhs) const {
return lhs.offset < rhs.offset;
if (lhs.symname == rhs.symname)
return lhs.offset < rhs.offset;
else return false;
}
};
@ -681,6 +695,9 @@ namespace rld
sec.relocs.push_back (relocation (freloc, offset));
}
std::stable_sort (sec.relocs.begin (),
sec.relocs.end (),
reloc_symname_compare ());
std::stable_sort (sec.relocs.begin (),
sec.relocs.end (),
reloc_offset_compare ());