19990502 sourceware import

1 files changed, 230 insertions, 285 deletions

diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c
index 30c81885d4c..7898cc159ca 100644
--- a/bfd/coff-i386.c
+++ b/bfd/coff-i386.c
@@ -1,28 +1,26 @@
 /* BFD back-end for Intel 386 COFF files.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2007, 2008
+   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
-   This file is part of BFD, the Binary File Descriptor library.
+This file is part of BFD, the Binary File Descriptor library.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "sysdep.h"
 #include "bfd.h"
+#include "sysdep.h"
 #include "libbfd.h"
 
 #include "coff/i386.h"
@@ -37,20 +35,15 @@
 #include "coff/go32exe.h"
 #endif
 
-#ifndef bfd_pe_print_pdata
-#define bfd_pe_print_pdata	NULL
-#endif
-
 #include "libcoff.h"
 
-static bfd_reloc_status_type coff_i386_reloc
+static bfd_reloc_status_type coff_i386_reloc 
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static reloc_howto_type *coff_i386_rtype_to_howto
   PARAMS ((bfd *, asection *, struct internal_reloc *,
 	   struct coff_link_hash_entry *, struct internal_syment *,
+
 	   bfd_vma *));
-static reloc_howto_type *coff_i386_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
 /* The page size is a guess based on ELF.  */
@@ -61,7 +54,7 @@ static reloc_howto_type *coff_i386_reloc_type_lookup
    section for a reference to a common symbol is the value itself plus
    any desired offset.  Ian Taylor, Cygnus Support.  */
 
-/* If we are producing relocatable output, we need to do some
+/* If we are producing relocateable output, we need to do some
    adjustments to the object file that are not done by the
    bfd_perform_relocation function.  This function is called by every
    reloc type to make any required adjustments.  */
@@ -73,16 +66,14 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
      arelent *reloc_entry;
      asymbol *symbol;
      PTR data;
-     asection *input_section ATTRIBUTE_UNUSED;
+     asection *input_section;
      bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+     char **error_message;
 {
   symvalue diff;
 
-#ifndef COFF_WITH_PE
   if (output_bfd == (bfd *) NULL)
     return bfd_reloc_continue;
-#endif
 
   if (bfd_is_com_section (symbol->section))
     {
@@ -108,38 +99,15 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
     {
       /* For some reason bfd_perform_relocation always effectively
 	 ignores the addend for a COFF target when producing
-	 relocatable output.  This seems to be always wrong for 386
+	 relocateable output.  This seems to be always wrong for 386
 	 COFF, so we handle the addend here instead.  */
-#ifdef COFF_WITH_PE
-      if (output_bfd == (bfd *) NULL)
-	{
-	  reloc_howto_type *howto = reloc_entry->howto;
-
-	  /* Although PC relative relocations are very similar between
-	     PE and non-PE formats, but they are off by 1 << howto->size
-	     bytes. For the external relocation, PE is very different
-	     from others. See md_apply_fix3 () in gas/config/tc-i386.c.
-	     When we link PE and non-PE object files together to
-	     generate a non-PE executable, we have to compensate it
-	     here.  */
-	  if (howto->pc_relative && howto->pcrel_offset)
-	    diff = -(1 << howto->size);
-	  else if (symbol->flags & BSF_WEAK)
-	    diff = reloc_entry->addend - symbol->value;
-	  else
-	    diff = -reloc_entry->addend;
-	}
-      else
-#endif
-	diff = reloc_entry->addend;
+      diff = reloc_entry->addend;
     }
 
 #ifdef COFF_WITH_PE
   /* FIXME: How should this case be handled?  */
-  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;
+  if (reloc_entry->howto->type == R_IMAGEBASE && diff != 0)
+    abort ();
 #endif
 
 #define DOIT(x) \
@@ -164,7 +132,7 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 	    {
 	      short x = bfd_get_16 (abfd, addr);
 	      DOIT (x);
-	      bfd_put_16 (abfd, (bfd_vma) x, addr);
+	      bfd_put_16 (abfd, x, addr);
 	    }
 	    break;
 
@@ -172,7 +140,7 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 	    {
 	      long x = bfd_get_32 (abfd, addr);
 	      DOIT (x);
-	      bfd_put_32 (abfd, (bfd_vma) x, addr);
+	      bfd_put_32 (abfd, x, addr);
 	    }
 	    break;
 
@@ -186,165 +154,140 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 }
 
 #ifdef COFF_WITH_PE
-/* Return TRUE if this relocation should appear in the output .reloc
-   section.  */
-
-static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+/* Return true if this relocation should
+   appear in the output .reloc section. */
 
-static bfd_boolean in_reloc_p (abfd, howto)
-     bfd * abfd ATTRIBUTE_UNUSED;
+static boolean in_reloc_p(abfd, howto)
+     bfd * abfd;
      reloc_howto_type *howto;
 {
   return ! howto->pc_relative && howto->type != R_IMAGEBASE;
-}
-#endif /* COFF_WITH_PE */
+}     
+#endif
 
 #ifndef PCRELOFFSET
