* elf.c (prep_headers): Get the machine code from the elf

[deliverable/binutils-gdb.git] / bfd / ecoffswap.h

diff --git a/bfd/ecoffswap.h b/bfd/ecoffswap.h
index 00155917cf8bd12a5fb128ee5f2b0c4f7772e016..dd6fa6f32a06fe957f0d6528c33961b4b066b326 100644 (file)
--- a/bfd/ecoffswap.h
+++ b/bfd/ecoffswap.h
@@ -1,5 +1,6 @@
 /* Generic ECOFF swapping routines, for BFD.
 /* Generic ECOFF swapping routines, for BFD.

-   Copyright 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1995, 1996, 2000, 2001
+   Free Software Foundation, Inc.

    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -27,10 +28,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    on them in gdb by naming the including source file; e.g.,
    'coff-mips.c':ecoff_swap_hdr_in.
 
    on them in gdb by naming the including source file; e.g.,
    'coff-mips.c':ecoff_swap_hdr_in.
 

-   Before including this header file, one of ECOFF_32 or ECOFF_64 must
-   be defined.  These are checked when swapping information that
-   depends upon the target size.  This code works for 32 bit and 64
-   bit ECOFF, but may need to be generalized in the future.
+   Before including this header file, one of ECOFF_32, ECOFF_64,
+   ECOFF_SIGNED_32 or ECOFF_SIGNED_64 must be defined.  These are
+   checked when swapping information that depends upon the target
+   size.  This code works for 32 bit and 64 bit ECOFF, but may need to
+   be generalized in the future.

 
    Some header file which defines the external forms of these
    structures must also be included before including this header file.
 
    Some header file which defines the external forms of these
    structures must also be included before including this header file.


@@ -50,6 +52,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ecoff_get_off bfd_h_get_64
 #define ecoff_put_off bfd_h_put_64
 #endif
 #define ecoff_get_off bfd_h_get_64
 #define ecoff_put_off bfd_h_put_64
 #endif

+#ifdef ECOFF_SIGNED_32
+#define ecoff_get_off bfd_h_get_signed_32
+#define ecoff_put_off bfd_h_put_signed_32
+#endif
+#ifdef ECOFF_SIGNED_64
+#define ecoff_get_off bfd_h_get_signed_64
+#define ecoff_put_off bfd_h_put_signed_64
+#endif

 
 /* ECOFF auxiliary information swapping routines.  These are the same
    for all ECOFF targets, so they are defined in ecofflink.c.  */
 
 /* ECOFF auxiliary information swapping routines.  These are the same
    for all ECOFF targets, so they are defined in ecofflink.c.  */


@@ -122,7 +132,7 @@ ecoff_swap_hdr_in (abfd, ext_copy, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -167,7 +177,7 @@ ecoff_swap_hdr_out (abfd, intern_copy, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -182,9 +192,13 @@ ecoff_swap_fdr_in (abfd, ext_copy, intern)
   struct fdr_ext ext[1];
 
   *ext = *(struct fdr_ext *) ext_copy;
   struct fdr_ext ext[1];
 
   *ext = *(struct fdr_ext *) ext_copy;

-  
+

   intern->adr           = ecoff_get_off (abfd, (bfd_byte *)ext->f_adr);
   intern->rss           = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_rss);
   intern->adr           = ecoff_get_off (abfd, (bfd_byte *)ext->f_adr);
   intern->rss           = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_rss);

+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  if (intern->rss == (signed long) 0xffffffff)
+    intern->rss = -1;
+#endif

   intern->issBase       = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_issBase);
   intern->cbSs          = ecoff_get_off (abfd, (bfd_byte *)ext->f_cbSs);
   intern->isymBase      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_isymBase);
   intern->issBase       = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_issBase);
   intern->cbSs          = ecoff_get_off (abfd, (bfd_byte *)ext->f_cbSs);
   intern->isymBase      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_isymBase);


@@ -193,11 +207,11 @@ ecoff_swap_fdr_in (abfd, ext_copy, intern)
   intern->cline         = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_cline);
   intern->ioptBase      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_ioptBase);
   intern->copt          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_copt);
   intern->cline         = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_cline);
   intern->ioptBase      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_ioptBase);
   intern->copt          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_copt);

