Update ROCm for multi-target support

[deliverable/binutils-gdb.git] / bfd / coff-stgo32.c

diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
index bd9d00a344102a075ce2d91331abd2720eb2cceb..a2b059794196bb998f2e9809233dfeda9bf47cd5 100644 (file)
--- a/bfd/coff-stgo32.c
+++ b/bfd/coff-stgo32.c
@@ -1,12 +1,12 @@
 /* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).
 /* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).

-   Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997-2020 Free Software Foundation, Inc.

    Written by Robert Hoehne.
 
    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
    Written by Robert Hoehne.
 
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 /* This file handles now also stubbed coff images. The stub is a small
    DOS executable program before the coff image to load it in memory
 
 /* This file handles now also stubbed coff images. The stub is a small
    DOS executable program before the coff image to load it in memory


@@ -32,10 +33,9 @@
    image and NOT in the file.
 
    To be compatible with any existing executables I have fixed this
    image and NOT in the file.
 
    To be compatible with any existing executables I have fixed this

-   here and NOT in the DJGPP startup code.
- */
+   here and NOT in the DJGPP startup code.  */

 
 

-#define TARGET_SYM             go32stubbedcoff_vec
+#define TARGET_SYM             i386_coff_go32stubbed_vec

 #define TARGET_NAME            "coff-go32-exe"
 #define TARGET_UNDERSCORE      '_'
 #define COFF_GO32_EXE
 #define TARGET_NAME            "coff-go32-exe"
 #define TARGET_UNDERSCORE      '_'
 #define COFF_GO32_EXE


@@ -53,42 +53,33 @@
 { COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \
   COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
 
 { COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \
   COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
 

+#include "sysdep.h"

 #include "bfd.h"
 
 #include "bfd.h"
 

-/* At first the prototypes */
+/* All that ..._PRE and ...POST functions are called from the corresponding
+   coff_swap... functions. The ...PRE functions are called at the beginning
+   of the function and the ...POST functions at the end of the swap routines.  */

 
 static void
 
 static void

-adjust_filehdr_in_post PARAMS ((bfd * abfd, PTR src, PTR dst));
+adjust_filehdr_in_post  (bfd *, void *, void *);

 static void
 static void

-adjust_filehdr_out_pre PARAMS ((bfd * abfd, PTR in, PTR out));
+adjust_filehdr_out_pre  (bfd *, void *, void *);

 static void
 static void

-adjust_filehdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
+adjust_filehdr_out_post  (bfd *, void *, void *);

 static void
 static void

-adjust_scnhdr_in_post PARAMS ((bfd * abfd, PTR ext, PTR in));
+adjust_scnhdr_in_post  (bfd *, void *, void *);

 static void
 static void

-adjust_scnhdr_out_pre PARAMS ((bfd * abfd, PTR in, PTR out));
+adjust_scnhdr_out_pre  (bfd *, void *, void *);

 static void
 static void

-adjust_scnhdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
+adjust_scnhdr_out_post (bfd *, void *, void *);

 static void
 static void

-adjust_aux_in_post PARAMS ((bfd * abfd, PTR ext1, int type, int class, int indx,
-                           int numaux, PTR in1));
+adjust_aux_in_post (bfd *, void *, int, int, int, int, void *);

 static void
 static void

-adjust_aux_out_pre PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
-                           int numaux, PTR extp));
+adjust_aux_out_pre (bfd *, void *, int, int, int, int, void *);

 static void
 static void

-adjust_aux_out_post PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
-                            int numaux, PTR extp));
-
+adjust_aux_out_post (bfd *, void *, int, int, int, int, void *);

 static void
 static void

-create_go32_stub PARAMS ((bfd * abfd));
-
-/*
-   All that ..._PRE and ...POST functions are called from the corresponding
-   coff_swap... functions. The ...PRE functions are called at the beginning
-   of the function and the ...POST functions at the end of the swap routines.
- */
+create_go32_stub (bfd *);

 
 #define COFF_ADJUST_FILEHDR_IN_POST adjust_filehdr_in_post
 #define COFF_ADJUST_FILEHDR_OUT_PRE adjust_filehdr_out_pre
 
 #define COFF_ADJUST_FILEHDR_IN_POST adjust_filehdr_in_post
 #define COFF_ADJUST_FILEHDR_OUT_PRE adjust_filehdr_out_pre


@@ -102,24 +93,25 @@ create_go32_stub PARAMS ((bfd * abfd));
 #define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
 #define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
 
 #define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
 #define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
 

