* annotate.c (annotate_source, annotate_frame_begin): Issue

	`0x' prefix for the pc value, to remain consistent with previous
	GDB versions.

	* blockframe.c (find_pc_partial_function), config/pa/tm-hppa.h:
	Remove Sun shared library transfer hack and
	INHIBIT_SUNSOLIB_TRANSFER_TABLE_HACK, it is obsoleted by the
	mst_solib_trampoline minimal symbols.

	* blockframe.c (inside_main_func):  Check main_func_*pc against
	INVALID_ENTRY_*PC, not zero.
	* symfile.c (init_entry_point_info):  Initialize ei.*pc with
	INVALID_ENTRY_*PC.
	* mipsread.c (mipscoff_symfile_read):  If the entry_file bounds
	are still unknown after processing the partial symbols, then try
	to set them from the minimal symbols.

	* infcmd.c (registers_info):  Error out if selected_frame is NULL.
	* stack.c (return_command):  Select new current frame silently if
	not interactive.

	* mipsread.c (read_alphacoff_dynamic_symtab):  Ignore additional
	DT_MIPS_LOCAL_GOTNO and DT_MIPS_GOTSYM entries.

	* irix5-nat.c (solib_create_inferior_hook):  Call solib_add only
	if auto_solib_add_at_startup is nonzero.
	(_initialize_solib):  Add "set auto-solib-add" command.
	* osfsolib.c (solib_create_inferior_hook):  Call solib_add only
	if auto_solib_add_at_startup is nonzero.
	(_initialize_solib):  Add "set auto-solib-add" command.

3 files changed, 30 insertions, 8 deletions

diff --git a/gdb/annotate.c b/gdb/annotate.c
index 8d36676..282e171 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -1,5 +1,5 @@
 /* Annotation routines for GDB.
-   Copyright 1986, 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright 1986, 1989, 1990, 1991, 1992, 1995 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -369,7 +369,7 @@ annotate_source (filename, line, character, mid, pc)
   else
     printf_filtered ("\032\032");
 
-  printf_filtered ("%s:%d:%d:%s:", filename,
+  printf_filtered ("%s:%d:%d:%s:0x", filename,
 		   line, character,
 		   mid ? "middle" : "beg");
   print_address_numeric (pc, 0, gdb_stdout);
@@ -383,7 +383,7 @@ annotate_frame_begin (level, pc)
 {
   if (annotation_level > 1)
     {
-      printf_filtered ("\n\032\032frame-begin %d ", level);
+      printf_filtered ("\n\032\032frame-begin %d 0x", level);
       print_address_numeric (pc, 0, gdb_stdout);
       printf_filtered ("\n");
     }
diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c
index 16e2906..26027f4 100644
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -199,6 +199,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
 #include "gnu-regex.h"
 #include "inferior.h"
 #include "language.h"
+#include "gdbcmd.h"
 
 /* The symbol which starts off the list of shared libraries.  */
 #define DEBUG_BASE "__rld_obj_head"
@@ -1002,7 +1003,8 @@ solib_create_inferior_hook()
       and will put out an annoying warning.
       Delaying the resetting of stop_soon_quietly until after symbol loading
       suppresses the warning.  */
-  solib_add ((char *) 0, 0, (struct target_ops *) 0);
+  if (auto_solib_add_at_startup)
+    solib_add ((char *) 0, 0, (struct target_ops *) 0);
   stop_soon_quietly = 0;
 }
 
@@ -1032,9 +1034,18 @@ int from_tty;
 void
 _initialize_solib()
 {
-  
   add_com ("sharedlibrary", class_files, sharedlibrary_command,
 	   "Load shared object library symbols for files matching REGEXP.");
   add_info ("sharedlibrary", info_sharedlibrary_command, 
 	    "Status of loaded shared object libraries.");
+
+  add_show_from_set
+    (add_set_cmd ("auto-solib-add", class_support, var_zinteger,
+		  (char *) &auto_solib_add_at_startup,
+		  "Set autoloading of shared library symbols at startup.\n\
+If nonzero, symbols from all shared object libraries will be loaded\n\
+automatically when the inferior begins execution.  Otherwise, symbols\n\
+must be loaded manually, using `sharedlibrary'.",
+		  &setlist),
+     &showlist);
 }
diff --git a/gdb/osfsolib.c b/gdb/osfsolib.c
index 79301e4..cdc2de9 100644
--- a/gdb/osfsolib.c
+++ b/gdb/osfsolib.c
@@ -1,5 +1,5 @@
 /* Handle OSF/1 shared libraries for GDB, the GNU Debugger.
-   Copyright 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1995 Free Software Foundation, Inc.
    
 This file is part of GDB.
 
@@ -38,6 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "gnu-regex.h"
 #include "inferior.h"
 #include "language.h"
+#include "gdbcmd.h"
 
 #define MAX_PATH_SIZE 1024		/* FIXME: Should be dynamic */
 
@@ -906,7 +907,8 @@ solib_create_inferior_hook()
       and will put out an annoying warning.
       Delaying the resetting of stop_soon_quietly until after symbol loading
       suppresses the warning.  */
-  solib_add ((char *) 0, 0, (struct target_ops *) 0);
+  if (auto_solib_add_at_startup)
+    solib_add ((char *) 0, 0, (struct target_ops *) 0);
   stop_soon_quietly = 0;
 }
 
@@ -937,9 +939,18 @@ int from_tty;
 void
 _initialize_solib()
 {
-  
   add_com ("sharedlibrary", class_files, sharedlibrary_command,
 	   "Load shared object library symbols for files matching REGEXP.");
   add_info ("sharedlibrary", info_sharedlibrary_command, 
 	    "Status of loaded shared object libraries.");
+
+  add_show_from_set
+    (add_set_cmd ("auto-solib-add", class_support, var_zinteger,
+		  (char *) &auto_solib_add_at_startup,
+		  "Set autoloading of shared library symbols at startup.\n\
+If nonzero, symbols from all shared object libraries will be loaded\n\
+automatically when the inferior begins execution.  Otherwise, symbols\n\
+must be loaded manually, using `sharedlibrary'.",
+		  &setlist),
+     &showlist);
 }