From 3e5484dbb9c68bd737de32da1e2c7b478dfc3740 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 2 Jul 2007 06:51:57 +0000 Subject: [PATCH] * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Tidy symsec != NULL tests. --- bfd/ChangeLog | 5 +++++ bfd/elf-eh-frame.c | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 751c993f01..6994b7ffef 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2007-07-02 Alan Modra + + * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Tidy + symsec != NULL tests. + 2007-07-02 Alan Modra PR 4712 diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c index 4fc91d2c77..092c2c57ec 100644 --- a/bfd/elf-eh-frame.c +++ b/bfd/elf-eh-frame.c @@ -712,17 +712,18 @@ _bfd_elf_discard_section_eh_frame sym = &cookie->locsyms[r_symndx]; sym_sec = (bfd_section_from_elf_index (abfd, sym->st_shndx)); - if (sym_sec != NULL - && sym_sec->kept_section != NULL) - sym_sec = sym_sec->kept_section; - if (sym_sec != NULL - && sym_sec->output_section != NULL) + if (sym_sec != NULL) { - val = (sym->st_value - + sym_sec->output_offset - + sym_sec->output_section->vma); - cie->personality.val = val; - cie->local_personality = 1; + if (sym_sec->kept_section != NULL) + sym_sec = sym_sec->kept_section; + if (sym_sec->output_section != NULL) + { + val = (sym->st_value + + sym_sec->output_offset + + sym_sec->output_section->vma); + cie->personality.val = val; + cie->local_personality = 1; + } } } -- 2.34.1