-static boolean
-  go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd * ibfd, bfd * obfd));
+static const bfd_target *go32_check_format (bfd *);
+
+#define COFF_CHECK_FORMAT go32_check_format
+
+static bfd_boolean
+  go32_stubbed_coff_bfd_copy_private_bfd_data (bfd *, bfd *);

 
 #define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
 
 #include "coff-i386.c"
 
 
 #define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
 
 #include "coff-i386.c"
 

-/* I hold in the usrdata the stub */
-#define bfd_coff_go32stub bfd_usrdata
-
-/* This macro is used, because I cannot assume the endianess of the
-   host system */
-#define _H(index) (bfd_h_get_16(abfd, (bfd_byte *) (header+index*2)))
+/* This macro is used, because I cannot assume the endianness of the
+   host system.  */
+#define _H(index) (H_GET_16 (abfd, (header + index * 2)))

 
 /* These bytes are a 2048-byte DOS executable, which loads the COFF
 
 /* These bytes are a 2048-byte DOS executable, which loads the COFF

-   image into memory and then runs it. It is called 'stub' */
+   image into memory and then runs it. It is called 'stub'.  */

 
 

-static unsigned char stub_bytes[STUBSIZE] =
+static const unsigned char stub_bytes[GO32_STUBSIZE] =

 {
 #include "go32stub.h"
 };
 {
 #include "go32stub.h"
 };


@@ -127,167 +119,153 @@ static unsigned char stub_bytes[STUBSIZE] =
 /*
    I have not commented each swap function below, because the
    technique is in any function the same. For the ...in function,
 /*
    I have not commented each swap function below, because the
    technique is in any function the same. For the ...in function,

-   all the pointers are adjusted by adding STUBSIZE and for the
+   all the pointers are adjusted by adding GO32_STUBSIZE and for the

    ...out function, it is subtracted first and after calling the
    ...out function, it is subtracted first and after calling the

-   standard swap function it is reset to the old value */
+   standard swap function it is reset to the old value.  */

 
 /* This macro is used for adjusting the filepointers, which
 
 /* This macro is used for adjusting the filepointers, which

-   is done only, if the pointer is nonzero */
+   is done only, if the pointer is nonzero.  */

 
 #define ADJUST_VAL(val,diff) \
   if (val != 0) val += diff
 
 static void
 
 #define ADJUST_VAL(val,diff) \
   if (val != 0) val += diff
 
 static void

-adjust_filehdr_in_post  (abfd, src, dst)
-     bfd *abfd;
-     PTR src;
-     PTR dst;
+adjust_filehdr_in_post  (bfd *  abfd ATTRIBUTE_UNUSED,
+                        void * src,
+                        void * dst)

 {
   FILHDR *filehdr_src = (FILHDR *) src;
   struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
 
 {
   FILHDR *filehdr_src = (FILHDR *) src;
   struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
 

-  ADJUST_VAL (filehdr_dst->f_symptr, STUBSIZE);
+  ADJUST_VAL (filehdr_dst->f_symptr, GO32_STUBSIZE);

 
 

-  /* Save now the stub to be used later */
-  bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
-
-  /* Since this function returns no status, I do not set here
-     any bfd_error_...
-     That means, before the use of bfd_coff_go32stub (), this value
-     should be checked if it is != NULL */
-  if (bfd_coff_go32stub (abfd) == NULL)
-    return;
-  memcpy (bfd_coff_go32stub (abfd), filehdr_src->stub, STUBSIZE);
+  /* Save now the stub to be used later.  Put the stub data to FILEHDR_DST
+     first as coff_data (abfd) still does not exist.  It may not even be ever
+     created as we are just checking the file format of ABFD.  */
+  memcpy (filehdr_dst->go32stub, filehdr_src->stub, GO32_STUBSIZE);
+  filehdr_dst->f_flags |= F_GO32STUB;

 }
 
 static void
 }
 
 static void

