* x86_64.cc (do_adjust_output_section): Set entsize to

	plt_entry_size.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index c9a42a854f67c08a518ba0b7db621e3e430d6de2..5df876fae86eefe448969e1de23aad29cbcb97f1 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-27  Ian Lance Taylor  <iant@google.com>
+
+       * x86_64.cc (do_adjust_output_section): Set entsize to
+       plt_entry_size.
+
 2008-04-23  Elliott Hughes  <enh@google.com>
 
        * output.cc (Output_file::close): After short writes, continue

diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index a486da062c4d9d59174cb208d8987a24b2ac44e0..611c37ed8d4fc7c225fe6682dc511164250f3d98 100644 (file)
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -601,9 +601,7 @@ Output_data_plt_x86_64::Output_data_plt_x86_64(Layout* layout,
 void
 Output_data_plt_x86_64::do_adjust_output_section(Output_section* os)
 {
-  // UnixWare sets the entsize of .plt to 4, and so does the old GNU
-  // linker, and so do we.
-  os->set_entsize(4);
+  os->set_entsize(plt_entry_size);
 }
 
 // Add an entry to the PLT.