* ldctor.c (ldctor_add_set_entry): Don't permit a set to be

	composed of different object file formats.
	(ldctor_build_sets): If the output format does not support the
	reloc, and we are not generating a relocateable link, try getting
	the reloc from the input format.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0a9cd2218d11fc39711d8b12650e98125201efb8..fe7ccfdfb0fcada194dd7c4f23c3f8021c46817a 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov  2 12:17:49 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+       * ldctor.c (ldctor_add_set_entry): Don't permit a set to be
+       composed of different object file formats.
+       (ldctor_build_sets): If the output format does not support the
+       reloc, and we are not generating a relocateable link, try getting
+       the reloc from the input format.
+
 Tue Nov  1 10:30:19 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
 
        * Makefile.in (ALL_EMULATIONS): Added em68knbsd.o.