From 612a8d3dbf065f5fbaf7d9fe094a252ea6eb6c17 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 9 Feb 2010 20:29:44 +0000 Subject: * output.h (Output_data_dynamic::add_section_size): New method that takes two Output_data objects. (Output_data_dynamic::Dynamic_entry): Create storage for secondary entry param. Handle it in initializers. * output.cc (Output_data_dynamic::Dynamic_entry::write): For DYNAMIC_SECTION_SIZE, add in second object size if non-NULL. * layout.h (Layout::add_target_dynamic_tags): Add dynrel_includes_plt arg. * layout.cc (Layout::add_target_dynamic_tags): If dynrel_includes_plt, and .rela.plt exists, set DT_REL{,A}SZ to sum of .rela.dyn and .rela.plt * arm.cc (Target_arm::do_finalize_sections): Update to pass false for dynrel_includes_plt. * i386.cc (Target_i386::do_finalize_sections): Likewise. * x86_64.cc (Target_x86_64::do_finalize_sections): Likewise. * sparc.cc (Target_sparc::make_plt_entry): Force .rela.dyn to be output before .rela.plt (Target_sparc::do_finalize_sections): Update to pass true for dynrel_includes_plt. * powerpc.cc (Target_powerpc::make_plt_entry): Force .rela.dyn to be output before .rela.plt (Target_powerpc::do_finalize_sections): Update to pass true for dynrel_includes_plt when 32-bit. --- gold/output.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gold/output.cc') diff --git a/gold/output.cc b/gold/output.cc index a8f03e7..4b34b8b 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1560,6 +1560,8 @@ Output_data_dynamic::Dynamic_entry::write( case DYNAMIC_SECTION_SIZE: val = this->u_.od->data_size(); + if (this->od2 != NULL) + val += this->od2->data_size(); break; case DYNAMIC_SYMBOL: -- cgit v1.1