* ld-powerpc/symtocbase.d: Adjust for alignment change.

[binutils.git] / bfd / i386lynx.c

diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c
index 6b27bd19ed317124b7c063543114a62fd142e1a1..856c0fd206943b3e8b5d453d0974d2172cb69f66 100644 (file)
--- a/bfd/i386lynx.c
+++ b/bfd/i386lynx.c
@@ -1,5 +1,6 @@
 /* BFD back-end for i386 a.out binaries under LynxOS.
 /* BFD back-end for i386 a.out binaries under LynxOS.

-   Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2001, 2002,
+   2003 Free Software Foundation, Inc.

 
 This file is part of BFD, the Binary File Descriptor library.
 
 
 This file is part of BFD, the Binary File Descriptor library.
 


@@ -15,9 +16,8 @@ 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
 
 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.  */

 
 

-#define BYTES_IN_WORD 4

 #define N_SHARED_LIB(x) 0
 
 #define TEXT_START_ADDR 0
 #define N_SHARED_LIB(x) 0
 
 #define TEXT_START_ADDR 0


@@ -25,7 +25,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_i386
 
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_i386
 

-#define MY(OP) CAT(i386lynx_aout_,OP)
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386lynx_aout_,OP)

 #define TARGETNAME "a.out-i386-lynx"
 
 #include "bfd.h"
 #define TARGETNAME "a.out-i386-lynx"
 
 #include "bfd.h"


@@ -49,32 +52,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
                           obj_reloc_entry_size (abfd));                      \
        NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);           \
                                                                              \
                           obj_reloc_entry_size (abfd));                      \
        NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);           \
                                                                              \

-       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false;       \
-       if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)           \
-           != EXEC_BYTES_SIZE)                                               \
-         return false;                                                       \
+       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0                      \
+           || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, \
+                         abfd) != EXEC_BYTES_SIZE)                           \
+         return FALSE;                                                       \

        /* Now write out reloc info, followed by syms and strings */          \
                                                                              \
        if (bfd_get_symcount (abfd) != 0)                                     \
            {                                                                 \
        /* Now write out reloc info, followed by syms and strings */          \
                                                                              \
        if (bfd_get_symcount (abfd) != 0)                                     \
            {                                                                 \

-             if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET)     \
+             if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET)    \

                  != 0)                                                       \
                  != 0)                                                       \

-               return false;                                                 \
+               return FALSE;                                                 \

                                                                              \
                                                                              \

-             if (! NAME(aout,write_syms)(abfd)) return false;                \
+             if (! NAME(aout,write_syms) (abfd)) return FALSE;               \

                                                                              \
                                                                              \

-             if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET)    \
+             if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET)   \

                  != 0)                                                       \
                  != 0)                                                       \

-               return false;                                                 \
+               return FALSE;                                                 \

                                                                              \
              if (!NAME(lynx,squirt_out_relocs) (abfd, obj_textsec (abfd)))   \
                                                                              \
              if (!NAME(lynx,squirt_out_relocs) (abfd, obj_textsec (abfd)))   \

-               return false;                                                 \
-             if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET)    \
+               return FALSE;                                                 \
+             if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET)   \

                  != 0)                                                       \
                return 0;                                                     \
                                                                              \
                  != 0)                                                       \
                return 0;                                                     \
                                                                              \

-             if (!NAME(lynx,squirt_out_relocs)(abfd, obj_datasec (abfd)))    \
-               return false;                                                 \
+             if (!NAME(lynx,squirt_out_relocs) (abfd, obj_datasec (abfd)))   \
+               return FALSE;                                                 \

            }                                                                 \
       }
 #endif
            }                                                                 \
       }
 #endif


@@ -82,11 +85,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libaout.h"
 #include "aout/aout64.h"
 
 #include "libaout.h"
 #include "aout/aout64.h"
 

