From 04ceb17cc3c01f9c25a77a6b3b7c53822a77c21c Mon Sep 17 00:00:00 2001
From: Doug Kwan <dougkwan@google.com>
Date: Thu, 15 Apr 2010 00:42:15 +0000
Subject: 2010-04-14 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_output_section::fix_exidx_coverage): Mark object
for local symbol recounting if we remove a section due to ICF.
* gold.cc (queue_middle_gc_tasks): Create a dummy blocker if
there are no regular objects in input.
---
gold/ChangeLog | 7 +++++++
gold/arm.cc | 4 +++-
gold/gold.cc | 10 ++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 0fd5fde..d553e1b 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-14 Doug Kwan <dougkwan@google.com>
+
+ * arm.cc (Arm_output_section::fix_exidx_coverage): Mark object
+ for local symbol recounting if we remove a section due to ICF.
+ * gold.cc (queue_middle_gc_tasks): Create a dummy blocker if
+ there are no regular objects in input.
+
2010-04-13 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::set_final_data_size): Compute
diff --git a/gold/arm.cc b/gold/arm.cc
index 036160f..028069b 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -5696,8 +5696,10 @@ Arm_output_section<big_endian>::fix_exidx_coverage(
unsigned int text_shndx = exidx_input_section->link();
gold_assert(symtab->is_section_folded(p->relobj(), text_shndx));
- // Remove this from link.
+ // Remove this from link. We also need to recount the
+ // local symbols.
p->relobj()->set_output_section(p->shndx(), NULL);
+ arm_relobj->set_output_local_symbol_count_needs_update();
}
}
diff --git a/gold/gold.cc b/gold/gold.cc
index b5508ae..ba02db2 100644
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -276,6 +276,16 @@ queue_middle_gc_tasks(const General_options& options,
next_blocker));
this_blocker = next_blocker;
}
+
+ // If we are given only archives in input, we have no regular
+ // objects and THIS_BLOCKER is NULL here. Create a dummy
+ // blocker here so that we can run the middle tasks immediately.
+ if (this_blocker == NULL)
+ {
+ gold_assert(input_objects->number_of_relobjs() == 0);
+ this_blocker = new Task_token(true);
+ }
+
workqueue->queue(new Task_function(new Middle_runner(options,
input_objects,
symtab,
--
cgit v1.1