From 4ddafab0a6fa8c3069d0b323359bf20d3b390e46 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 13 Mar 2002 02:56:08 +0000 Subject: * elflink.h (elf_bfd_final_link): Only call elf_link_input_bfd when word size of input matches output word size. --- bfd/ChangeLog | 5 +++++ bfd/elflink.h | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fe6f5db..43c326c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2002-03-13 Alan Modra + + * elflink.h (elf_bfd_final_link): Only call elf_link_input_bfd + when word size of input matches output word size. + 2002-03-12 Andreas Jaeger * cpu-i386.c (i386_compatible): New. Use it instead of diff --git a/bfd/elflink.h b/bfd/elflink.h index 2edbed0..bdd03bc 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -5320,10 +5320,11 @@ elf_bfd_final_link (abfd, info) for (p = o->link_order_head; p != NULL; p = p->next) { if (p->type == bfd_indirect_link_order - && (bfd_get_flavour (p->u.indirect.section->owner) - == bfd_target_elf_flavour)) + && (bfd_get_flavour ((sub = p->u.indirect.section->owner)) + == bfd_target_elf_flavour) + && (sub->arch_info->bits_per_word + == abfd->arch_info->bits_per_word)) { - sub = p->u.indirect.section->owner; if (! sub->output_has_begun) { if (! elf_link_input_bfd (&finfo, sub)) -- cgit v1.1