diff options
| -rw-r--r-- | binutils-2.24/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils-2.24/bfd/elf32-arm.c | 3 | ||||
| -rw-r--r-- | binutils-2.25/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils-2.25/bfd/elf32-arm.c | 3 |
4 files changed, 18 insertions, 0 deletions
diff --git a/binutils-2.24/ChangeLog b/binutils-2.24/ChangeLog index 3dc25831..8d4b89fa 100644 --- a/binutils-2.24/ChangeLog +++ b/binutils-2.24/ChangeLog @@ -2,6 +2,12 @@ * config.sub, config.guess: Import from upstream. +2014-03-12 Nick Clifton <nickc@redhat.com> + + PR ld/16671 + * elf32-arm.c (elf32_arm_add_symbol_hook): Check for ARM format + before testing for vxworks. + 2013-11-23 Alan Modra <amodra@gmail.com> * config.sub, config.guess: Import from upstream. diff --git a/binutils-2.24/bfd/elf32-arm.c b/binutils-2.24/bfd/elf32-arm.c index 197af595..9c31ddd7 100644 --- a/binutils-2.24/bfd/elf32-arm.c +++ b/binutils-2.24/bfd/elf32-arm.c @@ -15700,6 +15700,9 @@ elf32_arm_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)) elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; + if (elf32_arm_hash_table (info) == NULL) + return FALSE; + if (elf32_arm_hash_table (info)->vxworks_p && !elf_vxworks_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)) diff --git a/binutils-2.25/ChangeLog b/binutils-2.25/ChangeLog index 33dab6c5..797ca645 100644 --- a/binutils-2.25/ChangeLog +++ b/binutils-2.25/ChangeLog @@ -3,6 +3,12 @@ * COPYING.NEWLIB: Add to current TI license to include tirtos addition. +2014-03-12 Nick Clifton <nickc@redhat.com> + + PR ld/16671 + * elf32-arm.c (elf32_arm_add_symbol_hook): Check for ARM format + before testing for vxworks. + 2014-02-04 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR target/59788 diff --git a/binutils-2.25/bfd/elf32-arm.c b/binutils-2.25/bfd/elf32-arm.c index 197af595..9c31ddd7 100644 --- a/binutils-2.25/bfd/elf32-arm.c +++ b/binutils-2.25/bfd/elf32-arm.c @@ -15700,6 +15700,9 @@ elf32_arm_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)) elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; + if (elf32_arm_hash_table (info) == NULL) + return FALSE; + if (elf32_arm_hash_table (info)->vxworks_p && !elf_vxworks_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)) |