+void NAME (lynx,swap_std_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_std_external *));
+void NAME (lynx,swap_ext_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_ext_external *));
+void NAME (lynx,swap_ext_reloc_in)
+  PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **,
+          bfd_size_type));
+void NAME (lynx,swap_std_reloc_in)
+  PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **,
+          bfd_size_type));
+bfd_boolean NAME (lynx,slurp_reloc_table)
+  PARAMS ((bfd *, sec_ptr, asymbol **));
+bfd_boolean NAME (lynx,squirt_out_relocs)
+  PARAMS ((bfd *, asection *));
+long NAME (lynx,canonicalize_reloc)
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+

 #ifdef LYNX_CORE
 
 char *lynx_core_file_failing_command ();
 int lynx_core_file_failing_signal ();
 #ifdef LYNX_CORE
 
 char *lynx_core_file_failing_command ();
 int lynx_core_file_failing_signal ();

-boolean lynx_core_file_matches_executable_p ();
+bfd_boolean lynx_core_file_matches_executable_p ();

 const bfd_target *lynx_core_file_p ();
 
 #define        MY_core_file_failing_command lynx_core_file_failing_command
 const bfd_target *lynx_core_file_p ();
 
 #define        MY_core_file_failing_command lynx_core_file_failing_command


@@ -97,7 +117,7 @@ const bfd_target *lynx_core_file_p ();
 #endif /* LYNX_CORE */
 \f
 
 #endif /* LYNX_CORE */
 \f
 

-#define KEEPIT flags
+#define KEEPIT udata.i

 
 extern reloc_howto_type aout_32_ext_howto_table[];
 extern reloc_howto_type aout_32_std_howto_table[];
 
 extern reloc_howto_type aout_32_ext_howto_table[];
 extern reloc_howto_type aout_32_std_howto_table[];


@@ -139,7 +159,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
      Absolute symbols can come in in two ways, either as an offset
      from the abs section, or as a symbol which has an abs value.
      check for that here
      Absolute symbols can come in in two ways, either as an offset
      from the abs section, or as a symbol which has an abs value.
      check for that here

-     */
+  */

 
 
   if (bfd_is_com_section (output_section)
 
 
   if (bfd_is_com_section (output_section)


@@ -149,7 +169,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
       if (bfd_abs_section_ptr->symbol == sym)
        {
          /* Whoops, looked like an abs symbol, but is really an offset
       if (bfd_abs_section_ptr->symbol == sym)
        {
          /* Whoops, looked like an abs symbol, but is really an offset

-          from the abs section */
+            from the abs section */

          r_index = 0;
          r_extern = 0;
        }
          r_index = 0;
          r_extern = 0;
        }


@@ -157,8 +177,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
        {
          /* Fill in symbol */
          r_extern = 1;
        {
          /* Fill in symbol */
          r_extern = 1;

-         r_index = stoi ((*(g->sym_ptr_ptr))->KEEPIT);
-
+         r_index = (*g->sym_ptr_ptr)->KEEPIT;

        }
     }
   else
        }
     }
   else


@@ -169,7 +188,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
     }
 
   /* now the fun stuff */
     }
 
   /* now the fun stuff */

-  if (abfd->xvec->header_byteorder_big_p != false)
+  if (bfd_header_big_endian (abfd))

     {
       natptr->r_index[0] = r_index >> 16;
       natptr->r_index[1] = r_index >> 8;
     {
       natptr->r_index[0] = r_index >> 16;
       natptr->r_index[1] = r_index >> 8;


@@ -243,7 +262,7 @@ NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr)
       else
        {
          r_extern = 1;
       else
        {
          r_extern = 1;

-         r_index = stoi ((*(g->sym_ptr_ptr))->KEEPIT);
+         r_index = (*g->sym_ptr_ptr)->KEEPIT;

        }
     }
   else
        }
     }
   else


@@ -255,7 +274,7 @@ NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr)
 
 
   /* now the fun stuff */
 
 
   /* now the fun stuff */

