elf32-arm.c (elf32_arm_tls_relax): Note fixme pointed out by AlanM

[deliverable/binutils-gdb.git] / gold / incremental.cc

diff --git a/gold/incremental.cc b/gold/incremental.cc
index 5a1d3d9006ebb1929c1e0860bb09bf4a1dc27358..aa9d7d3a7fe99c9f6e1686ae8cd158622d6a74d2 100644 (file)
--- a/gold/incremental.cc
+++ b/gold/incremental.cc
@@ -401,7 +401,10 @@ Incremental_inputs::report_command_line(int argc, const char* const* argv)
   for (int i = 1; i < argc; ++i)
     {
       // Adding/removing these options should not result in a full relink.
-      if (strcmp(argv[i], "--incremental-changed") == 0
+      if (strcmp(argv[i], "--incremental") == 0
+         || strcmp(argv[i], "--incremental-full") == 0
+         || strcmp(argv[i], "--incremental-update") == 0
+         || strcmp(argv[i], "--incremental-changed") == 0
          || strcmp(argv[i], "--incremental-unchanged") == 0
          || strcmp(argv[i], "--incremental-unknown") == 0)
         continue;
@@ -622,7 +625,7 @@ Output_section_incremental_inputs<size, big_endian>::set_final_data_size()
        case INCREMENTAL_INPUT_OBJECT:
        case INCREMENTAL_INPUT_ARCHIVE_MEMBER:
          {
-           Incremental_object_entry *entry = (*p)->object_entry();
+           Incremental_object_entry* entry = (*p)->object_entry();
            gold_assert(entry != NULL);
            (*p)->set_info_offset(info_offset);
            // Input section count + global symbol count.
@@ -637,7 +640,7 @@ Output_section_incremental_inputs<size, big_endian>::set_final_data_size()
          break;
        case INCREMENTAL_INPUT_SHARED_LIBRARY:
          {
-           Incremental_object_entry *entry = (*p)->object_entry();
+           Incremental_object_entry* entry = (*p)->object_entry();
            gold_assert(entry != NULL);
            (*p)->set_info_offset(info_offset);
            // Global symbol count.
@@ -650,7 +653,7 @@ Output_section_incremental_inputs<size, big_endian>::set_final_data_size()
          break;
        case INCREMENTAL_INPUT_ARCHIVE:
          {
-           Incremental_archive_entry *entry = (*p)->archive_entry();
+           Incremental_archive_entry* entry = (*p)->archive_entry();
            gold_assert(entry != NULL);
            (*p)->set_info_offset(info_offset);
            // Member count + unused global symbol count.
@@ -873,6 +876,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;