This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [questions] elflink.c, back-end-data
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: msnyder at sonic dot net
- Cc: binutils at sourceware dot org
- Date: Thu, 26 Jul 2007 23:16:32 +0930
- Subject: Re: [questions] elflink.c, back-end-data
- References: <5631.12.7.175.2.1185411274.squirrel@webmail.sonic.net>
On Wed, Jul 25, 2007 at 05:54:34PM -0700, msnyder@sonic.net wrote:
> In _bfd_elf_fix_symbol_flags, we start with bed == NULL.
> We only conditionally initialize it...
> /* Backend specific symbol fixup. */
> if (elf_hash_table (eif->info)->dynobj)
> {
> bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
elf_hash_table (eif->info)->dynobj will always be non-NULL, so the
test is redundant. elf_fix_symbol_flags is call from two places,
_bfd_elf_link_assign_sym_version, and _bfd_elf_adjust_dynamic_symbol.
Neither of these functions will be called if dynobj is NULL.
> Then later, we eclipse it with a block-local version, which seems
silly.
> Am I missing something?
Unnecessary code is confusing.
* elflink.c (_bfd_elf_fix_symbol_flags): Remove unnecessary
check on dynobj. Remove bed shadow.
Index: bfd/elflink.c
===================================================================
RCS file: /cvs/src/src/bfd/elflink.c,v
retrieving revision 1.272
diff -u -p -r1.272 elflink.c
--- bfd/elflink.c 24 Jul 2007 19:54:01 -0000 1.272
+++ bfd/elflink.c 26 Jul 2007 13:44:39 -0000
@@ -2368,7 +2368,7 @@ bfd_boolean
_bfd_elf_fix_symbol_flags (struct elf_link_hash_entry *h,
struct elf_info_failed *eif)
{
- const struct elf_backend_data *bed = NULL;
+ const struct elf_backend_data *bed;
/* If this symbol was mentioned in a non-ELF file, try to set
DEF_REGULAR and REF_REGULAR correctly. This is the only way to
@@ -2429,13 +2429,10 @@ _bfd_elf_fix_symbol_flags (struct elf_li
}
/* Backend specific symbol fixup. */
- if (elf_hash_table (eif->info)->dynobj)
- {
- bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
- if (bed->elf_backend_fixup_symbol
- && !(*bed->elf_backend_fixup_symbol) (eif->info, h))
- return FALSE;
- }
+ bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
+ if (bed->elf_backend_fixup_symbol
+ && !(*bed->elf_backend_fixup_symbol) (eif->info, h))
+ return FALSE;
/* If this is a final link, and the symbol was defined as a common
symbol in a regular object file, and there was no definition in
@@ -2473,11 +2470,7 @@ _bfd_elf_fix_symbol_flags (struct elf_li
hide it from the dynamic linker. */
if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
&& h->root.type == bfd_link_hash_undefweak)
- {
- const struct elf_backend_data *bed;
- bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
- (*bed->elf_backend_hide_symbol) (eif->info, h, TRUE);
- }
+ (*bed->elf_backend_hide_symbol) (eif->info, h, TRUE);
/* If this is a weak defined symbol in a dynamic object, and we know
the real definition in the dynamic object, copy interesting flags
--
Alan Modra
Australia Development Lab, IBM