aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2011-12-16 23:47:03 +0000
committerIan Lance Taylor <ian@airs.com>2011-12-16 23:47:03 +0000
commit8b8dd8d585ea24379d2ce48990edac33352dac10 (patch)
treee850d3ab464a036b1e3787c2f4e1314490ecb534
parent3448d4bf3cc236467b9e6434a71ba9e4acf349ed (diff)
downloadfsf-binutils-gdb-8b8dd8d585ea24379d2ce48990edac33352dac10.zip
fsf-binutils-gdb-8b8dd8d585ea24379d2ce48990edac33352dac10.tar.gz
fsf-binutils-gdb-8b8dd8d585ea24379d2ce48990edac33352dac10.tar.bz2
* output.h (Output_data_reloc_generic::add): Only call
add_dynamic_reloc if this is a dynamic reloc section.
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/output.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index bce7739..e3abb30 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-16 Ian Lance Taylor <iant@google.com>
+
+ * output.h (Output_data_reloc_generic::add): Only call
+ add_dynamic_reloc if this is a dynamic reloc section.
+
2011-12-15 H.J. Lu <hongjiu.lu@intel.com>
PR gold/13505
diff --git a/gold/output.h b/gold/output.h
index e704213..ef6fea1 100644
--- a/gold/output.h
+++ b/gold/output.h
@@ -1458,7 +1458,8 @@ class Output_data_reloc_base : public Output_data_reloc_generic
{
this->relocs_.push_back(reloc);
this->set_current_data_size(this->relocs_.size() * reloc_size);
- od->add_dynamic_reloc();
+ if (dynamic)
+ od->add_dynamic_reloc();
if (reloc.is_relative())
this->bump_relative_reloc_count();
Sized_relobj<size, big_endian>* relobj = reloc.get_relobj();