From: Cary Coutant <ccoutant@google.com>
Date: Wed, 1 May 2013 17:37:14 +0000 (+0000)
Subject: gold/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ad3dabab5613c44aa20aa8698710351ea554721;p=binutils-gdb.git

gold/
	* stringpool.cc (Stringpool_template::new_key_offset): Fix
	uninitialized warning.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index aadefe00c41..a6f3d598541 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-01  Cary Coutant  <ccoutant@google.com>
+
+	* stringpool.cc (Stringpool_template::new_key_offset): Fix
+	uninitialized warning.
+
 2013-04-29  Alexander Ivchenko  <alexander.ivchenko@intel.com>
 
 	* output.cc (Output_section::add_merge_input_section): Allow
diff --git a/gold/stringpool.cc b/gold/stringpool.cc
index 072b00df7a3..665fcc8ce59 100644
--- a/gold/stringpool.cc
+++ b/gold/stringpool.cc
@@ -222,9 +222,10 @@ Stringpool_template<Stringpool_char>::new_key_offset(size_t length)
     offset = 0;
   else
     {
+      offset = this->offset_;
       // Align non-zero length strings.
       if (length != 0)
-	offset = align_address(this->offset_, this->addralign_);
+	offset = align_address(offset, this->addralign_);
       this->offset_ = offset + (length + 1) * sizeof(Stringpool_char);
     }
   this->key_to_offset_.push_back(offset);