diff options
author | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
commit | 2ea97941102380c28117882600265c1187c6fc8b (patch) | |
tree | 8f423876f9f118fbe6f7959e60984cd13ad7430d /gold/x86_64.cc | |
parent | ab8e2090b6435823d50b29b7a255140ba6ea673f (diff) | |
download | gdb-2ea97941102380c28117882600265c1187c6fc8b.zip gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.bz2 |
Revert -Wshadow changes, all changes from:
2009-12-11 Doug Kwan <dougkwan@google.com>
2009-12-11 Nick Clifton <nickc@redhat.com>
* configure.ac: Remove -Wshadow when setting WARN_CXXFLAGS.
Diffstat (limited to 'gold/x86_64.cc')
-rw-r--r-- | gold/x86_64.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 00fbf3f..e51b4ab 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -702,10 +702,10 @@ unsigned char Output_data_plt_x86_64::tlsdesc_plt_entry[plt_entry_size] = void Output_data_plt_x86_64::do_write(Output_file* of) { - const off_t off = this->offset(); + const off_t offset = this->offset(); const section_size_type oview_size = convert_to_section_size_type(this->data_size()); - unsigned char* const oview = of->get_output_view(off, oview_size); + unsigned char* const oview = of->get_output_view(offset, oview_size); const off_t got_file_offset = this->got_plt_->offset(); const section_size_type got_size = @@ -785,7 +785,7 @@ Output_data_plt_x86_64::do_write(Output_file* of) gold_assert(static_cast<section_size_type>(pov - oview) == oview_size); gold_assert(static_cast<section_size_type>(got_pov - got_view) == got_size); - of->write_output_view(off, oview_size, oview); + of->write_output_view(offset, oview_size, oview); of->write_output_view(got_file_offset, got_size, got_view); } |