gdb/

2008-07-09  Pedro Alves  <pedro@codesourcery.com>

	* symfile.c (load_command): Reopen the exec file and reread
	symbols before anything else.

gdb/testsuite/
2008-07-09  Pedro Alves  <pedro@codesourcery.com>

	* gdb.base/chng-syms.exp: Don't expect "No symbol ...".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9bcadff69b670f13319ed34e4e3bdc6585f774af..b85fcec29cabdc6b9617ad6b2484ccda11c9a7b8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-09  Pedro Alves  <pedro@codesourcery.com>
+
+       * symfile.c (load_command): Reopen the exec file and reread
+       symbols before anything else.
+
 2008-07-09  Pedro Alves  <pedro@codesourcery.com>
 
        * remote-sim.c: Include gdbthread.h.

diff --git a/gdb/symfile.c b/gdb/symfile.c
index d0596e661506699e3ba5cdec118eb144d6b17041..d98f62b670cb570e77d0e88f7791dff8a1522142 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1708,6 +1708,11 @@ find_sym_fns (bfd *abfd)
 static void
 load_command (char *arg, int from_tty)
 {
+  /* The user might be reloading because the binary has changed.  Take
+     this opportunity to check.  */
+  reopen_exec_file ();
+  reread_symbols ();
+
   if (arg == NULL)
     {
       char *parg;
@@ -1745,11 +1750,6 @@ load_command (char *arg, int from_tty)
        }
     }
 
-  /* The user might be reloading because the binary has changed.  Take
-     this opportunity to check.  */
-  reopen_exec_file ();
-  reread_symbols ();
-
   target_load (arg, from_tty);
 
   /* After re-loading the executable, we don't really know which

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 27886568cee95589e7bfded560aa22cb2a445da1..3f837fb0dc60c206e4c571cbb70b32c43f56e270 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-09  Pedro Alves  <pedro@codesourcery.com>
+
+       * gdb.base/chng-syms.exp: Don't expect "No symbol ...".
+
 2008-07-09  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.base/fullname.exp: Restore pwd if compiling failed.

diff --git a/gdb/testsuite/gdb.base/chng-syms.exp b/gdb/testsuite/gdb.base/chng-syms.exp
index 36ba7b93170123a2a1c1f52707fd20ac339dd3a3..dc54fc8500585ffc5659c2bada24db58d5e671a5 100644 (file)
--- a/gdb/testsuite/gdb.base/chng-syms.exp
+++ b/gdb/testsuite/gdb.base/chng-syms.exp
@@ -105,10 +105,10 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 
     gdb_run_cmd
     gdb_expect {
-       -re ".*No symbol .var1..*Program exited normally.*$gdb_prompt $" {
+       -re ".*Program exited normally.*$gdb_prompt $" {
            pass "running with invalidated bpt condition after executable changes" 
        }
-       -re "No symbol .var1..*Breakpoint .*,( 0x.* in)? (\[^ \]*)exit .*$gdb_prompt $" {
+       -re ".*Breakpoint .*,( 0x.* in)? (\[^ \]*)exit .*$gdb_prompt $" {
            pass "running with invalidated bpt condition after executable changes" 
        }
        -re "$gdb_prompt $" {