From 6c111a4ec26ba4a1343cb788c34e4bccce65bfeb Mon Sep 17 00:00:00 2001
From: Luis Machado <luis.machado@arm.com>
Date: Fri, 18 Mar 2022 12:00:35 +0000
Subject: [PATCH] Fix some stale header names from dwarf files

Some of these references were not updated when they were moved to a separate
directory.
---
 gdb/dwarf2/expr.h  |  2 +-
 gdb/dwarf2/frame.c |  4 ++--
 gdb/dwarf2/loc.c   | 12 ++++++------
 gdb/dwarf2/loc.h   |  2 +-
 gdb/dwarf2/read.c  |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gdb/dwarf2/expr.h b/gdb/dwarf2/expr.h
index f76257fd220..4ce9b734f77 100644
--- a/gdb/dwarf2/expr.h
+++ b/gdb/dwarf2/expr.h
@@ -320,4 +320,4 @@ extern const gdb_byte *safe_read_sleb128 (const gdb_byte *buf,
 extern const gdb_byte *safe_skip_leb128 (const gdb_byte *buf,
 					 const gdb_byte *buf_end);
 
-#endif /* dwarf2expr.h */
+#endif /* DWARF2EXPR_H */
diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c
index 0b7ed2c63fd..1c58cfe75fa 100644
--- a/gdb/dwarf2/frame.c
+++ b/gdb/dwarf2/frame.c
@@ -179,7 +179,7 @@ static CORE_ADDR read_encoded_value (struct comp_unit *unit, gdb_byte encoding,
 				     CORE_ADDR func_base);
 
 
-/* See dwarf2-frame.h.  */
+/* See dwarf2/frame.h.  */
 bool dwarf2_frame_unwinders_enabled_p = true;
 
 /* Store the length the expression for the CFA in the `cfa_reg' field,
@@ -769,7 +769,7 @@ dwarf2_frame_find_quirks (struct dwarf2_frame_state *fs,
 }
 
 
-/* See dwarf2-frame.h.  */
+/* See dwarf2/frame.h.  */
 
 int
 dwarf2_fetch_cfa_info (struct gdbarch *gdbarch, CORE_ADDR pc,
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index badc7f89078..d7863841a69 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -585,7 +585,7 @@ const struct symbol_block_ops dwarf2_block_frame_base_loclist_funcs =
   loclist_get_frame_base
 };
 
-/* See dwarf2loc.h.  */
+/* See dwarf2/loc.h.  */
 
 void
 func_get_frame_base_dwarf_block (struct symbol *framefunc, CORE_ADDR pc,
@@ -617,7 +617,7 @@ compute_var_value (const char *name)
   return nullptr;
 }
 
-/* See dwarf2loc.h.  */
+/* See dwarf2/loc.h.  */
 
 unsigned int entry_values_debug = 0;
 
@@ -1604,7 +1604,7 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton,
   return 1;
 }
 
-/* See dwarf2loc.h.  */
+/* See dwarf2/loc.h.  */
 
 bool
 dwarf2_evaluate_property (const struct dynamic_prop *prop,
@@ -1738,7 +1738,7 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
   return false;
 }
 
-/* See dwarf2loc.h.  */
+/* See dwarf2/loc.h.  */
 
 void
 dwarf2_compile_property_to_c (string_file *stream,
@@ -2227,7 +2227,7 @@ unimplemented (unsigned int op)
 	   op);
 }
 
-/* See dwarf2loc.h.
+/* See dwarf2/loc.h.
 
    This is basically a wrapper on gdbarch_dwarf2_reg_to_regnum so that we
    can issue a complaint, which is better than having every target's
@@ -2260,7 +2260,7 @@ throw_bad_regnum_error (ULONGEST dwarf_reg)
 	 pulongest (dwarf_reg));
 }
 
-/* See dwarf2loc.h.  */
+/* See dwarf2/loc.h.  */
 
 int
 dwarf_reg_to_regnum_or_error (struct gdbarch *arch, ULONGEST dwarf_reg)
diff --git a/gdb/dwarf2/loc.h b/gdb/dwarf2/loc.h
index 3a1aae2e9ec..cf02f609cb0 100644
--- a/gdb/dwarf2/loc.h
+++ b/gdb/dwarf2/loc.h
@@ -294,4 +294,4 @@ extern struct value *indirect_synthetic_pointer
    dwarf2_per_objfile *per_objfile, struct frame_info *frame,
    struct type *type, bool resolve_abstract_p = false);
 
-#endif /* dwarf2loc.h */
+#endif /* DWARF2LOC_H */
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 10550336063..f9c942d91d3 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -362,7 +362,7 @@ struct mapped_debug_names final : public mapped_index_base
   { return this->name_count; }
 };
 
-/* See dwarf2read.h.  */
+/* See dwarf2/read.h.  */
 
 dwarf2_per_objfile *
 get_dwarf2_per_objfile (struct objfile *objfile)
-- 
2.30.2