-#ifdef ECOFF_32
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)

   intern->ipdFirst      = bfd_h_get_16 (abfd, (bfd_byte *)ext->f_ipdFirst);
   intern->cpd           = bfd_h_get_16 (abfd, (bfd_byte *)ext->f_cpd);
 #endif
   intern->ipdFirst      = bfd_h_get_16 (abfd, (bfd_byte *)ext->f_ipdFirst);
   intern->cpd           = bfd_h_get_16 (abfd, (bfd_byte *)ext->f_cpd);
 #endif

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

   intern->ipdFirst      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_ipdFirst);
   intern->cpd           = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_cpd);
 #endif
   intern->ipdFirst      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_ipdFirst);
   intern->cpd           = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_cpd);
 #endif


@@ -206,7 +220,7 @@ ecoff_swap_fdr_in (abfd, ext_copy, intern)
   intern->rfdBase       = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_rfdBase);
   intern->crfd          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_crfd);
 
   intern->rfdBase       = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_rfdBase);
   intern->crfd          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_crfd);
 

-  /* now the fun stuff... */
+  /* now the fun stuff...  */

   if (bfd_header_big_endian (abfd)) {
     intern->lang        = (ext->f_bits1[0] & FDR_BITS1_LANG_BIG)
                                        >> FDR_BITS1_LANG_SH_BIG;
   if (bfd_header_big_endian (abfd)) {
     intern->lang        = (ext->f_bits1[0] & FDR_BITS1_LANG_BIG)
                                        >> FDR_BITS1_LANG_SH_BIG;


@@ -231,7 +245,7 @@ ecoff_swap_fdr_in (abfd, ext_copy, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -247,7 +261,7 @@ ecoff_swap_fdr_out (abfd, intern_copy, ext_ptr)
   FDR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */
   FDR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */

-  
+

   ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->f_adr);
   bfd_h_put_32 (abfd, intern->rss, (bfd_byte *)ext->f_rss);
   bfd_h_put_32 (abfd, intern->issBase, (bfd_byte *)ext->f_issBase);
   ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->f_adr);
   bfd_h_put_32 (abfd, intern->rss, (bfd_byte *)ext->f_rss);
   bfd_h_put_32 (abfd, intern->issBase, (bfd_byte *)ext->f_issBase);


@@ -258,11 +272,11 @@ ecoff_swap_fdr_out (abfd, intern_copy, ext_ptr)
   bfd_h_put_32 (abfd, intern->cline, (bfd_byte *)ext->f_cline);
   bfd_h_put_32 (abfd, intern->ioptBase, (bfd_byte *)ext->f_ioptBase);
   bfd_h_put_32 (abfd, intern->copt, (bfd_byte *)ext->f_copt);
   bfd_h_put_32 (abfd, intern->cline, (bfd_byte *)ext->f_cline);
   bfd_h_put_32 (abfd, intern->ioptBase, (bfd_byte *)ext->f_ioptBase);
   bfd_h_put_32 (abfd, intern->copt, (bfd_byte *)ext->f_copt);

-#ifdef ECOFF_32
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)

   bfd_h_put_16 (abfd, intern->ipdFirst, (bfd_byte *)ext->f_ipdFirst);
   bfd_h_put_16 (abfd, intern->cpd, (bfd_byte *)ext->f_cpd);
 #endif
   bfd_h_put_16 (abfd, intern->ipdFirst, (bfd_byte *)ext->f_ipdFirst);
   bfd_h_put_16 (abfd, intern->cpd, (bfd_byte *)ext->f_cpd);
 #endif

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

   bfd_h_put_32 (abfd, intern->ipdFirst, (bfd_byte *)ext->f_ipdFirst);
   bfd_h_put_32 (abfd, intern->cpd, (bfd_byte *)ext->f_cpd);
 #endif
   bfd_h_put_32 (abfd, intern->ipdFirst, (bfd_byte *)ext->f_ipdFirst);
   bfd_h_put_32 (abfd, intern->cpd, (bfd_byte *)ext->f_cpd);
 #endif


@@ -271,7 +285,7 @@ ecoff_swap_fdr_out (abfd, intern_copy, ext_ptr)
   bfd_h_put_32 (abfd, intern->rfdBase, (bfd_byte *)ext->f_rfdBase);
   bfd_h_put_32 (abfd, intern->crfd, (bfd_byte *)ext->f_crfd);
 
   bfd_h_put_32 (abfd, intern->rfdBase, (bfd_byte *)ext->f_rfdBase);
   bfd_h_put_32 (abfd, intern->crfd, (bfd_byte *)ext->f_crfd);
 

