aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog3
-rw-r--r--ld/ldlang.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f86b736..596ed9a 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,8 @@
2001-06-15 Hans-Peter Nilsson <hp@axis.com>
+ * ldlang.c (lang_check): Emit fatal error if relocatable link
+ between different object flavours.
+
* lexsup.c (parse_args) <case OPTION_EXPORT_DYNAMIC, case 'E'>:
Set new link_info member export_dynamic.
* ldmain.c (main): Initialize new link_info member export_dynamic.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 1d338e6..4512af6 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -3520,6 +3520,11 @@ lang_check ()
bfd_printable_name (input_bfd), input_bfd,
bfd_printable_name (output_bfd));
}
+ else if (link_info.relocateable
+ && bfd_get_flavour (input_bfd) != bfd_get_flavour (output_bfd))
+ einfo (_("%P%F: Relocatable linking from format %s (%B) to format %s (%B) is not supported"),
+ bfd_get_target (input_bfd), input_bfd,
+ bfd_get_target (output_bfd), output_bfd);
else if (bfd_count_sections (input_bfd))
{
/* If the input bfd has no contents, it shouldn't set the