frame, cfa: check unwind stop reason first

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

diff --git a/gold/symtab.cc b/gold/symtab.cc
index 17a0f55b292eeefe66255df4e7ae1e4ea12aaaa4..2e17529b455cee8c8a06df1aba1a3f7cf7696e3d 100644 (file)
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -2940,15 +2940,24 @@ Symbol_table::sized_write_globals(const Stringpool* sympool,
          break;
 
        case Symbol::IN_OUTPUT_DATA:
-         shndx = sym->output_data()->out_shndx();
-         if (shndx >= elfcpp::SHN_LORESERVE)
-           {
-             if (sym_index != -1U)
-               symtab_xindex->add(sym_index, shndx);
-             if (dynsym_index != -1U)
-               dynsym_xindex->add(dynsym_index, shndx);
-             shndx = elfcpp::SHN_XINDEX;
-           }
+         {
+           Output_data* od = sym->output_data();
+
+           shndx = od->out_shndx();
+           if (shndx >= elfcpp::SHN_LORESERVE)
+             {
+               if (sym_index != -1U)
+                 symtab_xindex->add(sym_index, shndx);
+               if (dynsym_index != -1U)
+                 dynsym_xindex->add(dynsym_index, shndx);
+               shndx = elfcpp::SHN_XINDEX;
+             }
+
+           // In object files symbol values are section
+           // relative.
+           if (parameters->options().relocatable())
+             sym_value -= od->address();
+         }
          break;
 
        case Symbol::IN_OUTPUT_SEGMENT: