rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-06-18 04:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use find_in_strtab when collecting symbols. Remove debug.

Browse Source
This commit is contained in:
Chris Johns 2013-01-01 12:04:24 +11:00
parent f43851acc0
commit 6801aa22cf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linkers/rld-rap.cpp
View File

@ -20,6 +20,7 @@
* *
* @brief RTEMS Linker. * @brief RTEMS Linker.
* *
* @todo Set the RAP alignment as the max of all alignments.
*/ */
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
@ -946,7 +947,7 @@ namespace rld
/* /*
* See if the name is already in the string table. * See if the name is already in the string table.
*/ */
name = strtab.find (sym.name ()); name = find_in_strtab (sym.name ());
if (name == std::string::npos) if (name == std::string::npos)
{ {
@ -1191,7 +1192,7 @@ namespace rld
{ {
const external& ext = *ei; const external& ext = *ei;
if (rld::verbose () >= RLD_VERBOSE_FULL_DEBUG) if (rld::verbose () >= RLD_VERBOSE_TRACE)
std::cout << "rap:externs: " << count std::cout << "rap:externs: " << count
<< " name=" << &strtab[ext.name] << " (" << ext.name << ')' << " name=" << &strtab[ext.name] << " (" << ext.name << ')'
<< " section=" << section_names[ext.sec] << " section=" << section_names[ext.sec]
@ -1218,7 +1219,7 @@ namespace rld
uint32_t sr = 0; uint32_t sr = 0;
uint32_t header; uint32_t header;
if (1 || rld::verbose () >= RLD_VERBOSE_TRACE) if (rld::verbose () >= RLD_VERBOSE_TRACE)
std::cout << "rap:relocation: section:" << section_names[s] std::cout << "rap:relocation: section:" << section_names[s]
<< " relocs=" << count << " relocs=" << count
<< " rela=" << (char*) (sec_rela[s] ? "yes" : "no") << " rela=" << (char*) (sec_rela[s] ? "yes" : "no")
@ -1238,7 +1239,7 @@ namespace rld
relocations& relocs = sec.relocs; relocations& relocs = sec.relocs;
uint32_t rc = 0; uint32_t rc = 0;
if (1 || rld::verbose () >= RLD_VERBOSE_TRACE) if (rld::verbose () >= RLD_VERBOSE_TRACE)
std::cout << " relocs=" << sec.relocs.size () std::cout << " relocs=" << sec.relocs.size ()
<< " sec.offset=" << sec.offset << " sec.offset=" << sec.offset
<< " sec.size=" << sec.size () << " sec.size=" << sec.size ()
@ -1273,7 +1274,7 @@ namespace rld
write_addend = true; write_addend = true;
if (1 || rld::verbose () >= RLD_VERBOSE_TRACE) if (rld::verbose () >= RLD_VERBOSE_TRACE)
std::cout << " " << std::setw (2) << sr std::cout << " " << std::setw (2) << sr
<< '/' << std::setw (2) << rc << '/' << std::setw (2) << rc
<<": rsym: sect=" << section_names[rap_symsect] <<": rsym: sect=" << section_names[rap_symsect]
@ -1316,7 +1317,7 @@ namespace rld
} }
} }
if (1 || rld::verbose () >= RLD_VERBOSE_TRACE) if (rld::verbose () >= RLD_VERBOSE_TRACE)
{ {
std::cout << " " << std::setw (2) << sr << '/' std::cout << " " << std::setw (2) << sr << '/'
<< std::setw (2) << rc << std::setw (2) << rc