* mips.h (INSN_CHIP_MASK): Update according to INSN_LOONGSON_3A.

	(INSN_LOONGSON_3A): Clear bit 31.

	* elfxx-mips.c (mips_set_isa_flags): Move bfd_mach_loongson_3a
	after bfd_mach_mips_sb1.

	* config/tc-mips.c (mips_cpu_info_table): Move loongson3a after sb1.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8839ea0f7f55ae6efae8b4545886bf3dceb35cae..99ada02a16c4c3a47b38562abe3895b0f5475dab 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-23  Mingming Sun  <mingm.sun@gmail.com>
+
+       * elfxx-mips.c (mips_set_isa_flags): Move bfd_mach_loongson_3a
+       after bfd_mach_mips_sb1.
+
 2010-11-17  Tristan Gingold  <gingold@adacore.com>
 
        * vms-lib.c (vms_write_index): Add comments.

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index cfbb06e7a195c255fd7a90a1c1e751dabb05448f..dcf6a9e7b1132cd43b9097c76195934384bf0a52 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -10559,14 +10559,14 @@ mips_set_isa_flags (bfd *abfd)
       val = E_MIPS_ARCH_3 | E_MIPS_MACH_LS2F;
       break;
 
-    case bfd_mach_mips_loongson_3a:
-      val = E_MIPS_ARCH_64 | E_MIPS_MACH_LS3A;
-      break;
-
     case bfd_mach_mips_sb1:
       val = E_MIPS_ARCH_64 | E_MIPS_MACH_SB1;
       break;
 
+    case bfd_mach_mips_loongson_3a:
+      val = E_MIPS_ARCH_64 | E_MIPS_MACH_LS3A;
+      break;
+
     case bfd_mach_mips_octeon:
       val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON;
       break;

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7b00c40a2cac094d719a2f388742b01d45f08a23..b5e005a5827c876b20b9e644aa021feb0978ca0d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,6 +1,10 @@
+2010-11-23  Mingming Sun  <mingm.sun@gmail.com>
+
+       * config/tc-mips.c (mips_cpu_info_table): Move loongson3a after sb1.
+
 2010-11-23  H.J. Lu  <hongjiu.lu@intel.com>
 
-       * doc/as.texinfo: Refer to and include c-i386.texi for i386 
+       * doc/as.texinfo: Refer to and include c-i386.texi for i386
        options.
 
        * doc/c-i386.texi: Add markup for use in manpage generation.

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 77397bb01bdbe8de220d36821108dad2f78c6b72..ac02aee7f3fab5c99fb7f068dc83d283def8e558 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -15358,7 +15358,6 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "5kf",            0,                       ISA_MIPS64,     CPU_MIPS64 },
   { "20kc",           MIPS_CPU_ASE_MIPS3D,     ISA_MIPS64,     CPU_MIPS64 },
   { "25kf",           MIPS_CPU_ASE_MIPS3D,     ISA_MIPS64,     CPU_MIPS64 },
-  { "loongson3a",     0,                       ISA_MIPS64,     CPU_LOONGSON_3A },
 
   /* Broadcom SB-1 CPU core */
   { "sb1",            MIPS_CPU_ASE_MIPS3D | MIPS_CPU_ASE_MDMX,
@@ -15366,6 +15365,8 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   /* Broadcom SB-1A CPU core */
   { "sb1a",           MIPS_CPU_ASE_MIPS3D | MIPS_CPU_ASE_MDMX,
                                                ISA_MIPS64,     CPU_SB1 },
+  
+  { "loongson3a",     0,                       ISA_MIPS64,     CPU_LOONGSON_3A },
 
   /* MIPS 64 Release 2 */
 

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 197220d0914853c7d94b41b914a4b4b5b9284672..8ea9b98b993af70b27287bfb7303c15a693b509a 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-23  Maciej W. Rozycki  <macro@linux-mips.org>
+
+       * mips.h (INSN_CHIP_MASK): Update according to INSN_LOONGSON_3A.
+       (INSN_LOONGSON_3A): Clear bit 31.
+
 2010-11-15  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
        PR gas/12198

diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index 8817ce302bb094e8f01dba22f3644ce26054acd7..af9ad2154b97cdb359943bf458c19f2752fc3226 100644 (file)
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -544,7 +544,7 @@ static const unsigned int mips_isa_table[] =
   { 0x0001, 0x0003, 0x0607, 0x1e0f, 0x3e1f, 0x0a23, 0x3e63, 0x3ebf, 0x3fff };
 
 /* Masks used for Chip specific instructions.  */
-#define INSN_CHIP_MASK           0xc3ff0820
+#define INSN_CHIP_MASK           0xc3ff0c20
 
 /* Cavium Networks Octeon instructions.  */
 #define INSN_OCTEON              0x00000800
@@ -593,7 +593,7 @@ static const unsigned int mips_isa_table[] =
 /* ST Microelectronics Loongson 2E.  */
 #define INSN_LOONGSON_2E          0x40000000
 /* ST Microelectronics Loongson 2F.  */
-#define INSN_LOONGSON_2F          0x80000000
+#define INSN_LOONGSON_3A          0x00000400
 /* Loongson 3A.  */
 #define INSN_LOONGSON_3A          0x80000400
 /* RMI Xlr instruction */