diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/ldlang.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 28dad99..b85af57 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2002-03-14 Alan Modra <amodra@bigpond.net.au> + + * ldlang.c (lang_check): Remove the word size check added in last + change. Treat emitrelocations case as for relocatable links. + 2002-03-13 Nick Clifton <nickc@cambridge.redhat.com> * po/fr.po: Updated version. diff --git a/ld/ldlang.c b/ld/ldlang.c index 9858fff..4c4d880 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -3577,11 +3577,9 @@ lang_check () input format may not have equivalent representations in the output format (and besides BFD does not translate relocs for other link purposes than a final link). */ - if (link_info.relocateable + if ((link_info.relocateable || link_info.emitrelocations) && (compatible == NULL - || bfd_get_flavour (input_bfd) != bfd_get_flavour (output_bfd) - || (input_bfd->arch_info->bits_per_word - != output_bfd->arch_info->bits_per_word)) + || bfd_get_flavour (input_bfd) != bfd_get_flavour (output_bfd)) && (bfd_get_file_flags (input_bfd) & HAS_RELOC) != 0) { einfo (_("%P%F: Relocatable linking with relocations from format %s (%B) to format %s (%B) is not supported\n"), |