diff options
| author |   Nick Clifton <nickc@redhat.com> | 2010-08-25 08:36:54 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2010-08-25 08:36:54 +0000 |
| commit | ca09d69af126b596bf21c9d3f7639cae5cd32533 (patch) | |
| tree | 8f00e4524bcf6ead8f612b858cf2aa9f4241a663 /gold/archive.cc | |
| parent | * NEWS: Mention ampersand in macro change. (diff) | |
| download | binutils-gdb-ca09d69af126b596bf21c9d3f7639cae5cd32533.tar.gz binutils-gdb-ca09d69af126b596bf21c9d3f7639cae5cd32533.tar.bz2 binutils-gdb-ca09d69af126b596bf21c9d3f7639cae5cd32533.zip | |
* archive.cc: Formatting fixes: Remove whitespace between
typename and following asterisk. Remove whitespace between
function name and opening parenthesis.
* archive.h: Likewise.
* arm.cc: Likewise.
* attributes.cc: Likewise.
* attributes.h: Likewise.
* common.cc: Likewise.
* copy-relocs.cc: Likewise.
* dirsearch.h: Likewise.
* dynobj.cc: Likewise.
* ehframe.cc: Likewise.
* ehframe.h: Likewise.
* expression.cc: Likewise.
* fileread.cc: Likewise.
* fileread.h: Likewise.
* gc.h: Likewise.
* gold-threads.cc: Likewise.
* gold.cc: Likewise.
* i386.cc: Likewise.
* icf.h: Likewise.
* incremental-dump.cc: Likewise.
* incremental.cc: Likewise.
* layout.cc: Likewise.
* layout.h: Likewise.
* main.cc: Likewise.
* merge.cc: Likewise.
* merge.h: Likewise.
* object.cc: Likewise.
* object.h: Likewise.
* options.cc: Likewise.
* options.h: Likewise.
* output.cc: Likewise.
* output.h: Likewise.
* plugin.cc: Likewise.
* plugin.h: Likewise.
* powerpc.cc: Likewise.
* reloc.cc: Likewise.
* script-c.h: Likewise.
* script-sections.cc: Likewise.
* script.cc: Likewise.
* stringpool.cc: Likewise.
* symtab.cc: Likewise.
* symtab.h: Likewise.
* target.cc: Likewise.
* timer.cc: Likewise.
* timer.h: Likewise.
* version.cc: Likewise.
* x86_64.cc: Likewise.
Diffstat (limited to 'gold/archive.cc')
| -rw-r--r-- | gold/archive.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gold/archive.cc b/gold/archive.cc index dade0430de2..541a49456a5 100644 --- a/gold/archive.cc +++ b/gold/archive.cc @@ -566,7 +566,7 @@ Archive::get_elf_object_for_member(off_t off, bool* punconfigured) return NULL; } - Object *obj = make_elf_object((std::string(this->input_file_->filename()) + Object* obj = make_elf_object((std::string(this->input_file_->filename()) + "(" + member_name + ")"), input_file, memoff, ehdr, read_size, punconfigured); @@ -844,9 +844,9 @@ Archive::include_member(Symbol_table* symtab, Layout* layout, std::map<off_t, Archive_member>::const_iterator p = this->members_.find(off); if (p != this->members_.end()) { - Object *obj = p->second.obj_; + Object* obj = p->second.obj_; - Read_symbols_data *sd = p->second.sd_; + Read_symbols_data* sd = p->second.sd_; if (mapfile != NULL) mapfile->report_include_archive_member(obj->name(), sym, why); if (input_objects->add_object(obj)) @@ -1031,7 +1031,7 @@ Lib_group::add_symbols(Symbol_table* symtab, Layout* layout, while (i < this->members_.size()) { const Archive_member& member = this->members_[i]; - Object *obj = member.obj_; + Object* obj = member.obj_; std::string why; // Skip files with no symbols. Plugin objects have |