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/powerpc.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/powerpc.cc')
| -rw-r--r-- | gold/powerpc.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 8bb633f..bd5571c 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -890,10 +890,10 @@ template<int size, bool big_endian> void Output_data_plt_powerpc<size, big_endian>::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); unsigned char* pov = oview; memset(pov, 0, base_plt_entry_size * 4); @@ -924,7 +924,7 @@ Output_data_plt_powerpc<size, big_endian>::do_write(Output_file* of) gold_assert(static_cast<section_size_type>(pov - oview) == oview_size); - of->write_output_view(off, oview_size, oview); + of->write_output_view(offset, oview_size, oview); } // Create a PLT entry for a global symbol. @@ -1458,9 +1458,9 @@ Target_powerpc<size, big_endian>::gc_process_relocs( const unsigned char* plocal_symbols) { typedef Target_powerpc<size, big_endian> Powerpc; - typedef typename Target_powerpc<size, big_endian>::Scan scan; + typedef typename Target_powerpc<size, big_endian>::Scan Scan; - gold::gc_process_relocs<size, big_endian, Powerpc, elfcpp::SHT_RELA, scan>( + gold::gc_process_relocs<size, big_endian, Powerpc, elfcpp::SHT_RELA, Scan>( symtab, layout, this, @@ -1492,7 +1492,7 @@ Target_powerpc<size, big_endian>::scan_relocs( const unsigned char* plocal_symbols) { typedef Target_powerpc<size, big_endian> Powerpc; - typedef typename Target_powerpc<size, big_endian>::Scan scan; + typedef typename Target_powerpc<size, big_endian>::Scan Scan; static Output_data_space* sdata; if (sh_type == elfcpp::SHT_REL) @@ -1520,7 +1520,7 @@ Target_powerpc<size, big_endian>::scan_relocs( false, false); } - gold::scan_relocs<size, big_endian, Powerpc, elfcpp::SHT_RELA, scan>( + gold::scan_relocs<size, big_endian, Powerpc, elfcpp::SHT_RELA, Scan>( symtab, layout, this, @@ -1992,17 +1992,17 @@ public: (big_endian ? "elf32-powerpc" : "elf32-powerpcle"))) { } - Target* do_recognize(int amachine, int, int) + Target* do_recognize(int machine, int, int) { switch (size) { case 64: - if (amachine != elfcpp::EM_PPC64) + if (machine != elfcpp::EM_PPC64) return NULL; break; case 32: - if (amachine != elfcpp::EM_PPC) + if (machine != elfcpp::EM_PPC) return NULL; break; |