merge from gcc

[deliverable/binutils-gdb.git] / bfd / sunos.c

diff --git a/bfd/sunos.c b/bfd/sunos.c
index ada68572386767db973f6cac65e17a26c3ca0632..f4ada70a47d0a100bd0b85244505d19eb64412b6 100644 (file)
--- a/bfd/sunos.c
+++ b/bfd/sunos.c
@@ -1,5 +1,5 @@
 /* BFD backend for SunOS binaries.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -508,7 +508,7 @@ sunos_canonicalize_dynamic_reloc (abfd, storage, syms)
                                            * sizeof (arelent))));
       if (info->canonical_dynrel == NULL && info->dynrel_count != 0)
        return -1;
-      
+
       to = info->canonical_dynrel;
 
       if (obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE)
@@ -1421,7 +1421,7 @@ bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
       s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
        return false;
-      
+
       /* The number of buckets is just the number of symbols divided
         by four.  To compute the final size of the hash table, we
         must actually compute the hash table.  Normally we need
@@ -2274,16 +2274,16 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
              PUT_WORD (output_bfd, r_address, srel->r_address);
              if (bfd_header_big_endian (output_bfd))
                {
-                 srel->r_index[0] = (bfd_byte)(h->dynindx >> 16);
-                 srel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
-                 srel->r_index[2] = (bfd_byte)(h->dynindx);
+                 srel->r_index[0] = (bfd_byte) (h->dynindx >> 16);
+                 srel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
+                 srel->r_index[2] = (bfd_byte) (h->dynindx);
                  srel->r_type[0] = (RELOC_STD_BITS_EXTERN_BIG
                                     | RELOC_STD_BITS_JMPTABLE_BIG);
                }
              else
                {
-                 srel->r_index[2] = (bfd_byte)(h->dynindx >> 16);
-                 srel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
+                 srel->r_index[2] = (bfd_byte) (h->dynindx >> 16);
+                 srel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
                  srel->r_index[0] = (bfd_byte)h->dynindx;
                  srel->r_type[0] = (RELOC_STD_BITS_EXTERN_LITTLE
                                     | RELOC_STD_BITS_JMPTABLE_LITTLE);
@@ -2297,8 +2297,8 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
              PUT_WORD (output_bfd, r_address, erel->r_address);
              if (bfd_header_big_endian (output_bfd))
                {
-                 erel->r_index[0] = (bfd_byte)(h->dynindx >> 16);
-                 erel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
+                 erel->r_index[0] = (bfd_byte) (h->dynindx >> 16);
+                 erel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
                  erel->r_index[2] = (bfd_byte)h->dynindx;
                  erel->r_type[0] =
                    (RELOC_EXT_BITS_EXTERN_BIG
@@ -2306,8 +2306,8 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
                }
              else
                {
-                 erel->r_index[2] = (bfd_byte)(h->dynindx >> 16);
-                 erel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
+                 erel->r_index[2] = (bfd_byte) (h->dynindx >> 16);
+                 erel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
                  erel->r_index[0] = (bfd_byte)h->dynindx;
                  erel->r_type[0] =
                    (RELOC_EXT_BITS_EXTERN_LITTLE
@@ -2594,8 +2594,8 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                            srel->r_address);
                  if (bfd_header_big_endian (dynobj))
                    {
-                     srel->r_index[0] = (bfd_byte)(indx >> 16);
-                     srel->r_index[1] = (bfd_byte)(indx >> 8);
+                     srel->r_index[0] = (bfd_byte) (indx >> 16);
+                     srel->r_index[1] = (bfd_byte) (indx >> 8);
                      srel->r_index[2] = (bfd_byte)indx;
                      if (h == NULL)
                        srel->r_type[0] = 2 << RELOC_STD_BITS_LENGTH_SH_BIG;
@@ -2608,8 +2608,8 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                    }
                  else
                    {
-                     srel->r_index[2] = (bfd_byte)(indx >> 16);
-                     srel->r_index[1] = (bfd_byte)(indx >> 8);
+                     srel->r_index[2] = (bfd_byte) (indx >> 16);
+                     srel->r_index[1] = (bfd_byte) (indx >> 8);
                      srel->r_index[0] = (bfd_byte)indx;
                      if (h == NULL)
                        srel->r_type[0] = 2 << RELOC_STD_BITS_LENGTH_SH_LITTLE;
@@ -2633,8 +2633,8 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                            erel->r_address);
                  if (bfd_header_big_endian (dynobj))
                    {
-                     erel->r_index[0] = (bfd_byte)(indx >> 16);
-                     erel->r_index[1] = (bfd_byte)(indx >> 8);
+                     erel->r_index[0] = (bfd_byte) (indx >> 16);
+                     erel->r_index[1] = (bfd_byte) (indx >> 8);
                      erel->r_index[2] = (bfd_byte)indx;
                      if (h == NULL)
                        erel->r_type[0] =
@@ -2646,8 +2646,8 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                    }
                  else
                    {
-                     erel->r_index[2] = (bfd_byte)(indx >> 16);
-                     erel->r_index[1] = (bfd_byte)(indx >> 8);
+                     erel->r_index[2] = (bfd_byte) (indx >> 16);
+                     erel->r_index[1] = (bfd_byte) (indx >> 8);
                      erel->r_index[0] = (bfd_byte)indx;
                      if (h == NULL)
                        erel->r_type[0] =
@@ -2726,14 +2726,14 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                srel->r_address);
       if (bfd_header_big_endian (dynobj))
        {
-         srel->r_index[0] = (bfd_byte)(indx >> 16);
-         srel->r_index[1] = (bfd_byte)(indx >> 8);
+         srel->r_index[0] = (bfd_byte) (indx >> 16);
+         srel->r_index[1] = (bfd_byte) (indx >> 8);
          srel->r_index[2] = (bfd_byte)indx;
        }
       else
        {
-         srel->r_index[2] = (bfd_byte)(indx >> 16);
-         srel->r_index[1] = (bfd_byte)(indx >> 8);
+         srel->r_index[2] = (bfd_byte) (indx >> 16);
+         srel->r_index[1] = (bfd_byte) (indx >> 8);
          srel->r_index[0] = (bfd_byte)indx;
        }
       /* FIXME: We may have to change the addend for a PC relative
@@ -2751,14 +2751,14 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                erel->r_address);
       if (bfd_header_big_endian (dynobj))
        {
-         erel->r_index[0] = (bfd_byte)(indx >> 16);
-         erel->r_index[1] = (bfd_byte)(indx >> 8);
+         erel->r_index[0] = (bfd_byte) (indx >> 16);
+         erel->r_index[1] = (bfd_byte) (indx >> 8);
          erel->r_index[2] = (bfd_byte)indx;
        }
       else
        {
-         erel->r_index[2] = (bfd_byte)(indx >> 16);
-         erel->r_index[1] = (bfd_byte)(indx >> 8);
+         erel->r_index[2] = (bfd_byte) (indx >> 16);
+         erel->r_index[1] = (bfd_byte) (indx >> 8);
          erel->r_index[0] = (bfd_byte)indx;
        }
       if (pcrel && h != NULL)
@@ -2933,7 +2933,7 @@ sunos_finish_dynamic_link (abfd, info)
       PUT_WORD (dynobj,
                BFD_ALIGN (obj_textsec (abfd)->_raw_size, 0x2000),
                esdl.ld_text);
-  
+
       if (! bfd_set_section_contents (abfd, sdyn->output_section, &esdl,
                                      (sdyn->output_offset
                                       + sizeof esd