-  if (abfd->xvec->header_byteorder_big_p != false)
+  if (bfd_header_big_endian (abfd))

     {
       natptr->r_index[0] = r_index >> 16;
       natptr->r_index[1] = r_index >> 8;
     {
       natptr->r_index[0] = r_index >> 16;
       natptr->r_index[1] = r_index >> 8;


@@ -325,7 +344,7 @@ NAME(lynx,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
      struct reloc_ext_external *bytes;
      arelent *cache_ptr;
      asymbol **symbols;
      struct reloc_ext_external *bytes;
      arelent *cache_ptr;
      asymbol **symbols;

-     bfd_size_type symcount;
+     bfd_size_type symcount ATTRIBUTE_UNUSED;

 {
   int r_index;
   int r_extern;
 {
   int r_index;
   int r_extern;


@@ -349,7 +368,7 @@ NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
      struct reloc_std_external *bytes;
      arelent *cache_ptr;
      asymbol **symbols;
      struct reloc_std_external *bytes;
      arelent *cache_ptr;
      asymbol **symbols;

-     bfd_size_type symcount;
+     bfd_size_type symcount ATTRIBUTE_UNUSED;

 {
   int r_index;
   int r_extern;
 {
   int r_index;
   int r_extern;


@@ -358,7 +377,7 @@ NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
   int r_baserel, r_jmptable, r_relative;
   struct aoutdata *su = &(abfd->tdata.aout_data->a);
 
   int r_baserel, r_jmptable, r_relative;
   struct aoutdata *su = &(abfd->tdata.aout_data->a);
 

-  cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
+  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);

 
   r_index = bytes->r_index[1];
   r_extern = (0 != (bytes->r_index[0] & RELOC_STD_BITS_EXTERN_BIG));
 
   r_index = bytes->r_index[1];
   r_extern = (0 != (bytes->r_index[0] & RELOC_STD_BITS_EXTERN_BIG));


@@ -377,23 +396,23 @@ NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
 
 /* Reloc hackery */
 
 
 /* Reloc hackery */
 

-boolean
+bfd_boolean

 NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
      bfd *abfd;
      sec_ptr asect;
      asymbol **symbols;
 {
 NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
      bfd *abfd;
      sec_ptr asect;
      asymbol **symbols;
 {

-  unsigned int count;
+  bfd_size_type count;

   bfd_size_type reloc_size;
   PTR relocs;
   arelent *reloc_cache;
   size_t each_size;
 
   if (asect->relocation)
   bfd_size_type reloc_size;
   PTR relocs;
   arelent *reloc_cache;
   size_t each_size;
 
   if (asect->relocation)

-    return true;
+    return TRUE;

 
   if (asect->flags & SEC_CONSTRUCTOR)
 
   if (asect->flags & SEC_CONSTRUCTOR)

-    return true;
+    return TRUE;

 
   if (asect == obj_datasec (abfd))
     {
 
   if (asect == obj_datasec (abfd))
     {


@@ -408,36 +427,32 @@ NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
     }
 
   bfd_set_error (bfd_error_invalid_operation);
     }
 
   bfd_set_error (bfd_error_invalid_operation);

-  return false;
+  return FALSE;

 
 doit:
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
 
 doit:
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)

-    return false;
+    return FALSE;

   each_size = obj_reloc_entry_size (abfd);
 
   count = reloc_size / each_size;
 
 
   each_size = obj_reloc_entry_size (abfd);
 
   count = reloc_size / each_size;
 
 

-  reloc_cache = (arelent *) malloc (count * sizeof (arelent));
+  reloc_cache = (arelent *) bfd_zmalloc (count * sizeof (arelent));

   if (!reloc_cache && count != 0)
   if (!reloc_cache && count != 0)

-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  memset (reloc_cache, 0, count * sizeof (arelent));
+    return FALSE;

 
   relocs = (PTR) bfd_alloc (abfd, reloc_size);
   if (!relocs && reloc_size != 0)
     {
       free (reloc_cache);
 
   relocs = (PTR) bfd_alloc (abfd, reloc_size);
   if (!relocs && reloc_size != 0)
     {
       free (reloc_cache);

-      return false;
+      return FALSE;

     }
 
     }
 

-  if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size)
+  if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)

     {
       bfd_release (abfd, relocs);
       free (reloc_cache);
     {
       bfd_release (abfd, relocs);
       free (reloc_cache);

-      return false;
+      return FALSE;

     }
 
   if (each_size == RELOC_EXT_SIZE)
     }
 
   if (each_size == RELOC_EXT_SIZE)


@@ -449,7 +464,7 @@ doit:
       for (; counter < count; counter++, rptr++, cache_ptr++)
        {
          NAME(lynx,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols,
       for (; counter < count; counter++, rptr++, cache_ptr++)
        {
          NAME(lynx,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols,

-                                       bfd_get_symcount (abfd));
+                                       (bfd_size_type) bfd_get_symcount (abfd));

        }
     }
   else
        }
     }
   else


@@ -461,7 +476,7 @@ doit:
       for (; counter < count; counter++, rptr++, cache_ptr++)
        {
          NAME(lynx,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,
       for (; counter < count; counter++, rptr++, cache_ptr++)
        {
          NAME(lynx,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,

-                                       bfd_get_symcount (abfd));
+                                       (bfd_size_type) bfd_get_symcount (abfd));

        }
 
     }
        }
 
     }


@@ -469,14 +484,14 @@ doit:
   bfd_release (abfd, relocs);
   asect->relocation = reloc_cache;
   asect->reloc_count = count;
   bfd_release (abfd, relocs);
   asect->relocation = reloc_cache;
   asect->reloc_count = count;

-  return true;
+  return TRUE;

 }
 
 
 
 /* Write out a relocation section into an object file.  */
 
 }
 
 
 
 /* Write out a relocation section into an object file.  */
 

