diff options
| author | Ian Lance Taylor <iant@google.com> | 2007-09-25 17:50:26 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2007-09-25 17:50:26 +0000 |
| commit | 9eb9fa57c2a9eec4c08491715d3341df811b7f9c (patch) | |
| tree | c68eac98b999ebfb3251ab5f9851900bf8e4179b /gold/merge.cc | |
| parent | 0b058123a01a282fe112ee8863bfbf0abf89f29b (diff) | |
| download | fsf-binutils-gdb-9eb9fa57c2a9eec4c08491715d3341df811b7f9c.zip fsf-binutils-gdb-9eb9fa57c2a9eec4c08491715d3341df811b7f9c.tar.gz fsf-binutils-gdb-9eb9fa57c2a9eec4c08491715d3341df811b7f9c.tar.bz2 | |
Add cache parameter to get_view. Discard uncached views on unlock.
Fix bug this exposed in archive armap symbol name handling.
Diffstat (limited to 'gold/merge.cc')
| -rw-r--r-- | gold/merge.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gold/merge.cc b/gold/merge.cc index f6f45c9..0db62ef 100644 --- a/gold/merge.cc +++ b/gold/merge.cc @@ -177,7 +177,7 @@ bool Output_merge_data::do_add_input_section(Relobj* object, unsigned int shndx) { off_t len; - const unsigned char* p = object->section_contents(shndx, &len); + const unsigned char* p = object->section_contents(shndx, &len, false); uint64_t entsize = this->entsize(); @@ -237,7 +237,7 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object, unsigned int shndx) { off_t len; - const unsigned char* pdata = object->section_contents(shndx, &len); + const unsigned char* pdata = object->section_contents(shndx, &len, false); const Char_type* p = reinterpret_cast<const Char_type*>(pdata); |