summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Anglin <dave.anglin@nrc.ca>2009-11-08 20:47:24 +0000
committerDave Anglin <dave.anglin@nrc.ca>2009-11-08 20:47:24 +0000
commitd9f4081713832e26cd511d73703b9723ad107f51 (patch)
tree957f41d16a48c690d16d93bf962e642b767504cd
parent197bedcdc3a381d93fff2627d2a0b5f8b6e610e2 (diff)
downloadppe42-binutils-d9f4081713832e26cd511d73703b9723ad107f51.tar.gz
ppe42-binutils-d9f4081713832e26cd511d73703b9723ad107f51.zip
* elf32-hppa.c (elf32_hppa_final_link): Don't sort unwind information
in a relocatable link. * elf64-hppa.c (elf_hppa_final_link): Likewise.
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-hppa.c3
-rw-r--r--bfd/elf64-hppa.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 86af78611f..e918d6c8be 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 cac0a215f4..2a5547b1f3 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 0b762e40b1..637d232fe8 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;
OpenPOWER on IntegriCloud