diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d5ccc1d13e..e53bc2178d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+Sun Aug 23 11:04:08 1992  Fred Fish  (fnf@cygnus.com)
+
+	* breakpoint.c (breakpoint_re_set):  Select a default source
+	symtab if one is not currently selected.
+	* utils.c (query):  Call wrap_here before building the output
+	query string, to turn off wrapping and flush any buffered output.
+	Otherwise our query may end up in the wrap buffer and never be
+	seen by the user.
+	* eval.c (evaluate_subexp):  Report error when attempting to
+	evaluate subscript for types without a target type, rather
+	than dumping core by using the NULL pointer.
+	* symfile.c (symbol_file_command):  Forget current_source_symtab
+	and current_source_line when discarding symbol table.
+
 Sat Aug 22 22:33:20 1992  John Gilmore  (gnu@cygnus.com)
 
 	Bug fixes from Andrew Heybey <ath@lcs.mit.edu>.
diff --git a/gdb/i860-tdep.c b/gdb/i860-tdep.c
index 3c5f940af3..4919866e2a 100644
--- a/gdb/i860-tdep.c
+++ b/gdb/i860-tdep.c
@@ -78,7 +78,7 @@ int ansi_conformant;
 extern int errno;
 extern int attach_flag;
 extern char registers[];
-static CORE_ADDR get_saved_basereg();
+CORE_ADDR get_saved_basereg();
 
 #define INSTRUCTION_LENGTH 4
 #define REGISTER_LENGTH 4
@@ -2227,3 +2227,4 @@ char *valbuf;
       write_register_bytes (REGISTER_BYTE (R16), valbuf, TYPE_LENGTH (type));
  
 }
+
diff --git a/gdb/tm-i860.h b/gdb/tm-i860.h
index 777ba1d30b..b26e205de8 100644
--- a/gdb/tm-i860.h
+++ b/gdb/tm-i860.h
@@ -470,4 +470,5 @@ i860 takes them in registers */
 /* used to indicate that the misc function vector has size information about
    misc functions -- currently true for elf format only -- mlf */
 #define MISC_FUNCTIONS_HAS_SIZE
-#define GET_BASEREG_VALUE(frame,basereg)   get_saved_basereg(frame, basereg);
+#define FRAME_GET_BASEREG_VALUE(frame,basereg)   get_saved_basereg(frame, basereg);
+