diff options
| author | Alan Modra <amodra@gmail.com> | 2005-09-19 23:30:05 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2005-09-19 23:30:05 +0000 |
| commit | 707bba77b5da7c483159c8bf7fd31687e05acf98 (patch) | |
| tree | 311177c9ecea4368ca1e83a004fc05e528b6542c /bfd | |
| parent | a5df8c84e0691cfdf17acb6d69e1c2fd428a5f97 (diff) | |
| download | fsf-binutils-gdb-707bba77b5da7c483159c8bf7fd31687e05acf98.zip fsf-binutils-gdb-707bba77b5da7c483159c8bf7fd31687e05acf98.tar.gz fsf-binutils-gdb-707bba77b5da7c483159c8bf7fd31687e05acf98.tar.bz2 | |
* elflink.c (_bfd_elf_merge_symbol): Simplify.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elflink.c | 47 |
2 files changed, 13 insertions, 38 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fb5e364..dcb5573 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2005-09-20 Alan Modra <amodra@bigpond.net.au> + + * elflink.c (_bfd_elf_merge_symbol): Simplify. + 2005-09-19 Alan Modra <amodra@bigpond.net.au> * elf64-ppc.c (ppc_build_one_stub): Replace assertion that long diff --git a/bfd/elflink.c b/bfd/elflink.c index bf071a9..8ede25d 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -852,55 +852,26 @@ _bfd_elf_merge_symbol (bfd *abfd, /* NEWDYN and OLDDYN indicate whether the new or old symbol, respectively, is from a dynamic object. */ - if ((abfd->flags & DYNAMIC) != 0) - newdyn = TRUE; - else - newdyn = FALSE; + newdyn = (abfd->flags & DYNAMIC) != 0; + olddyn = FALSE; if (oldbfd != NULL) olddyn = (oldbfd->flags & DYNAMIC) != 0; - else + else if (oldsec != NULL) { - asection *hsec; - - /* This code handles the special SHN_MIPS_{TEXT,DATA} section + /* This handles the special SHN_MIPS_{TEXT,DATA} section indices used by MIPS ELF. */ - switch (h->root.type) - { - default: - hsec = NULL; - break; - - case bfd_link_hash_defined: - case bfd_link_hash_defweak: - hsec = h->root.u.def.section; - break; - - case bfd_link_hash_common: - hsec = h->root.u.c.p->section; - break; - } - - if (hsec == NULL) - olddyn = FALSE; - else - olddyn = (hsec->symbol->flags & BSF_DYNAMIC) != 0; + olddyn = (oldsec->symbol->flags & BSF_DYNAMIC) != 0; } /* NEWDEF and OLDDEF indicate whether the new or old symbol, respectively, appear to be a definition rather than reference. */ - if (bfd_is_und_section (sec) || bfd_is_com_section (sec)) - newdef = FALSE; - else - newdef = TRUE; + newdef = !bfd_is_und_section (sec) && !bfd_is_com_section (sec); - if (h->root.type == bfd_link_hash_undefined - || h->root.type == bfd_link_hash_undefweak - || h->root.type == bfd_link_hash_common) - olddef = FALSE; - else - olddef = TRUE; + olddef = (h->root.type != bfd_link_hash_undefined + && h->root.type != bfd_link_hash_undefweak + && h->root.type != bfd_link_hash_common); /* Check TLS symbol. We don't check undefined symbol introduced by "ld -u". */ |