From dd80ea3c315b22e0751f62d7049969903d9c95ec Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 13 Jun 2012 18:15:05 +0000 Subject: [PATCH] gdb/ PR build/14003 * inferior.h (struct inferior_suspend_state): Comment out. (struct inferior): Comment out the field suspend. * infrun.c (struct infcall_suspend_state): Comment out the field inferior_suspend. (save_infcall_suspend_state, restore_infcall_suspend_state): Comment out its assignment. --- gdb/ChangeLog | 10 ++++++++++ gdb/inferior.h | 4 ++++ gdb/infrun.c | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ee7e9cb093..fc59c2a97c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2012-06-13 Jan Kratochvil + + PR build/14003 + * inferior.h (struct inferior_suspend_state): Comment out. + (struct inferior): Comment out the field suspend. + * infrun.c (struct infcall_suspend_state): Comment out the field + inferior_suspend. + (save_infcall_suspend_state, restore_infcall_suspend_state): Comment + out its assignment. + 2012-06-13 Jan Kratochvil PR c++/14177 - Fix parsing TYPENAME:: in parentheses. diff --git a/gdb/inferior.h b/gdb/inferior.h index dfcbda4c2f..394596251f 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -397,9 +397,11 @@ struct inferior_control_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 @@ -431,7 +433,9 @@ struct inferior /* 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 diff --git a/gdb/infrun.c b/gdb/infrun.c index e36e42e874..d40ba3e097 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -6629,7 +6629,9 @@ 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; @@ -6683,7 +6685,9 @@ 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. */ @@ -6707,7 +6711,9 @@ restore_infcall_suspend_state (struct infcall_suspend_state *inf_state) 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; -- 2.34.1