* 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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0607f73a0c1d7cfd31c5f16d399d77dca68b1738..e5e41d2252a1e0176cc758013caa38ddf1833483 100644 (file)
--- 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 14afce6604ae93610a47328d904eb96a8dab8146..1b48f199fe3c10445487383ce603bc74fb7009ca 100644 (file)
--- 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)