-  /* now the fun stuff... */
+  /* now the fun stuff...  */

   if (bfd_header_big_endian (abfd)) {
     ext->f_bits1[0] = (((intern->lang << FDR_BITS1_LANG_SH_BIG)
                        & FDR_BITS1_LANG_BIG)
   if (bfd_header_big_endian (abfd)) {
     ext->f_bits1[0] = (((intern->lang << FDR_BITS1_LANG_SH_BIG)
                        & FDR_BITS1_LANG_BIG)


@@ -299,7 +313,7 @@ ecoff_swap_fdr_out (abfd, intern_copy, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -337,7 +351,7 @@ ecoff_swap_pdr_in (abfd, ext_copy, intern)
   intern->lnHigh        = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_lnHigh);
   intern->cbLineOffset  = ecoff_get_off (abfd, (bfd_byte *)ext->p_cbLineOffset);
 
   intern->lnHigh        = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_lnHigh);
   intern->cbLineOffset  = ecoff_get_off (abfd, (bfd_byte *)ext->p_cbLineOffset);
 

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

   intern->gp_prologue = bfd_h_get_8 (abfd, (bfd_byte *) ext->p_gp_prologue);
   if (bfd_header_big_endian (abfd))
     {
   intern->gp_prologue = bfd_h_get_8 (abfd, (bfd_byte *) ext->p_gp_prologue);
   if (bfd_header_big_endian (abfd))
     {


@@ -360,11 +374,11 @@ ecoff_swap_pdr_in (abfd, ext_copy, intern)
                             << PDR_BITS2_RESERVED_SH_LEFT_LITTLE));
     }
   intern->localoff = bfd_h_get_8 (abfd, (bfd_byte *) ext->p_localoff);
                             << PDR_BITS2_RESERVED_SH_LEFT_LITTLE));
     }
   intern->localoff = bfd_h_get_8 (abfd, (bfd_byte *) ext->p_localoff);

-#endif  
+#endif

 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -380,7 +394,7 @@ ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
   PDR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */
   PDR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */

-  
+

   ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->p_adr);
   bfd_h_put_32 (abfd, intern->isym, (bfd_byte *)ext->p_isym);
   bfd_h_put_32 (abfd, intern->iline, (bfd_byte *)ext->p_iline);
   ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->p_adr);
   bfd_h_put_32 (abfd, intern->isym, (bfd_byte *)ext->p_isym);
   bfd_h_put_32 (abfd, intern->iline, (bfd_byte *)ext->p_iline);


@@ -396,7 +410,7 @@ ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
   bfd_h_put_32 (abfd, intern->lnHigh, (bfd_byte *)ext->p_lnHigh);
   ecoff_put_off (abfd, intern->cbLineOffset, (bfd_byte *)ext->p_cbLineOffset);
 
   bfd_h_put_32 (abfd, intern->lnHigh, (bfd_byte *)ext->p_lnHigh);
   ecoff_put_off (abfd, intern->cbLineOffset, (bfd_byte *)ext->p_cbLineOffset);
 

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

   bfd_h_put_8 (abfd, intern->gp_prologue, (bfd_byte *) ext->p_gp_prologue);
   if (bfd_header_big_endian (abfd))
     {
   bfd_h_put_8 (abfd, intern->gp_prologue, (bfd_byte *) ext->p_gp_prologue);
   if (bfd_header_big_endian (abfd))
     {


@@ -421,17 +435,17 @@ ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
                         & PDR_BITS2_RESERVED_LITTLE);
     }
   bfd_h_put_8 (abfd, intern->localoff, (bfd_byte *) ext->p_localoff);
                         & PDR_BITS2_RESERVED_LITTLE);
     }
   bfd_h_put_8 (abfd, intern->localoff, (bfd_byte *) ext->p_localoff);

-#endif  
+#endif

 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #else /* MPW_C */
 /* Same routines, but with ECOFF_64 code removed, so ^&%$#&! MPW C doesn't
 #endif
 }
 
 #else /* MPW_C */
 /* Same routines, but with ECOFF_64 code removed, so ^&%$#&! MPW C doesn't

-   corrupt itself and then freak out. */
+   corrupt itself and then freak out.  */

 /* Swap in the procedure descriptor record.  */
 
 static void
 /* Swap in the procedure descriptor record.  */
 
 static void


@@ -443,7 +457,7 @@ ecoff_swap_pdr_in (abfd, ext_copy, intern)
   struct pdr_ext ext[1];
 
   *ext = *(struct pdr_ext *) ext_copy;
   struct pdr_ext ext[1];
 
   *ext = *(struct pdr_ext *) ext_copy;

