gdb: Make infrun.c:resume function static

Make the infrun.c:resume function static, and update the header
comment on the infrun.c:proceed function.  There should be no user
visible change after this commit.

gdb/ChangeLog:

	* infrun.c (resume): Make static, add forward declaration.
	(proceed): Update header comment.
	* infrun.h (resume): Delete declaration.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b405915c43d34df7cac9bbe4172871764c9134df..c2013ea14e94d51cc920ac9dba17faee5f74b409 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-09  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * infrun.c (resume): Make static, add forward declaration.
+       (proceed): Update header comment.
+       * infrun.h (resume): Delete declaration.
+
 2018-08-09  Tom Tromey  <tom@tromey.com>
 
        * riscv-tdep.h: Minor formatting fixes.

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 05523a275630ec9cf93c46fee2f859111f47530d..b25d7459b2abf97ef81502aea2e7b0824452ce54 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -92,6 +92,8 @@ static void insert_longjmp_resume_breakpoint (struct gdbarch *, CORE_ADDR);
 
 static int maybe_software_singlestep (struct gdbarch *gdbarch, CORE_ADDR pc);
 
+static void resume (gdb_signal sig);
+
 /* Asynchronous signal handler registered as event loop source for
    when we have pending events ready to be passed to the core.  */
 static struct async_event_handler *infrun_async_inferior_event_token;
@@ -2729,7 +2731,7 @@ resume_1 (enum gdb_signal sig)
    (GDB_SIGNAL_0 for none).  This is a wrapper around 'resume_1' that
    rolls back state on error.  */
 
-void
+static void
 resume (gdb_signal sig)
 {
   TRY
@@ -2957,12 +2959,8 @@ schedlock_applies (struct thread_info *tp)
 /* Basic routine for continuing the program in various fashions.
 
    ADDR is the address to resume at, or -1 for resume where stopped.
-   SIGGNAL is the signal to give it, or 0 for none,
-   or -1 for act according to how it stopped.
-   STEP is nonzero if should trap after one instruction.
-   -1 means return after that and print nothing.
-   You should probably set various step_... variables
-   before calling here, if you are stepping.
+   SIGGNAL is the signal to give it, or GDB_SIGNAL_0 for none,
+   or GDB_SIGNAL_DEFAULT for act according to how it stopped.
 
    You should call clear_proceed_status before calling proceed.  */
 

diff --git a/gdb/infrun.h b/gdb/infrun.h
index 5820296cd140bf075d6584039f54d68a591a7c92..a701f0ca47f074727bbf244371092d65ca5769ab 100644 (file)
--- a/gdb/infrun.h
+++ b/gdb/infrun.h
@@ -83,10 +83,6 @@ extern void clear_proceed_status (int step);
 
 extern void proceed (CORE_ADDR, enum gdb_signal);
 
-/* The `resume' routine should only be called in special circumstances.
-   Normally, use `proceed', which handles a lot of bookkeeping.  */
-extern void resume (enum gdb_signal);
-
 /* Return a ptid representing the set of threads that we will proceed,
    in the perspective of the user/frontend.  We may actually resume
    fewer threads at first, e.g., if a thread is stopped at a