diff options
| author | Alan Modra <amodra@gmail.com> | 2016-12-03 20:54:57 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-12-03 20:54:57 +1030 |
| commit | 4193bc588b4e66da0ed502eaef6e7ce85272fb42 (patch) | |
| tree | dde848b362f10fd930daffd76134bd4175440513 | |
| parent | 10c56208ee8ce4d51de64277207b84a5d1be8c95 (diff) | |
| download | binutils-gdb-4193bc588b4e66da0ed502eaef6e7ce85272fb42.tar.gz | |
try_copy_symbol_type node_class check
* ldexp.c (try_copy_symbol_type): Remove unnecessary check.
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/ldexp.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index a4b6949333e..b86e203895f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2016-12-03 Alan Modra <amodra@gmail.com> + + * ldexp.c (try_copy_symbol_type): Remove unnecessary check. + 2016-12-02 Nick Clifton <nickc@redhat.com> PR ld/20910 diff --git a/ld/ldexp.c b/ld/ldexp.c index cb5e0935513..c962c5e0f84 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -990,16 +990,12 @@ is_align_conditional (const etree_type *tree) static void try_copy_symbol_type (struct bfd_link_hash_entry *h, etree_type *src) { - if (src->type.node_class == etree_name) - { - struct bfd_link_hash_entry *hsrc; + struct bfd_link_hash_entry *hsrc; - hsrc = bfd_link_hash_lookup (link_info.hash, src->name.name, - FALSE, FALSE, TRUE); - if (hsrc) - bfd_copy_link_hash_symbol_type (link_info.output_bfd, h, - hsrc); - } + hsrc = bfd_link_hash_lookup (link_info.hash, src->name.name, + FALSE, FALSE, TRUE); + if (hsrc != NULL) + bfd_copy_link_hash_symbol_type (link_info.output_bfd, h, hsrc); } static void |