diff options
| author | Cary Coutant <ccoutant@google.com> | 2011-12-17 22:39:52 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2011-12-17 22:39:52 +0000 |
| commit | 76677ad0511926923fd951df8d73efb783ced103 (patch) | |
| tree | eacd6a0aceafd93481a3837a4f9c041f737128ea /gold/dwarf_reader.cc | |
| parent | dd274a34d22249bd4ae2e868fdd02678f69dd36c (diff) | |
| download | binutils-gdb-76677ad0511926923fd951df8d73efb783ced103.tar.gz | |
2011-12-17 Cary Coutant <ccoutant@google.com>
* dwarf_reader.cc (Sized_dwarf_line_info::read_lines): Add casts.
* resolve.cc (Symbol_table::resolve): Likewise.
* i386.cc (Target_i386::do_code_fill): Use char constants for nop
arrays.
* x86_64.cc (Target_x86_64::do_code_fill): Likewise.
Diffstat (limited to 'gold/dwarf_reader.cc')
| -rw-r--r-- | gold/dwarf_reader.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc index 3dc33e4e106..e1c3c971170 100644 --- a/gold/dwarf_reader.cc +++ b/gold/dwarf_reader.cc @@ -491,8 +491,10 @@ Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr && (shndx == -1U || lsm.shndx == -1U || shndx == lsm.shndx)) { Offset_to_lineno_entry entry - = { lsm.address, this->current_header_index_, - lsm.file_num, true, lsm.line_num }; + = { static_cast<off_t>(lsm.address), + this->current_header_index_, + static_cast<unsigned int>(lsm.file_num), + true, lsm.line_num }; std::vector<Offset_to_lineno_entry>& map(this->line_number_map_[lsm.shndx]); // If we see two consecutive entries with the same |