* incremental.cc (Output_section_incremental_inputs::write_info_blocks):

	Resolve forwarding symbols.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 4286d4bc35fc6ec72f297ca653f526b623b8166e..be2bb578d3ffb9c1b5efa973e1c24bacdfa57e18 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-15  Cary Coutant  <ccoutant@google.com>
+
+       * incremental.cc (Output_section_incremental_inputs::write_info_blocks):
+       Resolve forwarding symbols.
+
 2010-09-15  Doug Kwan  <dougkwan@google.com>
 
        * gold/testsuite/script_test_3.t: Add ARM special sections.

diff --git a/gold/incremental.cc b/gold/incremental.cc
index 6a98ca240daa27644545cba5972d127181b4727d..0bd869e8df9bd16c0a2e7701f9921c0aa0c698b3 100644 (file)
--- a/gold/incremental.cc
+++ b/gold/incremental.cc
@@ -873,6 +873,8 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(
            for (unsigned int i = 0; i < nsyms; i++)
              {
                const Symbol* sym = (*syms)[i];
+               if (sym->is_forwarder())
+                 sym = this->symtab_->resolve_forwards(sym);
                unsigned int symtab_index = sym->symtab_index();
                unsigned int chain = 0;
                unsigned int first_reloc = 0;