libiberty: documentation markup and order fixes.

[binutils-gdb.git] / gold / reloc.cc

diff --git a/gold/reloc.cc b/gold/reloc.cc
index 89389888c3bdd80ba412134419603c2121c6a6d1..ac7eb462fef78f3d01b14e9b97d2141c07d8fabf 100644 (file)
--- a/gold/reloc.cc
+++ b/gold/reloc.cc
@@ -64,7 +64,7 @@ Read_relocs::locks(Task_locker* tl)
 void
 Read_relocs::run(Workqueue* workqueue)
 {
-  Read_relocs_data *rd = new Read_relocs_data;
+  Read_relocs_data* rd = new Read_relocs_data;
   this->object_->read_relocs(rd);
   this->object_->set_relocs_data(rd);
   this->object_->release();
@@ -265,11 +265,11 @@ Sized_relobj<size, big_endian>::do_read_relocs(Read_relocs_data* rd)
   const Output_sections& out_sections(this->output_sections());
   const std::vector<Address>& out_offsets(this->section_offsets_);
 
-  const unsigned char *pshdrs = this->get_view(this->elf_file_.shoff(),
+  const unsigned char* pshdrs = this->get_view(this->elf_file_.shoff(),
                                               shnum * This::shdr_size,
                                               true, true);
   // Skip the first, dummy, section.
-  const unsigned char *ps = pshdrs + This::shdr_size;
+  const unsigned char* ps = pshdrs + This::shdr_size;
   for (unsigned int i = 1; i < shnum; ++i, ps += This::shdr_size)
     {
       typename This::Shdr shdr(ps);
@@ -303,7 +303,7 @@ Sized_relobj<size, big_endian>::do_read_relocs(Read_relocs_data* rd)
       if (!is_section_allocated
          && !parameters->options().relocatable()
          && !parameters->options().emit_relocs()
-         && !parameters->options().incremental())
+         && !parameters->incremental())
        continue;
 
       if (this->adjust_shndx(shdr.get_sh_link()) != this->symtab_shndx_)
@@ -369,7 +369,7 @@ Sized_relobj<size, big_endian>::do_read_relocs(Read_relocs_data* rd)
 }
 
 // Process the relocs to generate mappings from source sections to referenced
-// sections.  This is used during garbage colletion to determine garbage 
+// sections.  This is used during garbage collection to determine garbage
 // sections.
 
 template<int size, bool big_endian>
@@ -1000,7 +1000,7 @@ Sized_relobj<size, big_endian>::do_relocate_sections(
            this->emit_relocs(&relinfo, i, sh_type, prelocs, reloc_count,
                              os, output_offset, view, address, view_size,
                              (*pviews)[i].view, (*pviews)[i].view_size);
-         if (parameters->options().incremental())
+         if (parameters->incremental())
            this->incremental_relocs_write(&relinfo, sh_type, prelocs,
                                           reloc_count, os, output_offset, of);
        }
@@ -1591,6 +1591,20 @@ Track_relocs<size, big_endian>::next_symndx() const
   return elfcpp::elf_r_sym<size>(rel.get_r_info());
 }
 
+// Return the addend of the next reloc, or 0 if there isn't one.
+
+template<int size, bool big_endian>
+uint64_t
+Track_relocs<size, big_endian>::next_addend() const
+{
+  if (this->pos_ >= this->len_)
+    return 0;
+  if (this->reloc_size_ == elfcpp::Elf_sizes<size>::rel_size)
+    return 0;
+  elfcpp::Rela<size, big_endian> rela(this->prelocs_ + this->pos_);
+  return rela.get_r_addend();
+}
+
 // Advance to the next reloc whose r_offset is greater than or equal
 // to OFFSET.  Return the number of relocs we skip.