From: Gary Benson <gbenson@redhat.com>
Date: Mon, 28 Jul 2014 13:35:17 +0000 (+0100)
Subject: Move common-utils.h to common-defs.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e76df0d08686820dee6d6f440431d962c7631bd3;p=binutils-gdb.git

Move common-utils.h to common-defs.h

This commit moves the inclusion of common-utils.h to common-defs.h and
removes all other inclusions.

gdb/
2014-08-07  Gary Benson  <gbenson@redhat.com>

	* common/common-defs.h: Include common-utils.h.
	* defs.h: Do not include common-utils.h.
	* common/gdb_assert.h: Likewise.
	* darwin-nat.h: Likewise.
	* nat/linux-btrace.c: Likewise.
	* target/waitstatus.h: Likewise.

gdb/gdbserver/
2014-08-07  Gary Benson  <gbenson@redhat.com>

	* server.h: Do not include common-utils.h.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 86274e886a3..d5068b2fad5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* common/common-defs.h: Include common-utils.h.
+	* defs.h: Do not include common-utils.h.
+	* common/gdb_assert.h: Likewise.
+	* darwin-nat.h: Likewise.
+	* nat/linux-btrace.c: Likewise.
+	* target/waitstatus.h: Likewise.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* common/common-defs.h: Include ptid.h.
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 7bf328a9645..6a031ecee4a 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -37,5 +37,6 @@
 #include "gdb/signals.h"
 #include "gdb_locale.h"
 #include "ptid.h"
+#include "common-utils.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h
index 4869fc45d40..7b795d3c18f 100644
--- a/gdb/common/gdb_assert.h
+++ b/gdb/common/gdb_assert.h
@@ -19,8 +19,6 @@
 #ifndef GDB_ASSERT_H
 #define GDB_ASSERT_H
 
-#include "common-utils.h" /* For FUNCTION_NAME.  */
-
 /* A static assertion.  This will cause a compile-time error if EXPR,
    which must be a compile-time constant, is false.  */
 
diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h
index 84f4be1413a..4f2bebbcf1a 100644
--- a/gdb/darwin-nat.h
+++ b/gdb/darwin-nat.h
@@ -18,7 +18,6 @@
 #define __DARWIN_NAT_H__
 
 #include <mach/mach.h>
-#include "common-utils.h" /* For FUNCTION_NAME.  */
 
 /* Describe the mach exception handling state for a task.  This state is saved
    before being changed and restored when a process is detached.
diff --git a/gdb/defs.h b/gdb/defs.h
index 8513606c276..710298c627d 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -533,8 +533,6 @@ enum val_prettyformat
 
 extern int longest_to_int (LONGEST);
 
-#include "common-utils.h"
-
 /* * List of known OS ABIs.  If you change this, make sure to update the
    table in osabi.c.  */
 enum gdb_osabi
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b51d87092c0..a43ddcd69cc 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* server.h: Do not include common-utils.h.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* server.h: Do not include ptid.h.
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index ca2729c350f..5a3f335bc68 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -131,7 +131,6 @@ extern int handle_target_event (int err, gdb_client_data client_data);
 
 #include "remote-utils.h"
 
-#include "common-utils.h"
 #include "utils.h"
 #include "debug.h"
 
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index 188220b651a..84de8a70a92 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -26,7 +26,6 @@
 #endif
 
 #include "linux-btrace.h"
-#include "common-utils.h"
 #include "gdb_assert.h"
 #include "regcache.h"
 #include "gdbthread.h"
diff --git a/gdb/target/waitstatus.h b/gdb/target/waitstatus.h
index c05d6511248..f818d87e533 100644
--- a/gdb/target/waitstatus.h
+++ b/gdb/target/waitstatus.h
@@ -20,7 +20,6 @@
 #ifndef WAITSTATUS_H
 #define WAITSTATUS_H
 
-#include "common-utils.h"
 #include "gdb_signals.h"
 
 /* Stuff for target_wait.  */