aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/gdbthread.h4
-rw-r--r--gdb/inferior.h16
-rw-r--r--gdb/infrun.c15
4 files changed, 6 insertions, 34 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 40de562..5690c2a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-23 Doug Evans <dje@google.com>
+
+ * inferior.h (struct inferior_suspend_state): Delete, unused.
+ All references deleted.
+
2015-06-23 Mike Frysinger <vapier@gentoo.org>
* microblaze-tdep.c (microblaze_push_dummy_code): Delete.
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 0926f5f..fefad48 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -145,9 +145,7 @@ struct thread_control_state
int stepping_command;
};
-/* Inferior thread specific part of `struct infcall_suspend_state'.
-
- Inferior process counterpart is `struct inferior_suspend_state'. */
+/* Inferior thread specific part of `struct infcall_suspend_state'. */
struct thread_suspend_state
{
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 0d242fe..2054a2a 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -276,16 +276,6 @@ struct inferior_control_state
enum stop_kind stop_soon;
};
-/* Inferior process specific part of `struct infcall_suspend_state'.
-
- Inferior thread counterpart is `struct thread_suspend_state'. */
-
-#if 0 /* Currently unused and empty structures are not valid C. */
-struct inferior_suspend_state
-{
-};
-#endif
-
/* GDB represents the state of each program execution with an object
called an inferior. An inferior typically corresponds to a process
but is more general and applies also to targets that do not have a
@@ -314,12 +304,6 @@ struct inferior
See `struct inferior_control_state'. */
struct inferior_control_state control;
- /* State of inferior process to restore after GDB is done with an inferior
- call. See `struct inferior_suspend_state'. */
-#if 0 /* Currently unused and empty structures are not valid C. */
- struct inferior_suspend_state suspend;
-#endif
-
/* True if this was an auto-created inferior, e.g. created from
following a fork; false, if this inferior was manually added by
the user, and we should not attempt to prune it
diff --git a/gdb/infrun.c b/gdb/infrun.c
index d8eb0b0..233d0f8 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -7256,9 +7256,6 @@ siginfo_make_value (struct gdbarch *gdbarch, struct internalvar *var,
struct infcall_suspend_state
{
struct thread_suspend_state thread_suspend;
-#if 0 /* Currently unused and empty structures are not valid C. */
- struct inferior_suspend_state inferior_suspend;
-#endif
/* Other fields: */
CORE_ADDR stop_pc;
@@ -7278,9 +7275,6 @@ save_infcall_suspend_state (void)
{
struct infcall_suspend_state *inf_state;
struct thread_info *tp = inferior_thread ();
-#if 0
- struct inferior *inf = current_inferior ();
-#endif
struct regcache *regcache = get_current_regcache ();
struct gdbarch *gdbarch = get_regcache_arch (regcache);
gdb_byte *siginfo_data = NULL;
@@ -7314,9 +7308,6 @@ save_infcall_suspend_state (void)
}
inf_state->thread_suspend = tp->suspend;
-#if 0 /* Currently unused and empty structures are not valid C. */
- inf_state->inferior_suspend = inf->suspend;
-#endif
/* run_inferior_call will not use the signal due to its `proceed' call with
GDB_SIGNAL_0 anyway. */
@@ -7335,16 +7326,10 @@ void
restore_infcall_suspend_state (struct infcall_suspend_state *inf_state)
{
struct thread_info *tp = inferior_thread ();
-#if 0
- struct inferior *inf = current_inferior ();
-#endif
struct regcache *regcache = get_current_regcache ();
struct gdbarch *gdbarch = get_regcache_arch (regcache);
tp->suspend = inf_state->thread_suspend;
-#if 0 /* Currently unused and empty structures are not valid C. */
- inf->suspend = inf_state->inferior_suspend;
-#endif
stop_pc = inf_state->stop_pc;