Add MIPS r12k support

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

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 671515f192aa17942d6eae80afd09b233249e31c..15c4f871303c474ee38793cdcf23d236a0700fd9 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -126,7 +126,8 @@ mips_target_format ()
 #ifdef TE_TMIPS
       /* This is traditional mips */
       return (target_big_endian
-             ? "elf32-tradbigmips" : "elf32-tradlittlemips");
+             ? (mips_64 ? "elf64-tradbigmips" : "elf32-tradbigmips")
+             : (mips_64 ? "elf64-tradlittlemips" : "elf32-tradlittlemips"));
 #else
       return (target_big_endian
              ? (mips_64 ? "elf64-bigmips" : "elf32-bigmips")
@@ -240,7 +241,7 @@ static int mips_gp32 = 0;
    (ISA) == ISA_MIPS3                \
    || (ISA) == ISA_MIPS4             \
    || (ISA) == ISA_MIPS5             \
-   || (ISA) == ISA_MIPS32            \
+   || (ISA) == ISA_MIPS64            \
    )
 
 /* Whether the processor uses hardware interlocks to protect
@@ -9139,7 +9140,9 @@ md_parse_option (c, arg)
        list = bfd_target_list ();
        for (l = list; *l != NULL; l++)
          if (strcmp (*l, "elf64-bigmips") == 0
-             || strcmp (*l, "elf64-littlemips") == 0)
+             || strcmp (*l, "elf64-littlemips") == 0
+             || strcmp (*l, "elf64-tradbigmips") == 0
+             || strcmp (*l, "elf64-tradlittlemips") == 0)
            break;
        if (*l == NULL)
          as_fatal (_("No compiled in support for 64 bit object file format"));
@@ -9270,6 +9273,7 @@ MIPS options:\n\
   show (stream, "6000", &column, &first);
   show (stream, "8000", &column, &first);
   show (stream, "10000", &column, &first);
+  show (stream, "12000", &column, &first);
   show (stream, "mips32-4k", &column, &first);
   show (stream, "sb-1", &column, &first);
   fputc ('\n', stream);
@@ -11353,7 +11357,7 @@ md_convert_frag (abfd, asec, fragp)
          ext = false;
        }
 
-      resolve_symbol_value (fragp->fr_symbol, 1);
+      resolve_symbol_value (fragp->fr_symbol);
       val = S_GET_VALUE (fragp->fr_symbol);
       if (op->pcrel)
        {
@@ -12035,6 +12039,12 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "10k",            0,      ISA_MIPS4,      CPU_R10000, },
   { "r10k",           0,      ISA_MIPS4,      CPU_R10000, },
 
+  /* R12000 CPU */
+  { "R12000",         0,      ISA_MIPS4,      CPU_R12000, },
+  { "12000",          0,      ISA_MIPS4,      CPU_R12000, },
+  { "12k",            0,      ISA_MIPS4,      CPU_R12000, },
+  { "r12k",           0,      ISA_MIPS4,      CPU_R12000, },
+
   /* VR4100 CPU */
   { "VR4100",         0,      ISA_MIPS3,      CPU_VR4100, },
   { "4100",           0,      ISA_MIPS3,      CPU_VR4100, },