diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-hppa.c | 3 | ||||
| -rw-r--r-- | bfd/elf64-hppa.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 86af786..e918d6c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2009-11-08 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * elf32-hppa.c (elf32_hppa_final_link): Don't sort unwind information + in a relocatable link. + * elf64-hppa.c (elf_hppa_final_link): Likewise. + 2009-11-05 Nick Clifton <nickc@redhat.com> * elflink.c (elf_link_add_object_symbols): Improve error diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index cac0a21..2a5547b 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -3238,6 +3238,9 @@ elf32_hppa_final_link (bfd *abfd, struct bfd_link_info *info) /* If we're producing a final executable, sort the contents of the unwind section. */ + if (info->relocatable) + return TRUE; + return elf_hppa_sort_unwind (abfd); } diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c index 0b762e4..637d232 100644 --- a/bfd/elf64-hppa.c +++ b/bfd/elf64-hppa.c @@ -3033,7 +3033,7 @@ elf_hppa_final_link (bfd *abfd, struct bfd_link_info *info) /* If we're producing a final executable, sort the contents of the unwind section. */ - if (retval) + if (retval && !info->relocatable) retval = elf_hppa_sort_unwind (abfd); return retval; |