From bd9e0d4628f1265c42516f90c4f162cefa787294 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Sat, 21 Mar 2015 17:47:49 -0700 Subject: Fix internal error in do_relocate_sections when using plugins. In a previous patch for PR 14675, to fix a problem with the .eh_frame section when static linking, I added a step to finalize the .eh_frame section at the end of the first link pass. This patch caused PR 18152, where a plugin-claimed object caused a non-claimed object's layout to be deferred until replacement files were read. The call to finalize_eh_frame_section() is happening before the layout of the deferred objects, leading to the internal error in do_relocate_sections. This patch moves the finalization of the .eh_frame section to after deferred objects have been processed. gold/ PR gold/14675 PR gold/18152 * gold.cc (queue_middle_tasks): Finalize .eh_frame after laying out deferred objects. --- gold/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gold/ChangeLog') 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 + + PR gold/18152 + * gold.cc (queue_middle_tasks): Finalize .eh_frame after laying out + deferred objects. + 2015-03-11 Cary Coutant * options.cc (General_options::finalize): Don't allow -z relro -- cgit v1.2.1