-#define PCRELOFFSET FALSE
+#define PCRELOFFSET false
 #endif
 
-static reloc_howto_type howto_table[] =
+static reloc_howto_type howto_table[] = 
 {
-  EMPTY_HOWTO (0),
-  EMPTY_HOWTO (1),
-  EMPTY_HOWTO (2),
-  EMPTY_HOWTO (3),
-  EMPTY_HOWTO (4),
-  EMPTY_HOWTO (5),
-  HOWTO (R_DIR32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
+  {0},
+  {1},
+  {2},
+  {3},
+  {4},
+  {5},
+  HOWTO (R_DIR32,               /* type */                                 
+	 0,	                /* rightshift */                           
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
+	 32,	                /* bitsize */                   
+	 false,	                /* pc_relative */                          
+	 0,	                /* bitpos */                               
 	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "dir32",		/* name */
-	 TRUE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-  /* PE IMAGE_REL_I386_DIR32NB relocation (7).	*/
-  HOWTO (R_IMAGEBASE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
+	 coff_i386_reloc,       /* special_function */                     
+	 "dir32",               /* name */                                 
+	 true,	                /* partial_inplace */                      
+	 0xffffffff,            /* src_mask */                             
+	 0xffffffff,            /* dst_mask */                             
+	 true),                /* pcrel_offset */
+  /* {7}, */
+  HOWTO (R_IMAGEBASE,            /* type */                                 
+	 0,	                /* rightshift */                           
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
+	 32,	                /* bitsize */                   
+	 false,	                /* pc_relative */                          
+	 0,	                /* bitpos */                               
 	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "rva32",		/* name */
-	 TRUE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-  EMPTY_HOWTO (010),
-  EMPTY_HOWTO (011),
-  EMPTY_HOWTO (012),
-#ifdef COFF_WITH_PE
-  /* 32-bit longword section relative relocation (013).  */
-  HOWTO (R_SECREL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
+	 coff_i386_reloc,       /* special_function */                     
+	 "rva32",	           /* name */                                 
+	 true,	                /* partial_inplace */                      
+	 0xffffffff,            /* src_mask */                             
+	 0xffffffff,            /* dst_mask */                             
+	 false),                /* pcrel_offset */
+  {010},
+  {011},
+  {012},
+  {013},
+  {014},
+  {015},
+  {016},
+  HOWTO (R_RELBYTE,		/* type */                                 
+	 0,			/* rightshift */                           
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */ 
+	 8,			/* bitsize */                   
+	 false,			/* pc_relative */                          
+	 0,			/* bitpos */                               
 	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "secrel32",		/* name */
-	 TRUE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-#else
-  EMPTY_HOWTO (013),
-#endif
-  EMPTY_HOWTO (014),
-  EMPTY_HOWTO (015),
-  EMPTY_HOWTO (016),
-  /* Byte relocation (017).  */
-  HOWTO (R_RELBYTE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "8",			/* name */
-	 TRUE,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
+	 coff_i386_reloc,	/* special_function */                     
+	 "8",			/* name */                                 
+	 true,			/* partial_inplace */                      
+	 0x000000ff,		/* src_mask */                             
+	 0x000000ff,		/* dst_mask */                             
 	 PCRELOFFSET),		/* pcrel_offset */
-  /* 16-bit word relocation (020).  */
-  HOWTO (R_RELWORD,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
+  HOWTO (R_RELWORD,		/* type */                                 
+	 0,			/* rightshift */                           
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */ 
+	 16,			/* bitsize */                   
+	 false,			/* pc_relative */                          
+	 0,			/* bitpos */                               
 	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "16",			/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
+	 coff_i386_reloc,	/* special_function */                     
+	 "16",			/* name */                                 
+	 true,			/* partial_inplace */                      
+	 0x0000ffff,		/* src_mask */                             
+	 0x0000ffff,		/* dst_mask */                             
 	 PCRELOFFSET),		/* pcrel_offset */
-  /* 32-bit longword relocation (021).	*/
-  HOWTO (R_RELLONG,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
+  HOWTO (R_RELLONG,		/* type */                                 
+	 0,			/* rightshift */                           
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */ 
+	 32,			/* bitsize */                   
+	 false,			/* pc_relative */                          
+	 0,			/* bitpos */                               
 	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "32",			/* name */
-	 TRUE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
+	 coff_i386_reloc,	/* special_function */                     
+	 "32",			/* name */                                 
+	 true,			/* partial_inplace */                      
+	 0xffffffff,		/* src_mask */                             
+	 0xffffffff,		/* dst_mask */                             
 	 PCRELOFFSET),		/* pcrel_offset */
-  /* Byte PC relative relocation (022).	 */
-  HOWTO (R_PCRBYTE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
+  HOWTO (R_PCRBYTE,		/* type */                                 
+	 0,			/* rightshift */                           
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */ 
+	 8,			/* bitsize */                   
+	 true,			/* pc_relative */                          
+	 0,			/* bitpos */                               
 	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "DISP8",		/* name */
-	 TRUE,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
+	 coff_i386_reloc,	/* special_function */                     
+	 "DISP8",		/* name */                                 
+	 true,			/* partial_inplace */                      
+	 0x000000ff,		/* src_mask */                             
+	 0x000000ff,		/* dst_mask */                             
 	 PCRELOFFSET),		/* pcrel_offset */
-  /* 16-bit word PC relative relocation (023).	*/
-  HOWTO (R_PCRWORD,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
+  HOWTO (R_PCRWORD,		/* type */                                 
+	 0,			/* rightshift */                           
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */ 
+	 16,			/* bitsize */                   
+	 true,			/* pc_relative */                          
+	 0,			/* bitpos */                               
 	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "DISP16",		/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
+	 coff_i386_reloc,	/* special_function */                     
+	 "DISP16",		/* name */                                 
+	 true,			/* partial_inplace */                      
+	 0x0000ffff,		/* src_mask */                             
+	 0x0000ffff,		/* dst_mask */                             
 	 PCRELOFFSET),		/* pcrel_offset */
-  /* 32-bit longword PC relative relocation (024).  */
-  HOWTO (R_PCRLONG,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
+  HOWTO (R_PCRLONG,		/* type */                                 
+	 0,			/* rightshift */                           
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */ 
+	 32,			/* bitsize */                   
+	 true,			/* pc_relative */                          
+	 0,			/* bitpos */                               
 	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */
-	 "DISP32",		/* name */
-	 TRUE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
+	 coff_i386_reloc,	/* special_function */                     
+	 "DISP32",		/* name */                                 
+	 true,			/* partial_inplace */                      
+	 0xffffffff,		/* src_mask */                             
+	 0xffffffff,		/* dst_mask */                             
 	 PCRELOFFSET)		/* pcrel_offset */
 };
 
@@ -354,11 +297,8 @@ static reloc_howto_type howto_table[] =
 #define BADMAG(x) I386BADMAG(x)
 #define I386 1			/* Customize coffcode.h */
 
-#define RTYPE2HOWTO(cache_ptr, dst)					\
-  ((cache_ptr)->howto =							\
-   ((dst)->r_type < sizeof (howto_table) / sizeof (howto_table[0])	\
-    ? howto_table + (dst)->r_type					\
-    : NULL))
+#define RTYPE2HOWTO(cache_ptr, dst) \
+	    (cache_ptr)->howto = howto_table + (dst)->r_type;
 
 /* For 386 COFF a STYP_NOLOAD | STYP_BSS section is part of a shared
    library.  On some other COFF targets STYP_BSS is normally
@@ -410,13 +350,13 @@ static reloc_howto_type howto_table[] =
 
 /* The PE relocate section routine.  The only difference between this
    and the regular routine is that we don't want to do anything for a
-   relocatable link.  */
+   relocateable link.  */
 
-static bfd_boolean coff_pe_i386_relocate_section
+static boolean coff_pe_i386_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   struct internal_reloc *, struct internal_syment *, asection **));
 
-static bfd_boolean
+static boolean
 coff_pe_i386_relocate_section (output_bfd, info, input_bfd,
 			       input_section, contents, relocs, syms,
 			       sections)
@@ -429,8 +369,8 @@ coff_pe_i386_relocate_section (output_bfd, info, input_bfd,
      struct internal_syment *syms;
      asection **sections;
 {
-  if (info->relocatable)
-    return TRUE;
+  if (info->relocateable)
+    return true;
 
   return _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
 					     input_section, contents,
@@ -445,25 +385,19 @@ coff_pe_i386_relocate_section (output_bfd, info, input_bfd,
 
 static reloc_howto_type *
 coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd *abfd;
      asection *sec;
      struct internal_reloc *rel;
      struct coff_link_hash_entry *h;
      struct internal_syment *sym;
      bfd_vma *addendp;
 {
-  reloc_howto_type *howto;
 
-  if (rel->r_type >= sizeof (howto_table) / sizeof (howto_table[0]))
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return NULL;
-    }
+  reloc_howto_type *howto;
 
   howto = howto_table + rel->r_type;
 
 #ifdef COFF_WITH_PE
-  /* Cancel out code in _bfd_coff_generic_relocate_section.  */
   *addendp = 0;
 #endif
 
@@ -477,7 +411,7 @@ coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
 	 function will be adding in the final value of the symbol.  We
 	 need to subtract out the current size in order to get the
 	 correct result.  */
-
+ 
       BFD_ASSERT (h != NULL);
 
 #ifndef COFF_WITH_PE
@@ -494,9 +428,9 @@ coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
 
 #ifndef COFF_WITH_PE
   /* If the output symbol is common (in which case this must be a
-     relocatable link), we need to add in the final size of the
+     relocateable link), we need to add in the final size of the
      common symbol.  */
-  if (h != NULL && h->root.type == bfd_link_hash_common)
+  if (h != NULL && h->root.type == bfd_link_hash_common) 
     *addendp += h->root.u.c.size;
 #endif
 
@@ -515,90 +449,38 @@ coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
 	*addendp -= sym->n_value;
     }
 
-  if (rel->r_type == R_IMAGEBASE
-      && (bfd_get_flavour(sec->output_section->owner)
-	  == bfd_target_coff_flavour))
+  if (rel->r_type == R_IMAGEBASE)
     {
       *addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase;
     }
-
-  BFD_ASSERT (sym != NULL);
-  if (rel->r_type == R_SECREL32 && sym != NULL)
-    {
-      bfd_vma osect_vma;
-
-      if (h && (h->type == bfd_link_hash_defined
-		|| h->type == bfd_link_hash_defweak))
-	osect_vma = h->root.u.def.section->output_section->vma;
-      else
-	{
-	  asection *sec;
-	  int i;
-
-	  /* Sigh, the only way to get the section to offset against
-	     is to find it the hard way.  */
-
-	  for (sec = abfd->sections, i = 1; i < sym->n_scnum; i++)
-	    sec = sec->next;
-
-	  osect_vma = sec->output_section->vma;
-	}
-
-      *addendp -= osect_vma;
-    }
 #endif
 
   return howto;
 }
 
+
 #define coff_bfd_reloc_type_lookup coff_i386_reloc_type_lookup
-#define coff_bfd_reloc_name_lookup coff_i386_reloc_name_lookup
+
 
 static reloc_howto_type *
 coff_i386_reloc_type_lookup (abfd, code)
-     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd *abfd;
      bfd_reloc_code_real_type code;
 {
   switch (code)
     {
     case BFD_RELOC_RVA:
-      return howto_table + R_IMAGEBASE;
+      return howto_table +R_IMAGEBASE;
     case BFD_RELOC_32:
       return howto_table + R_DIR32;
     case BFD_RELOC_32_PCREL:
       return howto_table + R_PCRLONG;
-    case BFD_RELOC_16:
-      return howto_table + R_RELWORD;
-    case BFD_RELOC_16_PCREL:
-      return howto_table + R_PCRWORD;
-    case BFD_RELOC_8:
-      return howto_table + R_RELBYTE;
-    case BFD_RELOC_8_PCREL:
-      return howto_table + R_PCRBYTE;
-#ifdef COFF_WITH_PE
-    case BFD_RELOC_32_SECREL:
-      return howto_table + R_SECREL32;
-#endif
     default:
       BFD_FAIL ();
       return 0;
     }
 }
 
-static reloc_howto_type *
-coff_i386_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-			     const char *r_name)
-{
-  unsigned int i;
-
-  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
-    if (howto_table[i].name != NULL
-	&& strcasecmp (howto_table[i].name, r_name) == 0)
-      return &howto_table[i];
-
-  return NULL;
-}
-
 #define coff_rtype_to_howto coff_i386_rtype_to_howto
 
 #ifdef TARGET_UNDERSCORE
@@ -607,16 +489,15 @@ coff_i386_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
    a leading dot for local labels, so if TARGET_UNDERSCORE is defined
    we treat all symbols starting with L as local.  */
 
-static bfd_boolean coff_i386_is_local_label_name
-  PARAMS ((bfd *, const char *));
+static boolean coff_i386_is_local_label_name PARAMS ((bfd *, const char *));
 
-static bfd_boolean
+static boolean
 coff_i386_is_local_label_name (abfd, name)
      bfd *abfd;
      const char *name;
 {
   if (name[0] == 'L')
-    return TRUE;
+    return true;
 
   return _bfd_coff_is_local_label_name (abfd, name);
 }
@@ -627,6 +508,69 @@ coff_i386_is_local_label_name (abfd, name)
 
 #include "coffcode.h"
 
+static const bfd_target *
+i3coff_object_p (abfd)
+     bfd *abfd;
+{
+#ifdef COFF_IMAGE_WITH_PE
+  /* We need to hack badly to handle a PE image correctly.  In PE
+     images created by the GNU linker, the offset to the COFF header
+     is always the size.  However, this is not the case in images
+     generated by other PE linkers.  The PE format stores a four byte
+     offset to the PE signature just before the COFF header at
+     location 0x3c of the file.  We pick up that offset, verify that
+     the PE signature is there, and then set ourselves up to read in
+     the COFF header.  */
+  {
+    bfd_byte ext_offset[4];
+    file_ptr offset;
+    bfd_byte ext_signature[4];
+    unsigned long signature;
+
+    if (bfd_seek (abfd, 0x3c, SEEK_SET) != 0
+	|| bfd_read (ext_offset, 1, 4, abfd) != 4)
+      {
+	if (bfd_get_error () != bfd_error_system_call)
+	  bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+    offset = bfd_h_get_32 (abfd, ext_offset);
+    if (bfd_seek (abfd, offset, SEEK_SET) != 0
+	|| bfd_read (ext_signature, 1, 4, abfd) != 4)
+      {
+	if (bfd_get_error () != bfd_error_system_call)
+	  bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+    signature = bfd_h_get_32 (abfd, ext_signature);
+
+    if (signature != 0x4550)
+      {
+	bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+
+    /* Here is the hack.  coff_object_p wants to read filhsz bytes to
+       pick up the COFF header.  We adjust so that that will work.  20
+       is the size of the i386 COFF filehdr.  */
+
+    if (bfd_seek (abfd,
+		  (bfd_tell (abfd)
+		   - bfd_coff_filhsz (abfd)
+		   + 20),
+		  SEEK_SET)
+	!= 0)
+      {
+	if (bfd_get_error () != bfd_error_system_call)
+	  bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+  }
+#endif
+
+  return coff_object_p (abfd);
+}
+
 const bfd_target
 #ifdef TARGET_SYM
   TARGET_SYM =
@@ -647,11 +591,14 @@ const bfd_target
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
 
+#ifndef COFF_WITH_PE
   (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-#ifdef COFF_WITH_PE
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES | SEC_READONLY
-#endif
    | SEC_CODE | SEC_DATA),
+#else
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
+   | SEC_CODE | SEC_DATA
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
+#endif
 
 #ifdef TARGET_UNDERSCORE
   TARGET_UNDERSCORE,		/* leading underscore */
@@ -668,9 +615,9 @@ const bfd_target
      bfd_getl32, bfd_getl_signed_32, bfd_putl32,
      bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
 
-/* Note that we allow an object file to be treated as a core file as well.  */
-    {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, coff_object_p},
+/* Note that we allow an object file to be treated as a core file as well. */
+    {_bfd_dummy_target, i3coff_object_p, /* bfd_check_format */
+       bfd_generic_archive_p, i3coff_object_p},
     {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
        bfd_false},
     {bfd_false, coff_write_object_contents, /* bfd_write_contents */
@@ -686,7 +633,5 @@ const bfd_target
      BFD_JUMP_TABLE_LINK (coff),
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  NULL,
-
-  COFF_SWAP_TABLE
+  COFF_SWAP_TABLE,
 };