-  
+

   intern->adr           = ecoff_get_off (abfd, (bfd_byte *)ext->p_adr);
   intern->isym          = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_isym);
   intern->iline         = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_iline);
   intern->adr           = ecoff_get_off (abfd, (bfd_byte *)ext->p_adr);
   intern->isym          = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_isym);
   intern->iline         = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_iline);


@@ -464,7 +478,7 @@ ecoff_swap_pdr_in (abfd, ext_copy, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -480,7 +494,7 @@ ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
   PDR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */
   PDR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */

-  
+

   ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->p_adr);
   bfd_h_put_32 (abfd, intern->isym, (bfd_byte *)ext->p_isym);
   bfd_h_put_32 (abfd, intern->iline, (bfd_byte *)ext->p_iline);
   ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->p_adr);
   bfd_h_put_32 (abfd, intern->isym, (bfd_byte *)ext->p_isym);
   bfd_h_put_32 (abfd, intern->iline, (bfd_byte *)ext->p_iline);


@@ -498,7 +512,7 @@ ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 #endif /* MPW_C */
 #endif
 }
 #endif /* MPW_C */


@@ -514,11 +528,11 @@ ecoff_swap_sym_in (abfd, ext_copy, intern)
   struct sym_ext ext[1];
 
   *ext = *(struct sym_ext *) ext_copy;
   struct sym_ext ext[1];
 
   *ext = *(struct sym_ext *) ext_copy;

-  
+

   intern->iss           = bfd_h_get_32 (abfd, (bfd_byte *)ext->s_iss);
   intern->value         = ecoff_get_off (abfd, (bfd_byte *)ext->s_value);
 
   intern->iss           = bfd_h_get_32 (abfd, (bfd_byte *)ext->s_iss);
   intern->value         = ecoff_get_off (abfd, (bfd_byte *)ext->s_value);
 

