diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 10cf1c6a66..4734232154 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+Sat Jul 16 14:43:17 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* breakpoint.c (ignore, condition): Add usage notes to help strings.
+	* symfile.c (add-symbol-file): Add usage note to help string.
+	(add_shared_symbol_files_command): New command.
+
+	gcc -Wall lint.
+	* inferior.h (read_pc_pid): Declare.
+	* breakpoint.c (watchpoint_check): Cache breakpoint in local
+	variable b, remove unused variable other_type_used.
+	* main.c (inferior.h, call-cmds.h): Include.
+	(gdb_init): Declare.
+	* remote.c (remote_wait): Return 0 by default.
+
 Fri Jul 15 16:43:33 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	Stop printing at null char option, from Oliver Meyer
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 6fdad93659..014eecc202 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -27,6 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* For FRAME_ADDR.  */
 #include "frame.h"
 
+/* For enum target_signal.  */
+#include "target.h"
+
 /*
  * Structure in which to save the status of the inferior.  Save
  * through "save_inferior_status", restore through
@@ -36,7 +39,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  * control variables.
  */
 struct inferior_status {
-  int stop_signal;
+  enum target_signal stop_signal;
   CORE_ADDR stop_pc;
   FRAME_ADDR stop_frame_address;
   bpstat stop_bpstat;
@@ -74,6 +77,9 @@ restore_inferior_status PARAMS ((struct inferior_status *));
 extern void set_sigint_trap PARAMS ((void));
 extern void clear_sigint_trap PARAMS ((void));
 
+extern void set_sigio_trap PARAMS ((void));
+extern void clear_sigio_trap PARAMS ((void));
+
 /* File name for default use for standard in/out in the inferior.  */
 
 extern char *inferior_io_terminal;
@@ -95,7 +101,7 @@ extern void
 clear_proceed_status PARAMS ((void));
 
 extern void
-proceed PARAMS ((CORE_ADDR, int, int));
+proceed PARAMS ((CORE_ADDR, enum target_signal, int));
 
 extern void
 kill_inferior PARAMS ((void));
@@ -111,6 +117,9 @@ extern int run_stack_dummy PARAMS ((CORE_ADDR, char [REGISTER_BYTES]));
 extern CORE_ADDR
 read_pc PARAMS ((void));
 
+extern CORE_ADDR
+read_pc_pid PARAMS ((int));
+
 extern void
 write_pc PARAMS ((CORE_ADDR));
 
@@ -141,7 +150,7 @@ reopen_exec_file PARAMS ((void));
 /* The `resume' routine should only be called in special circumstances.
    Normally, use `proceed', which handles a lot of bookkeeping.  */
 extern void
-resume PARAMS ((int, int));
+resume PARAMS ((int, enum target_signal));
 
 /* From misc files */
 
@@ -178,7 +187,7 @@ void
 detach PARAMS ((int));
 
 extern void
-child_resume PARAMS ((int, int, int));
+child_resume PARAMS ((int, int, enum target_signal));
 
 #ifndef PTRACE_ARG3_TYPE
 #define PTRACE_ARG3_TYPE int	/* Correct definition for most systems. */
@@ -194,10 +203,11 @@ proc_iterate_over_mappings PARAMS ((int (*) (int, CORE_ADDR)));
 
 /* From fork-child.c */
 
-extern void
-fork_inferior PARAMS ((char *, char *, char **,
-		       void (*) (void),
-		       void (*) (int)));
+extern void fork_inferior PARAMS ((char *, char *, char **,
+				   void (*) (void),
+				   void (*) (int), char *));
+
+extern void startup_inferior PARAMS ((int));
 
 /* From inflow.c */
 
@@ -233,7 +243,7 @@ attach_command PARAMS ((char *, int));
 
 /* Last signal that the inferior received (why it stopped).  */
 
-extern int stop_signal;
+extern enum target_signal stop_signal;
 
 /* Address at which inferior stopped.  */
 
@@ -393,11 +403,9 @@ extern CORE_ADDR text_end;
 #endif /* On stack.  */
 
 #if CALL_DUMMY_LOCATION == AT_ENTRY_POINT
-extern CORE_ADDR
-entry_point_address PARAMS ((void));
 #define PC_IN_CALL_DUMMY(pc, sp, frame_address)			\
-  ((pc) >= entry_point_address ()				\
-   && (pc) <= (entry_point_address () + DECR_PC_AFTER_BREAK))
+  ((pc) >= CALL_DUMMY_ADDRESS ()				\
+   && (pc) <= (CALL_DUMMY_ADDRESS () + DECR_PC_AFTER_BREAK))
 #endif /* At entry point.  */
 #endif /* No PC_IN_CALL_DUMMY.  */