From cd53fa40d480468bdcfc2992cf9753fb59bc7a23 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 17 May 2021 14:16:06 -0600 Subject: [PATCH] Rename dwarf2/comp-unit.h Simon pointed out that dwarf2/cu.h and dwarf2/comp-unit.h seemingly mean the same thing. He suggested renaming the latter to comp-unit-head.h, which is what this patch does. gdb/ChangeLog 2021-05-17 Tom Tromey * dwarf2/read.h: Update include. * dwarf2/read.c: Update include. * dwarf2/line-header.c: Update include. * dwarf2/cu.h: Update include. * dwarf2/comp-unit-head.h: Rename from comp-unit.h. * dwarf2/comp-unit-head.c: Rename from comp-unit.c. * Makefile.in (COMMON_SFILES): Update. --- gdb/ChangeLog | 10 ++++++++++ gdb/Makefile.in | 2 +- gdb/dwarf2/{comp-unit.c => comp-unit-head.c} | 6 +++--- gdb/dwarf2/{comp-unit.h => comp-unit-head.h} | 0 gdb/dwarf2/cu.h | 2 +- gdb/dwarf2/line-header.c | 2 +- gdb/dwarf2/read.c | 2 +- gdb/dwarf2/read.h | 2 +- 8 files changed, 18 insertions(+), 8 deletions(-) rename gdb/dwarf2/{comp-unit.c => comp-unit-head.c} (98%) rename gdb/dwarf2/{comp-unit.h => comp-unit-head.h} (100%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7ca4738be0..82131c1103 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2021-05-17 Tom Tromey + + * dwarf2/read.h: Update include. + * dwarf2/read.c: Update include. + * dwarf2/line-header.c: Update include. + * dwarf2/cu.h: Update include. + * dwarf2/comp-unit-head.h: Rename from comp-unit.h. + * dwarf2/comp-unit-head.c: Rename from comp-unit.c. + * Makefile.in (COMMON_SFILES): Update. + 2021-05-17 Tom Tromey * dwarf2/read.c (maybe_queue_comp_unit) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 1f37fe4302..a9fade803b 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1025,7 +1025,7 @@ COMMON_SFILES = \ dummy-frame.c \ dwarf2/abbrev.c \ dwarf2/attribute.c \ - dwarf2/comp-unit.c \ + dwarf2/comp-unit-head.c \ dwarf2/cu.c \ dwarf2/dwz.c \ dwarf2/expr.c \ diff --git a/gdb/dwarf2/comp-unit.c b/gdb/dwarf2/comp-unit-head.c similarity index 98% rename from gdb/dwarf2/comp-unit.c rename to gdb/dwarf2/comp-unit-head.c index e22f2e9a91..8cc741df59 100644 --- a/gdb/dwarf2/comp-unit.c +++ b/gdb/dwarf2/comp-unit-head.c @@ -25,13 +25,13 @@ along with this program. If not, see . */ #include "defs.h" -#include "dwarf2/comp-unit.h" +#include "dwarf2/comp-unit-head.h" #include "dwarf2/leb.h" #include "dwarf2/read.h" #include "dwarf2/section.h" #include "dwarf2/stringify.h" -/* See comp-unit.h. */ +/* See comp-unit-head.h. */ const gdb_byte * read_comp_unit_head (struct comp_unit_head *cu_header, @@ -172,7 +172,7 @@ error_check_comp_unit_head (dwarf2_per_objfile *per_objfile, filename); } -/* See comp-unit.h. */ +/* See comp-unit-head.h. */ const gdb_byte * read_and_check_comp_unit_head (dwarf2_per_objfile *per_objfile, diff --git a/gdb/dwarf2/comp-unit.h b/gdb/dwarf2/comp-unit-head.h similarity index 100% rename from gdb/dwarf2/comp-unit.h rename to gdb/dwarf2/comp-unit-head.h diff --git a/gdb/dwarf2/cu.h b/gdb/dwarf2/cu.h index 83a4aac3f0..ff56ec5527 100644 --- a/gdb/dwarf2/cu.h +++ b/gdb/dwarf2/cu.h @@ -21,7 +21,7 @@ #define GDB_DWARF2_CU_H #include "buildsym.h" -#include "dwarf2/comp-unit.h" +#include "dwarf2/comp-unit-head.h" #include "gdbsupport/gdb_optional.h" /* Type used for delaying computation of method physnames. diff --git a/gdb/dwarf2/line-header.c b/gdb/dwarf2/line-header.c index 7575297f96..07a8f5aa10 100644 --- a/gdb/dwarf2/line-header.c +++ b/gdb/dwarf2/line-header.c @@ -18,7 +18,7 @@ along with this program. If not, see . */ #include "defs.h" -#include "dwarf2/comp-unit.h" +#include "dwarf2/comp-unit-head.h" #include "dwarf2/leb.h" #include "dwarf2/line-header.h" #include "dwarf2/read.h" diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 7a321c14d4..8a57aeee61 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -32,7 +32,7 @@ #include "dwarf2/read.h" #include "dwarf2/abbrev.h" #include "dwarf2/attribute.h" -#include "dwarf2/comp-unit.h" +#include "dwarf2/comp-unit-head.h" #include "dwarf2/cu.h" #include "dwarf2/index-cache.h" #include "dwarf2/index-common.h" diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index 756d1934ca..6af1f44bd4 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -22,7 +22,7 @@ #include #include -#include "dwarf2/comp-unit.h" +#include "dwarf2/comp-unit-head.h" #include "dwarf2/index-cache.h" #include "dwarf2/section.h" #include "filename-seen-cache.h" -- 2.34.1