2001-09-11 H.J. Lu <hjl@gnu.org>

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

diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c
index dd7ace5ecdd3f545eb46b4b944aa30cfd93dece4..805824a05e8d11d7d1908f8df73ce6a9c0a01090 100644 (file)
--- a/bfd/coff-mips.c
+++ b/bfd/coff-mips.c
@@ -1,5 +1,6 @@
 /* BFD back-end for MIPS Extended-Coff files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001
    Free Software Foundation, Inc.
    Original version by Per Bothner.
    Full support added by Ian Lance Taylor, ian@cygnus.com.
@@ -115,7 +116,6 @@ static boolean mips_relax_pcrel16 PARAMS ((struct bfd_link_info *, bfd *,
                                           bfd_byte *, bfd_vma));
 static reloc_howto_type *mips_bfd_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-
 \f
 /* ECOFF has COFF sections, but the debugging information is stored in
    a completely different format.  ECOFF targets use some of the
@@ -1100,7 +1100,6 @@ mips_rello_reloc (abfd,
    requires special handling when relaxing.  We don't want
    bfd_perform_relocation to tamper with it at all.  */
 
-/*ARGSUSED*/
 static bfd_reloc_status_type
 mips_switch_reloc (abfd,
                   reloc_entry,
@@ -1195,7 +1194,7 @@ mips_relocate_hi (refhi, reflo, input_bfd, input_section, contents, adjust,
 
   if (refhi == NULL)
     return;
-  
+
   insn = bfd_get_32 (input_bfd,
                     contents + adjust + refhi->r_vaddr - input_section->vma);
   if (reflo == NULL)
@@ -1204,7 +1203,7 @@ mips_relocate_hi (refhi, reflo, input_bfd, input_section, contents, adjust,
     vallo = (bfd_get_32 (input_bfd,
                         contents + adjust + reflo->r_vaddr - input_section->vma)
             & 0xffff);
- 
+
   val = ((insn & 0xffff) << 16) + vallo;
   val += relocation;
 
@@ -1505,7 +1504,7 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
              memmove (here + PCREL16_EXPANSION_ADJUSTMENT, here,
                       (size_t) (input_section->_raw_size
                                 - (int_rel.r_vaddr - input_section->vma)));
-                      
+
              /* Generate the new instructions.  */
              if (! mips_relax_pcrel16 (info, input_bfd, input_section,
                                        h, here,
@@ -1626,7 +1625,7 @@ mips_relocate_section (output_bfd, info, input_bfd, input_section,
                        int_rel.r_symndx = RELOC_SECTION_TEXT;
                      break;
                    }
-                     
+
                  if (int_rel.r_symndx == -1)
                    abort ();
 
@@ -2104,7 +2103,7 @@ mips_relax_section (abfd, sec, info, again)
         somebody felt it were important.  Ignoring this reloc will
         presumably cause a reloc overflow error later on.  */
       if (bfd_get_32 (abfd, contents + int_rel.r_vaddr - sec->vma)
-         != 0x0411ffff) /* bgezal $0,. == bal . */
+         != 0x0411ffff) /* bgezal $0,. == bal .  */
        continue;
 
       /* Bother.  We need to expand this reloc, and we will need to
@@ -2180,7 +2179,7 @@ mips_relax_section (abfd, sec, info, again)
              mips_ecoff_swap_reloc_in (abfd, (PTR) (adj_ext_rel + 1), &rello);
 
              BFD_ASSERT (rello.r_type == MIPS_R_RELLO);
-             
+
              addhi = bfd_get_32 (abfd,
                                   contents + adj_int_rel.r_vaddr - sec->vma);
              addhi &= 0xffff;
@@ -2601,6 +2600,9 @@ static const struct ecoff_backend_data mips_ecoff_backend_data =
 /* GC of sections is not done.  */
 #define _bfd_ecoff_bfd_gc_sections bfd_generic_gc_sections
 
+/* Merging of sections is not done.  */
+#define _bfd_ecoff_bfd_merge_sections bfd_generic_merge_sections
+
 extern const bfd_target ecoff_big_vec;
 
 const bfd_target ecoff_little_vec =
@@ -2643,7 +2645,7 @@ const bfd_target ecoff_little_vec =
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   & ecoff_big_vec,
-  
+
   (PTR) &mips_ecoff_backend_data
 };
 
@@ -2686,7 +2688,7 @@ const bfd_target ecoff_big_vec =
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   & ecoff_little_vec,
-  
+
   (PTR) &mips_ecoff_backend_data
 };
 
@@ -2730,6 +2732,6 @@ const bfd_target ecoff_biglittle_vec =
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   NULL,
-  
+
   (PTR) &mips_ecoff_backend_data
 };