2009-11-13 Maciej W. Rozycki <macro@codesourcery.com>

	* elfread.c (elf_symtab_read): Only mark a minimal symbol as
	special if it actually exists.  Merge the checks for this
	conditions.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 714b8af13164a443aa45b97f7bf7c62f3fbd3a08..189b026b58def83b16fe027aa2897fa234b3be02 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-13  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * elfread.c (elf_symtab_read): Only mark a minimal symbol as
+       special if it actually exists.  Merge the checks for this
+       conditions.
+
 2009-11-13  Kazu Hirata  <kazu@codesourcery.com>
            Maxim Kuvyrkov  <maxim@codesourcery.com>
 

diff --git a/gdb/elfread.c b/gdb/elfread.c
index 29b7c0c92914f5945da691d7600bc45b86ece861..89089e3f6038761e9b720102f0f21f44a18c492f 100644 (file)
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -531,10 +531,10 @@ elf_symtab_read (struct objfile *objfile, int type,
 
              if (elf_sym)
                MSYMBOL_SIZE(msym) = elf_sym->internal_elf_sym.st_size;
+         
+             msym->filename = filesymname;
+             gdbarch_elf_make_msymbol_special (gdbarch, sym, msym);
            }
-         if (msym != NULL)
-           msym->filename = filesymname;
-         gdbarch_elf_make_msymbol_special (gdbarch, sym, msym);
 
          /* For @plt symbols, also record a trampoline to the
             destination symbol.  The @plt symbol will be used in