Use a stamp file for version.c

[deliverable/binutils-gdb.git] / gdb / dwarf-index-write.c

diff --git a/gdb/dwarf-index-write.c b/gdb/dwarf-index-write.c
index 4c596c2e3eb083e30ed3f03b5757d0ce445e3eef..d2831461ca3c7911fa95000788c4fa22c138ed2f 100644 (file)
--- a/gdb/dwarf-index-write.c
+++ b/gdb/dwarf-index-write.c
@@ -154,7 +154,7 @@ private:
   gdb_byte *grow (size_t size)
   {
     m_vec.resize (m_vec.size () + size);
-    return &*m_vec.end () - size;
+    return &*(m_vec.end () - size);
   }
 
   gdb::byte_vector m_vec;
@@ -588,12 +588,14 @@ write_one_signatured_type (void **slot, void *d)
 
   write_psymbols (info->symtab,
                  info->psyms_seen,
-                 &info->objfile->global_psymbols[psymtab->globals_offset],
+                 (info->objfile->global_psymbols.data ()
+                  + psymtab->globals_offset),
                  psymtab->n_global_syms, info->cu_index,
                  0);
   write_psymbols (info->symtab,
                  info->psyms_seen,
-                 &info->objfile->static_psymbols[psymtab->statics_offset],
+                 (info->objfile->static_psymbols.data ()
+                  + psymtab->statics_offset),
                  psymtab->n_static_syms, info->cu_index,
                  1);
 
@@ -643,12 +645,12 @@ recursively_write_psymbols (struct objfile *objfile,
 
   write_psymbols (symtab,
                  psyms_seen,
-                 &objfile->global_psymbols[psymtab->globals_offset],
+                 objfile->global_psymbols.data () + psymtab->globals_offset,
                  psymtab->n_global_syms, cu_index,
                  0);
   write_psymbols (symtab,
                  psyms_seen,
-                 &objfile->static_psymbols[psymtab->statics_offset],
+                 objfile->static_psymbols.data () + psymtab->statics_offset,
                  psymtab->n_static_syms, cu_index,
                  1);
 }
@@ -839,10 +841,10 @@ public:
                                    psyms_seen, cu_index);
 
     write_psymbols (psyms_seen,
-                   &objfile->global_psymbols[psymtab->globals_offset],
+                   objfile->global_psymbols.data () + psymtab->globals_offset,
                    psymtab->n_global_syms, cu_index, false, unit_kind::cu);
     write_psymbols (psyms_seen,
-                   &objfile->static_psymbols[psymtab->statics_offset],
+                   objfile->static_psymbols.data () + psymtab->statics_offset,
                    psymtab->n_static_syms, cu_index, true, unit_kind::cu);
   }
 
@@ -931,8 +933,7 @@ private:
            = m_str_table.emplace (c_str_view (s),
                                   data - dwarf2_per_objfile->str.buffer);
          if (!insertpair.second)
-           complaint (&symfile_complaints,
-                      _("Duplicate string \"%s\" in "
+           complaint (_("Duplicate string \"%s\" in "
                         ".debug_str section [in module %s]"),
                       s, bfd_get_filename (m_abfd));
          data += strlen (s) + 1;
@@ -1200,11 +1201,13 @@ private:
     struct partial_symtab *psymtab = entry->per_cu.v.psymtab;
 
     write_psymbols (info->psyms_seen,
-                   &info->objfile->global_psymbols[psymtab->globals_offset],
+                   (info->objfile->global_psymbols.data ()
+                    + psymtab->globals_offset),
                    psymtab->n_global_syms, info->cu_index, false,
                    unit_kind::tu);
     write_psymbols (info->psyms_seen,
-                   &info->objfile->static_psymbols[psymtab->statics_offset],
+                   (info->objfile->static_psymbols.data ()
+                    + psymtab->statics_offset),
                    psymtab->n_static_syms, info->cu_index, true,
                    unit_kind::tu);