Merge with head.

[gem5.git] / src / base / loader / raw_object.cc

diff --git a/src/base/loader/raw_object.cc b/src/base/loader/raw_object.cc
index 2a52b0d6eeed687ebca21aadbdcc5526e5bde129..d002d9005264d733aed1cbefc46791eebc90fab5 100644 (file)
--- a/src/base/loader/raw_object.cc
+++ b/src/base/loader/raw_object.cc
@@ -63,19 +63,19 @@ RawObject::RawObject(const std::string &_filename, int _fd, size_t _len,
 bool
 RawObject::loadGlobalSymbols(SymbolTable *symtab, Addr addrMask)
 {
-    int fnameStart = filename.rfind('/',filename.size()) + 1;
+/*    int fnameStart = filename.rfind('/',filename.size()) + 1;
     int extStart = filename.rfind('.',filename.size());
     symtab->insert(text.baseAddr & addrMask, filename.substr(fnameStart,
-                extStart-fnameStart) + "_start");
+                extStart-fnameStart) + "_start");*/
     return true;
 }
 
 bool
 RawObject::loadLocalSymbols(SymbolTable *symtab, Addr addrMask)
 {
-    int fnameStart = filename.rfind('/',filename.size()) + 1;
+/*    int fnameStart = filename.rfind('/',filename.size()) + 1;
     int extStart = filename.rfind('.',filename.size());
     symtab->insert(text.baseAddr & addrMask, filename.substr(fnameStart,
-                extStart-fnameStart) + "_start");
+                extStart-fnameStart) + "_start");*/
     return true;
 }