diff options
| author | Ian Lance Taylor <ian@airs.com> | 2008-04-23 17:29:04 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2008-04-23 17:29:04 +0000 |
| commit | 7ef7376804cf483f6173080df1585c6fb16af7ca (patch) | |
| tree | d918ce25b1e2a7d714beb0ec0778570ddef37e26 /gold/readsyms.cc | |
| parent | 6194aaaba79d36b07bc8617500957a58642f5156 (diff) | |
* readsyms.cc (Read_symbols::do_read_symbols): Use get_view rather
than read for file header.
* archive.cc (Archive::include_member): Likewise.
Diffstat (limited to 'gold/readsyms.cc')
| -rw-r--r-- | gold/readsyms.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gold/readsyms.cc b/gold/readsyms.cc index d0bf2644a4..18b91b42b7 100644 --- a/gold/readsyms.cc +++ b/gold/readsyms.cc @@ -152,13 +152,12 @@ Read_symbols::do_read_symbols(Workqueue* workqueue) return false; } - unsigned char ehdr_buf[elfcpp::Elf_sizes<64>::ehdr_size]; - int read_size = elfcpp::Elf_sizes<64>::ehdr_size; if (filesize < read_size) read_size = filesize; - input_file->file().read(0, read_size, ehdr_buf); + const unsigned char* ehdr = input_file->file().get_view(0, 0, read_size, + true, false); if (read_size >= 4) { @@ -167,12 +166,12 @@ Read_symbols::do_read_symbols(Workqueue* workqueue) elfcpp::ELFMAG0, elfcpp::ELFMAG1, elfcpp::ELFMAG2, elfcpp::ELFMAG3 }; - if (memcmp(ehdr_buf, elfmagic, 4) == 0) + if (memcmp(ehdr, elfmagic, 4) == 0) { // This is an ELF object. Object* obj = make_elf_object(input_file->filename(), - input_file, 0, ehdr_buf, read_size); + input_file, 0, ehdr, read_size); if (obj == NULL) return false; @@ -205,9 +204,9 @@ Read_symbols::do_read_symbols(Workqueue* workqueue) if (read_size >= Archive::sarmag) { bool is_thin_archive - = memcmp(ehdr_buf, Archive::armagt, Archive::sarmag) == 0; + = memcmp(ehdr, Archive::armagt, Archive::sarmag) == 0; if (is_thin_archive - || memcmp(ehdr_buf, Archive::armag, Archive::sarmag) == 0) + || memcmp(ehdr, Archive::armag, Archive::sarmag) == 0) { // This is an archive. Archive* arch = new Archive(this->input_argument_->file().name(), |