aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/bfd.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 20b91e8..9ace58e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-30 Alan Modra <amodra@bigpond.net.au>
+
+ PR ld/10569
+ * bfd.c (bfd_emul_get_maxpagesize): Don't abort.
+ (bfd_emul_get_commonpagesize): Likewise.
+
2009-08-29 Martin Thuresson <martin@mtme.org>
* elf32-arm.c (struct stub_def): Rename member template to
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 4a1b5ca..549e852 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -1703,8 +1703,7 @@ DESCRIPTION
emulation.
RETURNS
- Returns the maximum page size in bytes for ELF, abort
- otherwise.
+ Returns the maximum page size in bytes for ELF, 0 otherwise.
*/
bfd_vma
@@ -1717,7 +1716,6 @@ bfd_emul_get_maxpagesize (const char *emul)
&& target->flavour == bfd_target_elf_flavour)
return xvec_get_elf_backend_data (target)->maxpagesize;
- abort ();
return 0;
}
@@ -1776,7 +1774,7 @@ DESCRIPTION
emulation.
RETURNS
- Returns the common page size in bytes for ELF, abort otherwise.
+ Returns the common page size in bytes for ELF, 0 otherwise.
*/
bfd_vma
@@ -1789,7 +1787,6 @@ bfd_emul_get_commonpagesize (const char *emul)
&& target->flavour == bfd_target_elf_flavour)
return xvec_get_elf_backend_data (target)->commonpagesize;
- abort ();
return 0;
}