From 8e191bd38c2b1af169a1feef527753fb9791706a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 8 May 2001 17:44:00 +0000 Subject: * coff-i386.c (coff_i386_reloc): Don't dump core if output_bfd is NULL or is not COFF. (coff_i386_rtype_to_howto): Don't dump core if output section owner is not COFF. --- bfd/coff-i386.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bfd/coff-i386.c') diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c index d35e2ca..7d4ab5a 100644 --- a/bfd/coff-i386.c +++ b/bfd/coff-i386.c @@ -129,7 +129,9 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, #ifdef COFF_WITH_PE /* FIXME: How should this case be handled? */ - if (reloc_entry->howto->type == R_IMAGEBASE) + if (reloc_entry->howto->type == R_IMAGEBASE + && output_bfd != NULL + && bfd_get_flavour(output_bfd) == bfd_target_coff_flavour) diff -= pe_data (output_bfd)->pe_opthdr.ImageBase; #endif @@ -489,7 +491,9 @@ coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp) *addendp -= sym->n_value; } - if (rel->r_type == R_IMAGEBASE) + if (rel->r_type == R_IMAGEBASE + && (bfd_get_flavour(sec->output_section->owner) + == bfd_target_coff_flavour)) { *addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase; } -- cgit v1.1