1 files changed, 37 insertions, 7 deletions

diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 3177b19..f3e043c 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -533,9 +533,9 @@ struct dwarf2_per_bfd
   }
 
   /* Return the separate '.dwz' debug file.  If there is no
-     .gnu_debugaltlink section in the file, then the result depends on
-     REQUIRE: if REQUIRE is true, error out; if REQUIRE is false,
-     return nullptr.  */
+     .gnu_debugaltlink or .debug_sup section in the file, then the
+     result depends on REQUIRE: if REQUIRE is true, error out; if
+     REQUIRE is false, return nullptr.  */
   struct dwz_file *get_dwz_file (bool require = false)
   {
     gdb_assert (!require || this->dwz_file.has_value ());
@@ -546,7 +546,7 @@ struct dwarf2_per_bfd
       {
 	result = this->dwz_file->get ();
 	if (require && result == nullptr)
-	  error (_("could not read '.gnu_debugaltlink' section"));
+	  error (_("could not find supplementary DWARF file"));
       }
 
     return result;
@@ -634,9 +634,6 @@ public:
   /* Set of dwo_file objects.  */
   dwo_file_up_set dwo_files;
 
-  /* True if we've checked for whether there is a DWP file.  */
-  bool dwp_checked = false;
-
   /* The DWP file if there is one, or NULL.  */
   dwp_file_up dwp_file;
 
@@ -1028,6 +1025,39 @@ private:
 
   const char *read_dwo_str_index (ULONGEST str_index);
 
+  gdb_bfd_ref_ptr open_dwo_file (dwarf2_per_bfd *per_bfd, const char *file_name,
+				 const char *comp_dir);
+
+  dwo_file_up open_and_init_dwo_file (dwarf2_cu *cu, const char *dwo_name,
+				      const char *comp_dir);
+
+  void locate_dwo_sections (struct objfile *objfile, bfd *abfd, asection *sectp,
+			    struct dwo_sections *dwo_sections);
+
+  void create_dwo_cus_hash_table (dwarf2_cu *cu, dwo_file &dwo_file);
+
+  void create_dwo_debug_types_hash_table
+    (dwarf2_per_bfd *per_bfd, dwo_file *dwo_file,
+     gdb::array_view<dwarf2_section_info> type_sections);
+
+  void create_dwo_debug_type_hash_table (dwarf2_per_bfd *per_bfd,
+					 dwo_file *dwo_file,
+					 dwarf2_section_info *section,
+					 rcuh_kind section_kind);
+
+  dwo_unit *lookup_dwo_cutu (dwarf2_cu *cu, const char *dwo_name,
+			     const char *comp_dir, ULONGEST signature,
+			     int is_debug_types);
+
+  dwo_unit *lookup_dwo_comp_unit (dwarf2_cu *cu, const char *dwo_name,
+				  const char *comp_dir, ULONGEST signature);
+
+  dwo_unit *lookup_dwo_type_unit (dwarf2_cu *cu, const char *dwo_name,
+				  const char *comp_dir);
+
+  dwo_unit *lookup_dwo_unit (dwarf2_cu *cu, die_info *comp_unit_die,
+			     const char *dwo_name);
+
   /* The bfd of die_section.  */
   bfd *m_abfd;