diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2009-09-18 17:33:51 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2009-09-18 17:33:51 +0000 |
| commit | adb7f3388f557308fab00d544185922035efa8f0 (patch) | |
| tree | 9a72462bc520831ecd495d4683d819db9f2fd77f | |
| parent | 924731f649dfb01afee8f46738ed2de7436d98d6 (diff) | |
| download | gdb-adb7f3388f557308fab00d544185922035efa8f0.zip gdb-adb7f3388f557308fab00d544185922035efa8f0.tar.gz gdb-adb7f3388f557308fab00d544185922035efa8f0.tar.bz2 | |
gdb/
* objfiles.c (free_objfile): Clear SYMFILE_OBJFILE if it is OBJFILE.
* rs6000-nat.c (vmap_ldinfo): Only assertion check SYMFILE_OBJFILE now.
* symfile.c (syms_from_objfile, symbol_file_clear): Likewise.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/objfiles.c | 4 | ||||
| -rw-r--r-- | gdb/rs6000-nat.c | 2 | ||||
| -rw-r--r-- | gdb/symfile.c | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3486501..427f61f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,10 @@ -2009-09-19 Ulrich Weigand <uweigand@de.ibm.com> +2009-09-18 Jan Kratochvil <jan.kratochvil@redhat.com> + + * objfiles.c (free_objfile): Clear SYMFILE_OBJFILE if it is OBJFILE. + * rs6000-nat.c (vmap_ldinfo): Only assertion check SYMFILE_OBJFILE now. + * symfile.c (syms_from_objfile, symbol_file_clear): Likewise. + +2009-09-18 Ulrich Weigand <uweigand@de.ibm.com> * rs6000-tdep.c (rs6000_builtin_type_vec128): Add v2_double union member. diff --git a/gdb/objfiles.c b/gdb/objfiles.c index 1f7489f..8dcca70 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -459,8 +459,8 @@ free_objfile (struct objfile *objfile) unlink_objfile (objfile); - /* If we are going to free the runtime common objfile, mark it - as unallocated. */ + if (objfile == symfile_objfile) + symfile_objfile = NULL; if (objfile == rt_common_objfile) rt_common_objfile = NULL; diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c index 7fa7c41..8273046 100644 --- a/gdb/rs6000-nat.c +++ b/gdb/rs6000-nat.c @@ -915,7 +915,7 @@ If in fact that file has symbols which the mapped files listed by\n\ symbols to the proper address)."), symfile_objfile->name); free_objfile (symfile_objfile); - symfile_objfile = NULL; + gdb_assert (symfile_objfile == NULL); } breakpoint_re_set (); } diff --git a/gdb/symfile.c b/gdb/symfile.c index 2f3441c..2458201 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -786,7 +786,7 @@ syms_from_objfile (struct objfile *objfile, if (symfile_objfile != NULL) { free_objfile (symfile_objfile); - symfile_objfile = NULL; + gdb_assert (symfile_objfile == NULL); } /* Currently we keep symbols from the add-symbol-file command. @@ -1150,7 +1150,7 @@ symbol_file_clear (int from_tty) descriptors as well. */ no_shared_libraries (NULL, from_tty); - symfile_objfile = NULL; + gdb_assert (symfile_objfile == NULL); if (from_tty) printf_unfiltered (_("No symbol file now.\n")); } |