aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-10-21 14:56:17 +0000
committerIan Lance Taylor <ian@airs.com>1996-10-21 14:56:17 +0000
commitbd4dd3d01152ac0cbb2a1c7219e143a463964fc5 (patch)
tree77d685209a02b98c7de33d18500a822b9c5d1a35 /bfd
parent972256e712d8fa041244f75ec25c4deba13df787 (diff)
downloadgdb-bd4dd3d01152ac0cbb2a1c7219e143a463964fc5.zip
gdb-bd4dd3d01152ac0cbb2a1c7219e143a463964fc5.tar.gz
gdb-bd4dd3d01152ac0cbb2a1c7219e143a463964fc5.tar.bz2
* linker.c (default_indirect_link_order): Print an error message
when attempting to do a relocateable link with different object file formats, rather than calling abort.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/linker.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0607f73..e5e41d2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 21 10:54:58 1996 Ian Lance Taylor <ian@cygnus.com>
+
+ * linker.c (default_indirect_link_order): Print an error message
+ when attempting to do a relocateable link with different object
+ file formats, rather than calling abort.
+
start-sanitize-m32r
Thu Oct 17 10:43:29 1996 Doug Evans <dje@canuck.cygnus.com>
diff --git a/bfd/linker.c b/bfd/linker.c
index 14afce6..1b48f19 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -2661,7 +2661,11 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
because somebody is attempting to link together different
types of object files. Handling this case correctly is
difficult, and sometimes impossible. */
- abort ();
+ (*_bfd_error_handler)
+ ("Attempt to do relocateable link with %s input and %s output",
+ bfd_get_target (input_bfd), bfd_get_target (output_bfd));
+ bfd_set_error (bfd_error_wrong_format);
+ return false;
}
if (! generic_linker)