* hppa-tdep.c (hppa_pointer_to_address_hack): Remove function.

[deliverable/binutils-gdb.git] / gas / config / tc-mips.c

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 9eae5e39604e606c55ca28f69d405036027a7dd9..9dd9f12744b46019de57696831ea8b97466c3305 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -3558,7 +3558,7 @@ load_register (int reg, expressionS *ep, int dbl)
       char value[32];
 
       sprintf_vma (value, ep->X_add_number);
-      as_bad (_("Number (%s) larger than 32 bits"), value);
+      as_bad (_("Number (0x%s) larger than 32 bits"), value);
       macro_build (ep, "addiu", "t,r,j", reg, 0, BFD_RELOC_LO16);
       return;
     }
@@ -5805,7 +5805,7 @@ macro (struct mips_cl_insn *ip)
          char value [32];
 
          sprintf_vma (value, offset_expr.X_add_number);
-         as_bad (_("Number (%s) larger than 32 bits"), value);
+         as_bad (_("Number (0x%s) larger than 32 bits"), value);
        }
 
       /* A constant expression in PIC code can be handled just as it
@@ -6399,7 +6399,7 @@ macro (struct mips_cl_insn *ip)
          char value [32];
 
          sprintf_vma (value, offset_expr.X_add_number);
-         as_bad (_("Number (%s) larger than 32 bits"), value);
+         as_bad (_("Number (0x%s) larger than 32 bits"), value);
        }
 
       /* Even on a big endian machine $fn comes before $fn+1.  We have
@@ -10696,7 +10696,7 @@ mips_frob_file_before_adjust (void)
 }
 
 /* Sort any unmatched HI16 and GOT16 relocs so that they immediately precede
-   the corresponding LO16 reloc.  This is called before md_apply_fix3 and
+   the corresponding LO16 reloc.  This is called before md_apply_fix and
    tc_gen_reloc.  Unmatched relocs can only be generated by use of explicit
    relocation operators.
 
@@ -10915,7 +10915,7 @@ mips_validate_fix (struct fix *fixP, asection *seg)
 /* Apply a fixup to the object file.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   bfd_byte *buf;
   long insn;
@@ -13778,6 +13778,13 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "4km",            0,      ISA_MIPS32,     CPU_MIPS32 },
   { "4kp",            0,      ISA_MIPS32,     CPU_MIPS32 },
 
+  /* MIPS32 Release 2 */
+  { "m4k",            0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24k",            0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24kc",           0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24kf",           0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24kx",           0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+
   /* MIPS 64 */
   { "5kc",            0,      ISA_MIPS64,     CPU_MIPS64 },
   { "20kc",           0,      ISA_MIPS64,     CPU_MIPS64 },