Rename write_psymtabs_to_index

We'll be removing all the psymtab code from the DWARF reader.  As a
preparatory step, this renames write_psymtabs_to_index to avoid the
"psymtab" name.

diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c
index db9a6eb5630561d0d99c8f4ad79d43ad5c286117..18e60cbd78cd5ee0389e86eca8f828c4c197450b 100644 (file)
--- a/gdb/dwarf2/index-cache.c
+++ b/gdb/dwarf2/index-cache.c
@@ -148,9 +148,9 @@ index_cache::store (dwarf2_per_objfile *per_objfile)
 
       /* Write the index itself to the directory, using the build id as the
         filename.  */
-      write_psymtabs_to_index (per_objfile, m_dir.c_str (),
-                              build_id_str.c_str (), dwz_build_id_ptr,
-                              dw_index_kind::GDB_INDEX);
+      write_dwarf_index (per_objfile, m_dir.c_str (),
+                        build_id_str.c_str (), dwz_build_id_ptr,
+                        dw_index_kind::GDB_INDEX);
     }
   catch (const gdb_exception_error &except)
     {

diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 7a6bc24a3e6183300ab4601e5f79994f8f03855c..95202db2810557ee9e52d1fbb6ce1642d42e70ea 100644 (file)
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -1577,9 +1577,9 @@ struct index_wip_file
 /* See dwarf-index-write.h.  */
 
 void
-write_psymtabs_to_index (dwarf2_per_objfile *per_objfile, const char *dir,
-                        const char *basename, const char *dwz_basename,
-                        dw_index_kind index_kind)
+write_dwarf_index (dwarf2_per_objfile *per_objfile, const char *dir,
+                  const char *basename, const char *dwz_basename,
+                  dw_index_kind index_kind)
 {
   dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
   struct objfile *objfile = per_objfile->objfile;
@@ -1675,8 +1675,8 @@ save_gdb_index_command (const char *arg, int from_tty)
              if (dwz != NULL)
                dwz_basename = lbasename (dwz->filename ());
 
-             write_psymtabs_to_index (per_objfile, arg, basename, dwz_basename,
-                                      index_kind);
+             write_dwarf_index (per_objfile, arg, basename, dwz_basename,
+                                index_kind);
            }
          catch (const gdb_exception_error &except)
            {

diff --git a/gdb/dwarf2/index-write.h b/gdb/dwarf2/index-write.h
index 0fbae38f5305755c514ac1024745f121c73973f3..b8855dcae7c814bc4bf1d29ca4c404f0905f7a54 100644 (file)
--- a/gdb/dwarf2/index-write.h
+++ b/gdb/dwarf2/index-write.h
@@ -32,7 +32,7 @@
    derived from INDEX_KIND is added to this base name.  DWZ_BASENAME is the
    same, but for the dwz file's index.  */
 
-extern void write_psymtabs_to_index
+extern void write_dwarf_index
   (dwarf2_per_objfile *per_objfile, const char *dir, const char *basename,
    const char *dwz_basename, dw_index_kind index_kind);