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  <tom@tromey.com>

	* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7ca4738be02bd6e50f214fea47e4044e61713001..82131c11038dc41be98cd016fea1933de72410a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2021-05-17  Tom Tromey  <tom@tromey.com>
+
+       * 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  <tom@tromey.com>
 
        * dwarf2/read.c (maybe_queue_comp_unit)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 1f37fe43024b3327351355fbd4401b2af3504420..a9fade803b0d0c8b5f6a5ce8d165eab044759044 100644 (file)
--- 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 e22f2e9a91c670270267f6a934a7278c0df18ec2..8cc741df59521e51256e1c07d0ad694e9fb0ed0a 100644 (file)
--- a/gdb/dwarf2/comp-unit.c
+++ b/gdb/dwarf2/comp-unit-head.c
@@ -25,13 +25,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 83a4aac3f08fd46e17adc91518d3728df346609a..ff56ec5527b456659466c4781cbf24289c793b7f 100644 (file)
--- 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 7575297f9667ff6c5885f57ec50482b73509825f..07a8f5aa109acaa506fda2bdc343b1e124a2f027 100644 (file)
--- a/gdb/dwarf2/line-header.c
+++ b/gdb/dwarf2/line-header.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 7a321c14d4519d049c185817dda1a066f7051f16..8a57aeee61cabdb1686bd8d229ea3b860668e7b7 100644 (file)
--- 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 756d1934ca0c2fced81d88b91090a7614159f90f..6af1f44bd47c74f57d28c7dd04edb124bd1c9d91 100644 (file)
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -22,7 +22,7 @@
 
 #include <queue>
 #include <unordered_map>
-#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"