From a103a963e04564e150dbcba4aaeae493693fbc16 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Fri, 13 Nov 2009 22:47:13 +0000 Subject: [PATCH] 2009-11-13 Maciej W. Rozycki * elfread.c (elf_symtab_read): Only mark a minimal symbol as special if it actually exists. Merge the checks for this conditions. --- gdb/ChangeLog | 6 ++++++ gdb/elfread.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 714b8af1316..189b026b58d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-11-13 Maciej W. Rozycki + + * 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 Maxim Kuvyrkov diff --git a/gdb/elfread.c b/gdb/elfread.c index 29b7c0c9291..89089e3f603 100644 --- 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 -- 2.30.2