* elf64-mips.c (UNUSED_RELOC): Define.

	(mips_elf64_howto_table_rel): Use it.
	(mips_elf64_howto_table_rela): Here too.
	(mips_elf64_write_relocs): Fix signed/unsigned warning.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 839b7801ef3214f0f18900c28a9d763224010ac4..6f150a4f98fea656d715c7b8bc0806fedf147ed8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
 2001-08-17  Alan Modra  <amodra@bigpond.net.au>
 
+       * elf64-mips.c (UNUSED_RELOC): Define.
+       (mips_elf64_howto_table_rel): Use it.
+       (mips_elf64_howto_table_rela): Here too.
+       (mips_elf64_write_relocs): Fix signed/unsigned warning.
+
        * coffcode.h (coff_write_object_contents): Add ATTRIBUTE_UNUSED to
        silence warning.
        * coffgen.c (coff_print_symbol): Fix warnings.

diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index f1ab7b11bd42ac2823b14378155d5961872f1705..0642babf02891d2491d09dfa12d73ff44e874f61 100644 (file)
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -90,6 +90,8 @@ static boolean mips_elf64_write_armap
 
 /* The relocation table used for SHT_REL sections.  */
 
+#define UNUSED_RELOC(num) { num, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+
 static reloc_howto_type mips_elf64_howto_table_rel[] =
 {
   /* No relocation.  */
@@ -291,9 +293,9 @@ static reloc_howto_type mips_elf64_howto_table_rel[] =
         0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
 
-    { 13 },
-    { 14 },
-    { 15 },
+  UNUSED_RELOC (13),
+  UNUSED_RELOC (14),
+  UNUSED_RELOC (15),
 
   /* A 5 bit shift field.  */
   HOWTO (R_MIPS_SHIFT5,                /* type */
@@ -845,9 +847,9 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
         0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
 
-    { 13 },
-    { 14 },
-    { 15 },
+  UNUSED_RELOC (13),
+  UNUSED_RELOC (14),
+  UNUSED_RELOC (15),
 
   /* A 5 bit shift field.  */
   HOWTO (R_MIPS_SHIFT5,                /* type */
@@ -1813,7 +1815,7 @@ mips_elf64_write_relocs (abfd, sec, data)
     }
 
   BFD_ASSERT (ext_rela - (Elf64_Mips_External_Rela *) rela_hdr->contents
-             == count);
+             == (int) count);
 }
 \f
 /* Irix 6 defines a brand new archive map format, so that they can