-boolean
+bfd_boolean

 NAME(lynx,squirt_out_relocs) (abfd, section)
      bfd *abfd;
      asection *section;
 NAME(lynx,squirt_out_relocs) (abfd, section)
      bfd *abfd;
      asection *section;


@@ -486,16 +501,17 @@ NAME(lynx,squirt_out_relocs) (abfd, section)
   size_t each_size;
 
   unsigned int count = section->reloc_count;
   size_t each_size;
 
   unsigned int count = section->reloc_count;

-  size_t natsize;
+  bfd_size_type natsize;

 
   if (count == 0)
 
   if (count == 0)

-    return true;
+    return TRUE;

 
   each_size = obj_reloc_entry_size (abfd);
 
   each_size = obj_reloc_entry_size (abfd);

-  natsize = each_size * count;
+  natsize = count;
+  natsize *= each_size;

   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)
   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)

-    return false;
+    return FALSE;

 
   generic = section->orelocation;
 
 
   generic = section->orelocation;
 


@@ -514,14 +530,14 @@ NAME(lynx,squirt_out_relocs) (abfd, section)
        NAME(lynx,swap_std_reloc_out) (abfd, *generic, (struct reloc_std_external *) natptr);
     }
 
        NAME(lynx,swap_std_reloc_out) (abfd, *generic, (struct reloc_std_external *) natptr);
     }
 

-  if (bfd_write ((PTR) native, 1, natsize, abfd) != natsize)
+  if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)

     {
       bfd_release (abfd, native);
     {
       bfd_release (abfd, native);

-      return false;
+      return FALSE;

     }
   bfd_release (abfd, native);
 
     }
   bfd_release (abfd, native);
 

-  return true;
+  return TRUE;

 }
 
 /* This is stupid.  This function should be a boolean predicate */
 }
 
 /* This is stupid.  This function should be a boolean predicate */