From 518fe38cd9c206b2a239d9b93677017203c385cb Mon Sep 17 00:00:00 2001
From: Weimin Pan <weimin.pan@oracle.com>
Date: Mon, 7 Oct 2019 00:16:06 +0000
Subject: [PATCH] Renaming of ctf (the trace format) files

---
 gdb/ChangeLog             | 9 +++++++++
 gdb/Makefile.in           | 4 ++--
 gdb/mi/mi-main.c          | 1 -
 gdb/{ctf.c => tracectf.c} | 2 +-
 gdb/{ctf.h => tracectf.h} | 0
 gdb/tracefile.c           | 2 +-
 gdb/tracepoint.c          | 1 -
 7 files changed, 13 insertions(+), 6 deletions(-)
 rename gdb/{ctf.c => tracectf.c} (99%)
 rename gdb/{ctf.h => tracectf.h} (100%)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7bfcab593b8..7d378c88fb9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-07  Weimin Pan  <weimin.pan@oracle.com>
+
+	* tracectf.h: Rename, was ctf.h.
+	* tracectf.c: Rename, was ctf.c, replace ctf.h with tracectf.h.
+	* tracefile.c: Likewise.
+	* tracepoint.c: Remove unused include ctf.h.
+	* mi/mi-main.c: Likewise.
+	* Makefile.in Replace ctf.c with tracectf.c.
+
 2019-10-06  Joel Brobecker  <brobecker@adacore.com>
 
 	* version.in: Change version number to "9.0.50.DATE-git".
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 81bed9085ac..d9026719bba 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -988,7 +988,6 @@ COMMON_SFILES = \
 	cp-namespace.c \
 	cp-support.c \
 	cp-valprint.c \
-	ctf.c \
 	d-lang.c \
 	d-namespace.c \
 	d-valprint.c \
@@ -1124,6 +1123,7 @@ COMMON_SFILES = \
 	thread-iter.c \
 	tid-parse.c \
 	top.c \
+	tracectf.c \
 	tracefile.c \
 	tracefile-tfile.c \
 	tracepoint.c \
@@ -1224,7 +1224,6 @@ HFILES_NO_SRCDIR = \
 	cp-abi.h \
 	cp-support.h \
 	csky-tdep.h \
-	ctf.h \
 	d-lang.h \
 	darwin-nat.h \
 	dcache.h \
@@ -1398,6 +1397,7 @@ HFILES_NO_SRCDIR = \
 	terminal.h \
 	tid-parse.h \
 	top.h \
+	tracectf.h \
 	tracefile.h \
 	tracepoint.h \
 	trad-frame.h \
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 2ece3602056..9a0b7f97b20 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -46,7 +46,6 @@
 #include "osdata.h"
 #include "gdbsupport/gdb_splay_tree.h"
 #include "tracepoint.h"
-#include "ctf.h"
 #include "ada-lang.h"
 #include "linespec.h"
 #include "extension.h"
diff --git a/gdb/ctf.c b/gdb/tracectf.c
similarity index 99%
rename from gdb/ctf.c
rename to gdb/tracectf.c
index b3c3f0d7b26..758dd5681d8 100644
--- a/gdb/ctf.c
+++ b/gdb/tracectf.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "ctf.h"
+#include "tracectf.h"
 #include "tracepoint.h"
 #include "regcache.h"
 #include <sys/stat.h>
diff --git a/gdb/ctf.h b/gdb/tracectf.h
similarity index 100%
rename from gdb/ctf.h
rename to gdb/tracectf.h
diff --git a/gdb/tracefile.c b/gdb/tracefile.c
index a92104bbf34..79ba5414136 100644
--- a/gdb/tracefile.c
+++ b/gdb/tracefile.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "tracefile.h"
-#include "ctf.h"
+#include "tracectf.h"
 #include "exec.h"
 #include "regcache.h"
 #include "gdbsupport/byte-vector.h"
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 843341aaae1..4db70607ef2 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -51,7 +51,6 @@
 #include "memrange.h"
 #include "cli/cli-utils.h"
 #include "probe.h"
-#include "ctf.h"
 #include "gdbsupport/filestuff.h"
 #include "gdbsupport/rsp-low.h"
 #include "tracefile.h"
-- 
2.30.2