-  /* now the fun stuff... */
+  /* now the fun stuff...  */

   if (bfd_header_big_endian (abfd)) {
     intern->st          =  (ext->s_bits1[0] & SYM_BITS1_ST_BIG)
                                           >> SYM_BITS1_ST_SH_BIG;
   if (bfd_header_big_endian (abfd)) {
     intern->st          =  (ext->s_bits1[0] & SYM_BITS1_ST_BIG)
                                           >> SYM_BITS1_ST_SH_BIG;


@@ -548,7 +562,7 @@ ecoff_swap_sym_in (abfd, ext_copy, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -564,11 +578,11 @@ ecoff_swap_sym_out (abfd, intern_copy, ext_ptr)
   SYMR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */
   SYMR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */

-  
+

   bfd_h_put_32 (abfd, intern->iss, (bfd_byte *)ext->s_iss);
   ecoff_put_off (abfd, intern->value, (bfd_byte *)ext->s_value);
 
   bfd_h_put_32 (abfd, intern->iss, (bfd_byte *)ext->s_iss);
   ecoff_put_off (abfd, intern->value, (bfd_byte *)ext->s_value);
 

-  /* now the fun stuff... */
+  /* now the fun stuff...  */

   if (bfd_header_big_endian (abfd)) {
     ext->s_bits1[0] = (((intern->st << SYM_BITS1_ST_SH_BIG)
                        & SYM_BITS1_ST_BIG)
   if (bfd_header_big_endian (abfd)) {
     ext->s_bits1[0] = (((intern->st << SYM_BITS1_ST_SH_BIG)
                        & SYM_BITS1_ST_BIG)


@@ -597,7 +611,7 @@ ecoff_swap_sym_out (abfd, intern_copy, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -612,8 +626,8 @@ ecoff_swap_ext_in (abfd, ext_copy, intern)
   struct ext_ext ext[1];
 
   *ext = *(struct ext_ext *) ext_copy;
   struct ext_ext ext[1];
 
   *ext = *(struct ext_ext *) ext_copy;

-  
-  /* now the fun stuff... */
+
+  /* now the fun stuff...  */

   if (bfd_header_big_endian (abfd)) {
     intern->jmptbl      = 0 != (ext->es_bits1[0] & EXT_BITS1_JMPTBL_BIG);
     intern->cobol_main  = 0 != (ext->es_bits1[0] & EXT_BITS1_COBOL_MAIN_BIG);
   if (bfd_header_big_endian (abfd)) {
     intern->jmptbl      = 0 != (ext->es_bits1[0] & EXT_BITS1_JMPTBL_BIG);
     intern->cobol_main  = 0 != (ext->es_bits1[0] & EXT_BITS1_COBOL_MAIN_BIG);


@@ -625,10 +639,10 @@ ecoff_swap_ext_in (abfd, ext_copy, intern)
   }
   intern->reserved = 0;
 
   }
   intern->reserved = 0;
 

-#ifdef ECOFF_32
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)

   intern->ifd           = bfd_h_get_signed_16 (abfd, (bfd_byte *)ext->es_ifd);
 #endif
   intern->ifd           = bfd_h_get_signed_16 (abfd, (bfd_byte *)ext->es_ifd);
 #endif

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

   intern->ifd           = bfd_h_get_signed_32 (abfd, (bfd_byte *)ext->es_ifd);
 #endif
 
   intern->ifd           = bfd_h_get_signed_32 (abfd, (bfd_byte *)ext->es_ifd);
 #endif
 


@@ -636,7 +650,7 @@ ecoff_swap_ext_in (abfd, ext_copy, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -652,14 +666,14 @@ ecoff_swap_ext_out (abfd, intern_copy, ext_ptr)
   EXTR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */
   EXTR intern[1];
 
   *intern = *intern_copy;      /* Make it reasonable to do in-place.  */

-  
-  /* now the fun stuff... */
+
+  /* now the fun stuff...  */

   if (bfd_header_big_endian (abfd)) {
     ext->es_bits1[0] = ((intern->jmptbl ? EXT_BITS1_JMPTBL_BIG : 0)
                        | (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_BIG : 0)
                        | (intern->weakext ? EXT_BITS1_WEAKEXT_BIG : 0));
     ext->es_bits2[0] = 0;
   if (bfd_header_big_endian (abfd)) {
     ext->es_bits1[0] = ((intern->jmptbl ? EXT_BITS1_JMPTBL_BIG : 0)
                        | (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_BIG : 0)
                        | (intern->weakext ? EXT_BITS1_WEAKEXT_BIG : 0));
     ext->es_bits2[0] = 0;

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

     ext->es_bits2[1] = 0;
     ext->es_bits2[2] = 0;
 #endif
     ext->es_bits2[1] = 0;
     ext->es_bits2[2] = 0;
 #endif


@@ -668,16 +682,16 @@ ecoff_swap_ext_out (abfd, intern_copy, ext_ptr)
                        | (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_LITTLE : 0)
                        | (intern->weakext ? EXT_BITS1_WEAKEXT_LITTLE : 0));
     ext->es_bits2[0] = 0;
                        | (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_LITTLE : 0)
                        | (intern->weakext ? EXT_BITS1_WEAKEXT_LITTLE : 0));
     ext->es_bits2[0] = 0;

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

     ext->es_bits2[1] = 0;
     ext->es_bits2[2] = 0;
 #endif
   }
 
     ext->es_bits2[1] = 0;
     ext->es_bits2[2] = 0;
 #endif
   }
 

-#ifdef ECOFF_32
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)

   bfd_h_put_signed_16 (abfd, intern->ifd, (bfd_byte *)ext->es_ifd);
 #endif
   bfd_h_put_signed_16 (abfd, intern->ifd, (bfd_byte *)ext->es_ifd);
 #endif

-#ifdef ECOFF_64
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)

   bfd_h_put_signed_32 (abfd, intern->ifd, (bfd_byte *)ext->es_ifd);
 #endif
 
   bfd_h_put_signed_32 (abfd, intern->ifd, (bfd_byte *)ext->es_ifd);
 #endif
 


@@ -685,7 +699,7 @@ ecoff_swap_ext_out (abfd, intern_copy, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -703,7 +717,7 @@ ecoff_swap_rfd_in (abfd, ext_ptr, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -721,7 +735,7 @@ ecoff_swap_rfd_out (abfd, intern, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -762,7 +776,7 @@ ecoff_swap_opt_in (abfd, ext_copy, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -801,7 +815,7 @@ ecoff_swap_opt_out (abfd, intern_copy, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -822,7 +836,7 @@ ecoff_swap_dnr_in (abfd, ext_copy, intern)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 
 #endif
 }
 


@@ -844,6 +858,6 @@ ecoff_swap_dnr_out (abfd, intern_copy, ext_ptr)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
 
 #ifdef TEST
   if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)

-    abort();
+    abort ();

 #endif
 }
 #endif
 }