-adjust_filehdr_out_pre  (abfd, in, out)
-     bfd *abfd;
-     PTR in;
-     PTR out;
+adjust_filehdr_out_pre  (bfd * abfd, void * in, void * out)

 {
   struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
   FILHDR *filehdr_out = (FILHDR *) out;
 
 {
   struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
   FILHDR *filehdr_out = (FILHDR *) out;
 

-  /* Generate the stub */
+  /* Generate the stub.  */

   create_go32_stub (abfd);
 
   create_go32_stub (abfd);
 

-  /* Copy the stub to the file header */
-  if (bfd_coff_go32stub (abfd) != NULL)
-    memcpy (filehdr_out->stub, bfd_coff_go32stub (abfd), STUBSIZE);
+  /* Copy the stub to the file header.  */
+  if (coff_data (abfd)->go32stub != NULL)
+    memcpy (filehdr_out->stub, coff_data (abfd)->go32stub, GO32_STUBSIZE);

   else
   else

-    /* use the default */
-    memcpy (filehdr_out->stub, stub_bytes, STUBSIZE);
+    /* Use the default.  */
+    memcpy (filehdr_out->stub, stub_bytes, GO32_STUBSIZE);

 
 

-  ADJUST_VAL (filehdr_in->f_symptr, -STUBSIZE);
+  ADJUST_VAL (filehdr_in->f_symptr, -GO32_STUBSIZE);

 }
 
 static void
 }
 
 static void

-adjust_filehdr_out_post  (abfd, in, out)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR in;
-     PTR out ATTRIBUTE_UNUSED;
+adjust_filehdr_out_post  (bfd *  abfd ATTRIBUTE_UNUSED,
+                         void * in,
+                         void * out ATTRIBUTE_UNUSED)

 {
   struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
 {
   struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;

-  /* undo the above change */
-  ADJUST_VAL (filehdr_in->f_symptr, STUBSIZE);
+  /* Undo the above change.  */
+  ADJUST_VAL (filehdr_in->f_symptr, GO32_STUBSIZE);

 }
 
 static void
 }
 
 static void

-adjust_scnhdr_in_post  (abfd, ext, in)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR ext ATTRIBUTE_UNUSED;
-     PTR in;
+adjust_scnhdr_in_post  (bfd *  abfd ATTRIBUTE_UNUSED,
+                       void * ext ATTRIBUTE_UNUSED,
+                       void * in)

 {
   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
 
 {
   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
 

-  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);

 }
 
 static void
 }
 
 static void

-adjust_scnhdr_out_pre  (abfd, in, out)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR in;
-     PTR out ATTRIBUTE_UNUSED;
+adjust_scnhdr_out_pre  (bfd *  abfd ATTRIBUTE_UNUSED,
+                       void * in,
+                       void * out ATTRIBUTE_UNUSED)

 {
   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
 
 {
   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
 

-  ADJUST_VAL (scnhdr_int->s_scnptr, -STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_relptr, -STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_lnnoptr, -STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_scnptr, -GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_relptr, -GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_lnnoptr, -GO32_STUBSIZE);

 }
 
 static void
 }
 
 static void

-adjust_scnhdr_out_post (abfd, in, out)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR in;
-     PTR out ATTRIBUTE_UNUSED;
+adjust_scnhdr_out_post (bfd *  abfd ATTRIBUTE_UNUSED,
+                       void * in,
+                       void * out ATTRIBUTE_UNUSED)

 {
   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
 
 {
   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
 

-  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);

 }
 
 static void
 }
 
 static void

-adjust_aux_in_post  (abfd, ext1, type, class, indx, numaux, in1)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR ext1 ATTRIBUTE_UNUSED;
-     int type;
-     int class;
-     int indx ATTRIBUTE_UNUSED;
-     int numaux ATTRIBUTE_UNUSED;
-     PTR in1;
+adjust_aux_in_post (bfd * abfd ATTRIBUTE_UNUSED,
+                   void * ext1 ATTRIBUTE_UNUSED,
+                   int type,
+                   int in_class,
+                   int indx ATTRIBUTE_UNUSED,
+                   int numaux ATTRIBUTE_UNUSED,
+                   void * in1)

 {
   union internal_auxent *in = (union internal_auxent *) in1;
 
 {
   union internal_auxent *in = (union internal_auxent *) in1;
 

-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))

     {
     {

-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);

     }
 }
 
 static void
     }
 }
 
 static void

-adjust_aux_out_pre  (abfd, inp, type, class, indx, numaux, extp)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR inp;
-     int type;
-     int class;
-     int indx ATTRIBUTE_UNUSED;
-     int numaux ATTRIBUTE_UNUSED;
-     PTR extp ATTRIBUTE_UNUSED;
+adjust_aux_out_pre (bfd *abfd ATTRIBUTE_UNUSED,
+                   void * inp,
+                   int type,
+                   int in_class,
+                   int indx ATTRIBUTE_UNUSED,
+                   int numaux ATTRIBUTE_UNUSED,
+                   void * extp ATTRIBUTE_UNUSED)

 {
   union internal_auxent *in = (union internal_auxent *) inp;
 
 {
   union internal_auxent *in = (union internal_auxent *) inp;
 

-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))

     {
     {

-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -STUBSIZE);
+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -GO32_STUBSIZE);

     }
 }
 
 static void
     }
 }
 
 static void

-adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR inp;
-     int type;
-     int class;
-     int indx ATTRIBUTE_UNUSED;
-     int numaux ATTRIBUTE_UNUSED;
-     PTR extp ATTRIBUTE_UNUSED;
+adjust_aux_out_post (bfd *abfd ATTRIBUTE_UNUSED,
+                    void * inp,
+                    int type,
+                    int in_class,
+                    int indx ATTRIBUTE_UNUSED,
+                    int numaux ATTRIBUTE_UNUSED,
+                    void * extp ATTRIBUTE_UNUSED)

 {
   union internal_auxent *in = (union internal_auxent *) inp;
 
 {
   union internal_auxent *in = (union internal_auxent *) inp;
 

-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))

     {
     {

-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);

     }
 }
 
     }
 }
 

-/*
-   That's the function, which creates the stub. There are
+/* That's the function, which creates the stub. There are

    different cases from where the stub is taken.
    At first the environment variable $(GO32STUB) is checked and then
    $(STUB) if it was not set.
    different cases from where the stub is taken.
    At first the environment variable $(GO32STUB) is checked and then
    $(STUB) if it was not set.


@@ -297,26 +275,25 @@ adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
    file.
 
    If there was any error, the standard stub (compiled in this file)
    file.
 
    If there was any error, the standard stub (compiled in this file)

-   is taken.
- */
+   is taken.  */

 
 static void
 
 static void

-create_go32_stub (abfd)
-     bfd *abfd;
+create_go32_stub (bfd *abfd)

 {
 {

-  /* Do it only once */
-  if (bfd_coff_go32stub (abfd) == NULL)
+  /* Do it only once.  */
+  if (coff_data (abfd)->go32stub == NULL)

     {
       char *stub;
       struct stat st;
       int f;
       unsigned char header[10];
       char magic[8];
     {
       char *stub;
       struct stat st;
       int f;
       unsigned char header[10];
       char magic[8];

-      unsigned long coff_start, exe_start;
+      unsigned long coff_start;
+      long exe_start;

 
 

-      /* Check at first the environment variable $(GO32STUB) */
+      /* Check at first the environment variable $(GO32STUB).  */

       stub = getenv ("GO32STUB");
       stub = getenv ("GO32STUB");

-      /* Now check the environment variable $(STUB) */
+      /* Now check the environment variable $(STUB).  */

       if (stub == NULL)
        stub = getenv ("STUB");
       if (stub == NULL)
       if (stub == NULL)
        stub = getenv ("STUB");
       if (stub == NULL)


@@ -335,26 +312,26 @@ create_go32_stub (abfd)
          close (f);
          goto stub_end;
        }
          close (f);
          goto stub_end;
        }

-      if (_H (0) != 0x5a4d)    /* it is not an exe file */
+      if (_H (0) != 0x5a4d)    /* It is not an exe file.  */

        {
          close (f);
          goto stub_end;
        }
       /* Compute the size of the stub (it is every thing up
        {
          close (f);
          goto stub_end;
        }
       /* Compute the size of the stub (it is every thing up

-         to the beginning of the coff image) */
+        to the beginning of the coff image).  */

       coff_start = (long) _H (2) * 512L;
       if (_H (1))
        coff_start += (long) _H (1) - 512L;
 
       /* Currently there is only a fixed stub size of 2048 bytes
       coff_start = (long) _H (2) * 512L;
       if (_H (1))
        coff_start += (long) _H (1) - 512L;
 
       /* Currently there is only a fixed stub size of 2048 bytes

-         supported */
+        supported.  */

       if (coff_start != 2048)
        {
          close (f);
          goto stub_end;
        }
       exe_start = _H (4) * 16;
       if (coff_start != 2048)
        {
          close (f);
          goto stub_end;
        }
       exe_start = _H (4) * 16;

-      if ((unsigned long) lseek (f, exe_start, SEEK_SET) != exe_start)
+      if ((long) lseek (f, exe_start, SEEK_SET) != exe_start)

        {
          close (f);
          goto stub_end;
        {
          close (f);
          goto stub_end;


@@ -364,62 +341,84 @@ create_go32_stub (abfd)
          close (f);
          goto stub_end;
        }
          close (f);
          goto stub_end;
        }

-      if (memcmp (magic, "go32stub", 8) != 0)
+      if (! CONST_STRNEQ (magic, "go32stub"))

        {
          close (f);
          goto stub_end;
        }
        {
          close (f);
          goto stub_end;
        }

-      /* Now we found a correct stub (hopefully) */
-      bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, coff_start);
-      if (bfd_coff_go32stub (abfd) == NULL)
+      /* Now we found a correct stub (hopefully).  */
+      coff_data (abfd)->go32stub = bfd_alloc (abfd, (bfd_size_type) coff_start);
+      if (coff_data (abfd)->go32stub == NULL)

        {
          close (f);
          return;
        }
       lseek (f, 0L, SEEK_SET);
        {
          close (f);
          return;
        }
       lseek (f, 0L, SEEK_SET);

