diff options
| author | Chris Johns <chrisj@rtems.org> | 2013-01-01 12:04:24 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2013-01-01 12:04:24 +1100 |
| commit | 0065b7df65c668a4917a421c9b96e6c7ab1ede16 (patch) | |
| tree | 9885ae2800d28242f1288824d75586cae9cfdf68 /rld-rap.cpp | |
| parent | 63506145398b59151ceb85ab79382c2c063f0c75 (diff) | |
Use find_in_strtab when collecting symbols. Remove debug.
Diffstat (limited to 'rld-rap.cpp')
| -rw-r--r-- | rld-rap.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/rld-rap.cpp b/rld-rap.cpp index d09a90a..175376e 100644 --- a/rld-rap.cpp +++ b/rld-rap.cpp @@ -20,6 +20,7 @@ * * @brief RTEMS Linker. * + * @todo Set the RAP alignment as the max of all alignments. */ #if HAVE_CONFIG_H @@ -946,7 +947,7 @@ namespace rld /* * 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) { @@ -1191,7 +1192,7 @@ namespace rld { const external& ext = *ei; - if (rld::verbose () >= RLD_VERBOSE_FULL_DEBUG) + if (rld::verbose () >= RLD_VERBOSE_TRACE) std::cout << "rap:externs: " << count << " name=" << &strtab[ext.name] << " (" << ext.name << ')' << " section=" << section_names[ext.sec] @@ -1218,7 +1219,7 @@ namespace rld uint32_t sr = 0; uint32_t header; - if (1 || rld::verbose () >= RLD_VERBOSE_TRACE) + if (rld::verbose () >= RLD_VERBOSE_TRACE) std::cout << "rap:relocation: section:" << section_names[s] << " relocs=" << count << " rela=" << (char*) (sec_rela[s] ? "yes" : "no") @@ -1238,7 +1239,7 @@ namespace rld relocations& relocs = sec.relocs; uint32_t rc = 0; - if (1 || rld::verbose () >= RLD_VERBOSE_TRACE) + if (rld::verbose () >= RLD_VERBOSE_TRACE) std::cout << " relocs=" << sec.relocs.size () << " sec.offset=" << sec.offset << " sec.size=" << sec.size () @@ -1273,7 +1274,7 @@ namespace rld write_addend = true; - if (1 || rld::verbose () >= RLD_VERBOSE_TRACE) + if (rld::verbose () >= RLD_VERBOSE_TRACE) std::cout << " " << std::setw (2) << sr << '/' << std::setw (2) << rc <<": 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::setw (2) << rc |