Fixes PR 6111

	* remote-udi.c (udi_load): Tell symbol_file_add that the
	program being loaded is the main program.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c7812fdafac6bb00e6ee207cddf7576385694c03..b06c33c9f7ce8e792d290577344078b501a934b1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan  2 15:02:51 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+       * remote-udi.c (udi_load): Tell symbol_file_add that the
+       program being loaded is the main program.
 
 For older changes see ChangeLog-94
 \f

diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index dc82750e69f6c81a378caa3566019750cf3b94b8..a608b5667ec1b7c85b4e737f2b20a082d56cc08a 100644 (file)
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -1,5 +1,5 @@
 /* Remote debugging interface for AMD 29k interfaced via UDI, for GDB.
-   Copyright 1990, 1992 Free Software Foundation, Inc.
+   Copyright 1990, 1992, 1995 Free Software Foundation, Inc.
    Written by Daniel Mann.  Contributed by AMD.
 
 This file is part of GDB.
@@ -1287,18 +1287,19 @@ download(load_arg_string, from_tty)
   immediate_quit--;
 }
 
-/* User interface to download an image into the remote target.  See download()
- * for details on args.
- */
+/* Function to download an image into the remote target.  */
 
 static void
-udi_load(args, from_tty)
+udi_load (args, from_tty)
      char *args;
      int from_tty;
 {
   download (args, from_tty);
 
-  symbol_file_add (strtok (args, " \t"), from_tty, 0, 0, 0, 0);
+  /* As a convenience, pick up any symbol info that is in the program
+     being loaded.  Note that we assume that the program is the``mainline'';
+     if this is not always true, then this code will need to be augmented.  */
+  symbol_file_add (strtok (args, " \t"), from_tty, 0, 1, 0, 0);
 
   /* Getting new symbols may change our opinion about what is
      frameless.  */
@@ -1660,7 +1661,7 @@ Arguments are\n\
        0,                      /* terminal_ours */
        0,                      /* terminal_info */
         udi_kill,              /* FIXME, kill */
-        udi_load,
+        udi_load,              /* to_load */
         0,                      /* lookup_symbol */
         udi_create_inferior,
         udi_mourn,             /* mourn_inferior FIXME */