X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gold%2Flayout.h;h=79785bfd02bca534f62753c1d045f1c4df088097;hb=91d6fa6a035cc7d0b7be5c99c194a64cb80924b0;hp=71afa966f59c6002de9b1ae1746edea9b9aa0214;hpb=01fe1b4183324882e88e8c64748bffdc69ea3a9c;p=thirdparty%2Fbinutils-gdb.git

diff --git a/gold/layout.h b/gold/layout.h
index 71afa966f59..79785bfd02b 100644
--- a/gold/layout.h
+++ b/gold/layout.h
@@ -151,10 +151,10 @@ class Kept_section
 
   // Set the object.
   void
-  set_object(Relobj* object)
+  set_object(Relobj* obj)
   {
     gold_assert(this->object_ == NULL);
-    this->object_ = object;
+    this->object_ = obj;
   }
 
   // The section index.
@@ -164,10 +164,10 @@ class Kept_section
 
   // Set the section index.
   void
-  set_shndx(unsigned int shndx)
+  set_shndx(unsigned int sec_shndx)
   {
     gold_assert(this->shndx_ == 0);
-    this->shndx_ = shndx;
+    this->shndx_ = sec_shndx;
   }
 
   // Whether this is a comdat group.
@@ -198,11 +198,11 @@ class Kept_section
 
   // Add a section to the group list.
   void
-  add_comdat_section(const std::string& name, unsigned int shndx,
+  add_comdat_section(const std::string& name, unsigned int sec_shndx,
 		     uint64_t size)
   {
     gold_assert(this->is_comdat_);
-    Comdat_section_info sinfo(shndx, size);
+    Comdat_section_info sinfo(sec_shndx, size);
     this->u_.group_sections->insert(std::make_pair(name, sinfo));
   }