diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 6 | ||||
| -rw-r--r-- | gold/gold.cc | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index f94e170b864..30de67c73de 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2015-03-21 Cary Coutant <ccoutant@google.com> + + PR gold/18152 + * gold.cc (queue_middle_tasks): Finalize .eh_frame after laying out + deferred objects. + 2015-03-11 Cary Coutant <ccoutant@google.com> * options.cc (General_options::finalize): Don't allow -z relro diff --git a/gold/gold.cc b/gold/gold.cc index e345887ac12..39843c28684 100644 --- a/gold/gold.cc +++ b/gold/gold.cc @@ -492,9 +492,6 @@ queue_middle_tasks(const General_options& options, if (timer != NULL) timer->stamp(0); - // Finalize the .eh_frame section. - layout->finalize_eh_frame_section(); - // Add any symbols named with -u options to the symbol table. symtab->add_undefined_symbols_from_command_line(layout); @@ -555,6 +552,9 @@ queue_middle_tasks(const General_options& options, plugins->layout_deferred_objects(); } + // Finalize the .eh_frame section. + layout->finalize_eh_frame_section(); + /* If plugins have specified a section order, re-arrange input sections according to a specified section order. If --section-ordering-file is also specified, do not do anything here. */ |