diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 6 | ||||
| -rw-r--r-- | gold/options.h | 4 | ||||
| -rw-r--r-- | gold/output.cc | 10 |
3 files changed, 17 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index b632096..1ae668b 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,11 @@ 2010-03-05 Ian Lance Taylor <iant@google.com> + * options.h (class General_options): Add --spare-dynamic-tags. + * output.cc (Output_data_dynamic::set_final_data_size): Implement + --spare-dynamic-tags. + +2010-03-05 Ian Lance Taylor <iant@google.com> + * incremental.cc: Include "libiberty.h". 2010-03-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> diff --git a/gold/options.h b/gold/options.h index fee76dc..7f35bd2 100644 --- a/gold/options.h +++ b/gold/options.h @@ -875,6 +875,10 @@ class General_options N_("Sort common symbols by alignment"), N_("[={ascending,descending}]")); + DEFINE_uint(spare_dynamic_tags, options::TWO_DASHES, '\0', 5, + N_("Dynamic tag slots to reserve (default 5)"), + N_("COUNT")); + DEFINE_bool(strip_all, options::TWO_DASHES, 's', false, N_("Strip all symbols"), NULL); DEFINE_bool(strip_debug, options::TWO_DASHES, 'S', false, diff --git a/gold/output.cc b/gold/output.cc index d49f08b..0627cbe 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1622,9 +1622,13 @@ Output_data_dynamic::set_final_data_size() { // Add the terminating entry if it hasn't been added. // Because of relaxation, we can run this multiple times. - if (this->entries_.empty() - || this->entries_.rbegin()->tag() != elfcpp::DT_NULL) - this->add_constant(elfcpp::DT_NULL, 0); + if (this->entries_.empty() || this->entries_.back().tag() != elfcpp::DT_NULL) + { + int extra = parameters->options().spare_dynamic_tags(); + for (int i = 0; i < extra; ++i) + this->add_constant(elfcpp::DT_NULL, 0); + this->add_constant(elfcpp::DT_NULL, 0); + } int dyn_size; if (parameters->target().get_size() == 32) |