-      if ((unsigned long) read (f, bfd_coff_go32stub (abfd), coff_start)
+      if ((unsigned long) read (f, coff_data (abfd)->go32stub, coff_start)

          != coff_start)
        {
          != coff_start)
        {

-         bfd_release (abfd, bfd_coff_go32stub (abfd));
-         bfd_coff_go32stub (abfd) = NULL;
+         bfd_release (abfd, coff_data (abfd)->go32stub);
+         coff_data (abfd)->go32stub = NULL;

        }
       close (f);
     }
 stub_end:
   /* There was something wrong above, so use now the standard builtin
        }
       close (f);
     }
 stub_end:
   /* There was something wrong above, so use now the standard builtin

-     stub */
-  if (bfd_coff_go32stub (abfd) == NULL)
+     stub.  */
+  if (coff_data (abfd)->go32stub == NULL)

     {
     {

-      bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
-      if (bfd_coff_go32stub (abfd) == NULL)
-       {
-         return;
-       }
-
-      memcpy (bfd_coff_go32stub (abfd), stub_bytes, STUBSIZE);
+      coff_data (abfd)->go32stub
+       = bfd_alloc (abfd, (bfd_size_type) GO32_STUBSIZE);
+      if (coff_data (abfd)->go32stub == NULL)
+       return;
+      memcpy (coff_data (abfd)->go32stub, stub_bytes, GO32_STUBSIZE);

     }
 }
 
 /* If ibfd was a stubbed coff image, copy the stub from that bfd
     }
 }
 
 /* If ibfd was a stubbed coff image, copy the stub from that bfd

-   to the new obfd.
- */
+   to the new obfd.  */

 
 

-static boolean
-go32_stubbed_coff_bfd_copy_private_bfd_data  (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
+static bfd_boolean
+go32_stubbed_coff_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)

 {
 {

-  /* check if both are the same targets */
+  /* Check if both are the same targets.  */

   if (ibfd->xvec != obfd->xvec)
   if (ibfd->xvec != obfd->xvec)

-    return true;
+    return TRUE;
+
+  /* Check if we have a source stub.  */
+  if (coff_data (ibfd)->go32stub == NULL)
+    return TRUE;

 
 

-  /* check if both have a valid stub */
-  if (bfd_coff_go32stub (ibfd) == NULL
-      || bfd_coff_go32stub (obfd) == NULL)
-    return true;
+  /* As adjust_filehdr_out_pre may get called only after this function,
+     optionally allocate the output stub.  */
+  if (coff_data (obfd)->go32stub == NULL)
+    coff_data (obfd)->go32stub = bfd_alloc (obfd,
+                                         (bfd_size_type) GO32_STUBSIZE);
+
+  /* Now copy the stub.  */
+  if (coff_data (obfd)->go32stub != NULL)
+    memcpy (coff_data (obfd)->go32stub, coff_data (ibfd)->go32stub,
+           GO32_STUBSIZE);
+
+  return TRUE;
+}
+
+/* coff_object_p only checks 2 bytes F_MAGIC at GO32_STUBSIZE inside the file
+   which is too fragile.  */
+
+static const bfd_target *
+go32_check_format (bfd *abfd)
+{
+  char mz[2];
+
+  if (bfd_bread (mz, 2, abfd) != 2 || mz[0] != 'M' || mz[1] != 'Z')
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }

 
 

-  /* Now copy the stub */
-  memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+    return NULL;

 
 

-  return true;
+  return coff_object_p (abfd);

 }
 }