2002-11-05 David Carlton <carlton@math.stanford.edu>

	* symtab.c (lookup_symbol_aux): In minsym sections, don't use the
	previous values of 'objfile' and 'block'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c828aa4109574294e69d0ea54b2fd22737ae8703..1c42ef5c0247dee709449356cda4fa697635400b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  David Carlton  <carlton@math.stanford.edu>
+
+       * symtab.c (lookup_symbol_aux): In minsym sections, don't use the
+       previous values of 'objfile' and 'block'.
+
 2002-11-05  Pierre Muller  <muller@ics.u-strasbg.fr>
 
        * values.c (value_change_enclosing_type): Set 

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 2ecc40bc8c81688c420844cc34d3552bf12c13c9..e579d16209f08ab1cea5034d8b72debe43257af6 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -929,7 +929,7 @@ lookup_symbol_aux (const char *name, const char *mangled_name,
 
              if (symtab != NULL)
                *symtab = s;
-             return fixup_symbol_section (sym, objfile);
+             return fixup_symbol_section (sym, s->objfile);
            }
          else if (MSYMBOL_TYPE (msymbol) != mst_text
                   && MSYMBOL_TYPE (msymbol) != mst_file_text
@@ -937,7 +937,7 @@ lookup_symbol_aux (const char *name, const char *mangled_name,
            {
              /* This is a mangled variable, look it up by its
                 mangled name.  */
-             return lookup_symbol_aux (SYMBOL_NAME (msymbol), mangled_name, block,
+             return lookup_symbol_aux (SYMBOL_NAME (msymbol), mangled_name, NULL,
                                        namespace, is_a_field_of_this, symtab);
            }
          /* There are no debug symbols for this file, or we are looking
@@ -1120,7 +1120,7 @@ lookup_symbol_aux (const char *name, const char *mangled_name,
                   && !STREQ (name, SYMBOL_NAME (msymbol)))
            {
              return lookup_symbol_aux (SYMBOL_NAME (msymbol), mangled_name,
-                                       block, namespace, is_a_field_of_this,
+                                       NULL, namespace, is_a_field_of_this,
                                        symtab);
            }
        }