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/resolve.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/resolve.cc')
| -rw-r--r-- | gold/resolve.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gold/resolve.cc b/gold/resolve.cc index 2a688769bed..780038aee5e 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -336,9 +336,9 @@ Symbol_table::resolve(Sized_symbol<size>* to, && to->name()[0] == '_' && to->name()[1] == 'Z') { Symbol_location fromloc - = { object, orig_st_shndx, sym.get_st_value() }; + = { object, orig_st_shndx, static_cast<off_t>(sym.get_st_value()) }; Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), - to->value() }; + static_cast<off_t>(to->value()) }; this->candidate_odr_violations_[to->name()].insert(fromloc); this->candidate_odr_violations_[to->name()].insert(toloc); } |