2012-02-25 Catherine Moore <clm@codesourcery.com>

	Revert microMIPS patch.

From-SVN: r196259

12 files changed, 259 insertions, 1067 deletions

diff --git a/gcc/config/mips/constraints.md b/gcc/config/mips/constraints.md
index 31f01d3..71ec938 100644
--- a/gcc/config/mips/constraints.md
+++ b/gcc/config/mips/constraints.md
@@ -232,27 +232,6 @@
    "@internal"
    (match_operand 0 "low_bitmask_operand"))
 
-(define_memory_constraint "ZC"
-  "When compiling microMIPS code, this constraint matches a memory operand
-   whose address is formed from a base register and a 12-bit offset.  These
-   operands can be used for microMIPS instructions such as @code{ll} and
-   @code{sc}.  When not compiling for microMIPS code, @code{ZC} is
-   equivalent to @code{R}."
-  (and (match_code "mem")
-       (if_then_else
-	 (match_test "TARGET_MICROMIPS")
-	 (match_test "umips_12bit_offset_address_p (XEXP (op, 0), mode)")
-	 (match_test "mips_address_insns (XEXP (op, 0), mode, false)"))))
-
-(define_address_constraint "ZD"
-  "When compiling microMIPS code, this constraint matches an address operand
-   that is formed from a base register and a 12-bit offset.  These operands
-   can be used for microMIPS instructions such as @code{prefetch}.  When
-   not compiling for microMIPS code, @code{ZD} is equivalent to @code{p}."
-   (if_then_else (match_test "TARGET_MICROMIPS")
-		 (match_test "umips_12bit_offset_address_p (op, mode)")
-		 (match_test "mips_address_insns (op, mode, false)")))
-
 (define_memory_constraint "ZR"
  "@internal
   An address valid for loading/storing register exclusive"
diff --git a/gcc/config/mips/micromips.md b/gcc/config/mips/micromips.md
index 4b7a4a7..e69de29 100644
--- a/gcc/config/mips/micromips.md
+++ b/gcc/config/mips/micromips.md
@@ -1,125 +0,0 @@
-;; Copyright (C) 2013 Free Software Foundation, Inc.
-;;
-;; micromips.md   Machine Description for the microMIPS instruction set
-;; This file is part of GCC.
-
-;; GCC is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 3, or (at your
-;; option) any later version.
-
-;; GCC is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GCC; see the file COPYING3.  If not see
-;; <http://www.gnu.org/licenses/>.
-
-(define_insn "*store_word_multiple"
-  [(match_parallel 0 ""
-       [(set (match_operand:SI 1 "memory_operand")
-	     (match_operand:SI 2 "register_operand"))])]
-  "TARGET_MICROMIPS
-   && umips_save_restore_pattern_p (true, operands[0])"
-  { return umips_output_save_restore (true, operands[0]); }
-  [(set_attr "type" "multimem")
-   (set_attr "mode" "SI")
-   (set_attr "can_delay" "no")])
-
-(define_insn "*load_word_multiple"
-  [(match_parallel 0 ""
-       [(set (match_operand:SI 1 "register_operand")
-	     (match_operand:SI 2 "memory_operand"))])]
-  "TARGET_MICROMIPS
-   && umips_save_restore_pattern_p (false, operands[0])"
-  { return umips_output_save_restore (false, operands[0]); }
-  [(set_attr "type" "multimem")
-   (set_attr "mode" "SI")
-   (set_attr "can_delay" "no")])
-
-;; For LWP.
-(define_peephole2
-  [(set (match_operand:SI 0 "d_operand" "")
-        (match_operand:SI 1 "non_volatile_mem_operand" ""))
-   (set (match_operand:SI 2 "d_operand" "")
-        (match_operand:SI 3 "non_volatile_mem_operand" ""))]
-  "TARGET_MICROMIPS
-   && umips_load_store_pair_p (true, operands)"
-  [(parallel [(set (match_dup 0) (match_dup 1))
-              (set (match_dup 2) (match_dup 3))])])
-
-;; The behavior of the LWP insn is undefined if placed in a delay slot.
-(define_insn "*lwp"
-  [(parallel [(set (match_operand:SI 0 "d_operand")
-		   (match_operand:SI 1 "non_volatile_mem_operand"))
-	      (set (match_operand:SI 2 "d_operand")
-		   (match_operand:SI 3 "non_volatile_mem_operand"))])]
-
-  "TARGET_MICROMIPS
-   && umips_load_store_pair_p (true, operands)"
-{
-  umips_output_load_store_pair (true, operands);
-  return "";
-}
-  [(set_attr "type" "load")
-   (set_attr "mode" "SI")
-   (set_attr "can_delay" "no")])
-
-;; For SWP.
-(define_peephole2
-  [(set (match_operand:SI 0 "non_volatile_mem_operand" "")
-        (match_operand:SI 1 "d_operand" ""))
-   (set (match_operand:SI 2 "non_volatile_mem_operand" "")
-        (match_operand:SI 3 "d_operand" ""))]
-  "TARGET_MICROMIPS
-   && umips_load_store_pair_p (false, operands)"
-  [(parallel [(set (match_dup 0) (match_dup 1))
-              (set (match_dup 2) (match_dup 3))])])
-
-;; The behavior of the SWP insn is undefined if placed in a delay slot.
-(define_insn "*swp"
-  [(parallel [(set (match_operand:SI 0 "non_volatile_mem_operand")
-		   (match_operand:SI 1 "d_operand"))
-	      (set (match_operand:SI 2 "non_volatile_mem_operand")
-		   (match_operand:SI 3 "d_operand"))])]
-
-  "TARGET_MICROMIPS
-   && umips_load_store_pair_p (false, operands)"
-{
-  umips_output_load_store_pair (false, operands);
-  return "";
-}
-  [(set_attr "type" "store")
-   (set_attr "mode" "SI")
-   (set_attr "can_delay" "no")])
-
-;; For MOVEP.
-(define_peephole2
-  [(set (match_operand:MOVEP1 0 "register_operand" "")
-        (match_operand:MOVEP1 1 "movep_src_operand" ""))
-   (set (match_operand:MOVEP2 2 "register_operand" "")
-        (match_operand:MOVEP2 3 "movep_src_operand" ""))]
-  "TARGET_MICROMIPS
-   && umips_movep_target_p (operands[0], operands[2])"
-  [(parallel [(set (match_dup 0) (match_dup 1))
-              (set (match_dup 2) (match_dup 3))])])
-
-;; The behavior of the MOVEP insn is undefined if placed in a delay slot.
-(define_insn "*movep<MOVEP1:mode><MOVEP2:mode>"
-  [(parallel [(set (match_operand:MOVEP1 0 "register_operand")
-		   (match_operand:MOVEP1 1 "movep_src_operand"))
-	      (set (match_operand:MOVEP2 2 "register_operand")
-		   (match_operand:MOVEP2 3 "movep_src_operand"))])]
-  "TARGET_MICROMIPS
-   && umips_movep_target_p (operands[0], operands[2])"
-{
-  if (REGNO (operands[0]) < REGNO (operands[2]))
-    return "movep\t%0,%2,%z1,%z3";
-  else
-    return "movep\t%2,%0,%z3,%z1";
-}
-  [(set_attr "type" "move")
-   (set_attr "mode" "<MODE>")
-   (set_attr "can_delay" "no")])
diff --git a/gcc/config/mips/mips-cpus.def b/gcc/config/mips/mips-cpus.def
index 1cc1999..93c305a 100644
--- a/gcc/config/mips/mips-cpus.def
+++ b/gcc/config/mips/mips-cpus.def
@@ -92,8 +92,6 @@ MIPS_CPU ("4ksc", PROCESSOR_4KC, 32, 0)
 
 /* MIPS32 Release 2 processors.  */
 MIPS_CPU ("m4k", PROCESSOR_M4K, 33, 0)
-MIPS_CPU ("m14kc", PROCESSOR_M4K, 33, 0)
-MIPS_CPU ("m14k", PROCESSOR_M4K, 33, 0)
 MIPS_CPU ("4kec", PROCESSOR_4KC, 33, 0)
 MIPS_CPU ("4kem", PROCESSOR_4KC, 33, 0)
 MIPS_CPU ("4kep", PROCESSOR_4KP, 33, 0)
diff --git a/gcc/config/mips/mips-protos.h b/gcc/config/mips/mips-protos.h
index 2d03f5a..8560bb7 100644
--- a/gcc/config/mips/mips-protos.h
+++ b/gcc/config/mips/mips-protos.h
@@ -350,12 +350,6 @@ extern void mips_expand_vec_reduc (rtx, rtx, rtx (*)(rtx, rtx, rtx));
 extern void mips_expand_vec_minmax (rtx, rtx, rtx,
 				    rtx (*) (rtx, rtx, rtx), bool);
 
-extern const char *umips_output_save_restore (bool, rtx);
-extern bool umips_save_restore_pattern_p (bool, rtx);
-extern bool umips_load_store_pair_p (bool, rtx *);
-extern void umips_output_load_store_pair (bool, rtx *);
-extern bool umips_movep_target_p (rtx, rtx);
-extern bool umips_12bit_offset_address_p (rtx, enum machine_mode);
 extern rtx mips_expand_thread_pointer (rtx);
 
 extern bool mips_eh_uses (unsigned int);
diff --git a/gcc/config/mips/mips-tables.opt b/gcc/config/mips/mips-tables.opt
index 0d7fa26..de9a736 100644
--- a/gcc/config/mips/mips-tables.opt
+++ b/gcc/config/mips/mips-tables.opt
@@ -373,260 +373,254 @@ EnumValue
 Enum(mips_arch_opt_value) String(m4k) Value(39) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(m14kc) Value(40) Canonical
+Enum(mips_arch_opt_value) String(4kec) Value(40) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(m14k) Value(41) Canonical
+Enum(mips_arch_opt_value) String(r4kec) Value(40)
 
 EnumValue
-Enum(mips_arch_opt_value) String(4kec) Value(42) Canonical
+Enum(mips_arch_opt_value) String(4kem) Value(41) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r4kec) Value(42)
+Enum(mips_arch_opt_value) String(r4kem) Value(41)
 
 EnumValue
-Enum(mips_arch_opt_value) String(4kem) Value(43) Canonical
+Enum(mips_arch_opt_value) String(4kep) Value(42) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r4kem) Value(43)
+Enum(mips_arch_opt_value) String(r4kep) Value(42)
 
 EnumValue
-Enum(mips_arch_opt_value) String(4kep) Value(44) Canonical
+Enum(mips_arch_opt_value) String(4ksd) Value(43) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r4kep) Value(44)
+Enum(mips_arch_opt_value) String(r4ksd) Value(43)
 
 EnumValue
-Enum(mips_arch_opt_value) String(4ksd) Value(45) Canonical
+Enum(mips_arch_opt_value) String(24kc) Value(44) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r4ksd) Value(45)
+Enum(mips_arch_opt_value) String(r24kc) Value(44)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kc) Value(46) Canonical
+Enum(mips_arch_opt_value) String(24kf2_1) Value(45) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kc) Value(46)
+Enum(mips_arch_opt_value) String(r24kf2_1) Value(45)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kf2_1) Value(47) Canonical
+Enum(mips_arch_opt_value) String(24kf) Value(46) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kf2_1) Value(47)
+Enum(mips_arch_opt_value) String(r24kf) Value(46)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kf) Value(48) Canonical
+Enum(mips_arch_opt_value) String(24kf1_1) Value(47) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kf) Value(48)
+Enum(mips_arch_opt_value) String(r24kf1_1) Value(47)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kf1_1) Value(49) Canonical
+Enum(mips_arch_opt_value) String(24kfx) Value(48) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kf1_1) Value(49)
+Enum(mips_arch_opt_value) String(r24kfx) Value(48)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kfx) Value(50) Canonical
+Enum(mips_arch_opt_value) String(24kx) Value(49) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kfx) Value(50)
+Enum(mips_arch_opt_value) String(r24kx) Value(49)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kx) Value(51) Canonical
+Enum(mips_arch_opt_value) String(24kec) Value(50) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kx) Value(51)
+Enum(mips_arch_opt_value) String(r24kec) Value(50)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kec) Value(52) Canonical
+Enum(mips_arch_opt_value) String(24kef2_1) Value(51) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kec) Value(52)
+Enum(mips_arch_opt_value) String(r24kef2_1) Value(51)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kef2_1) Value(53) Canonical
+Enum(mips_arch_opt_value) String(24kef) Value(52) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kef2_1) Value(53)
+Enum(mips_arch_opt_value) String(r24kef) Value(52)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kef) Value(54) Canonical
+Enum(mips_arch_opt_value) String(24kef1_1) Value(53) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kef) Value(54)
+Enum(mips_arch_opt_value) String(r24kef1_1) Value(53)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kef1_1) Value(55) Canonical
+Enum(mips_arch_opt_value) String(24kefx) Value(54) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kef1_1) Value(55)
+Enum(mips_arch_opt_value) String(r24kefx) Value(54)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kefx) Value(56) Canonical
+Enum(mips_arch_opt_value) String(24kex) Value(55) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kefx) Value(56)
+Enum(mips_arch_opt_value) String(r24kex) Value(55)
 
 EnumValue
-Enum(mips_arch_opt_value) String(24kex) Value(57) Canonical
+Enum(mips_arch_opt_value) String(34kc) Value(56) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r24kex) Value(57)
+Enum(mips_arch_opt_value) String(r34kc) Value(56)
 
 EnumValue
-Enum(mips_arch_opt_value) String(34kc) Value(58) Canonical
+Enum(mips_arch_opt_value) String(34kf2_1) Value(57) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r34kc) Value(58)
+Enum(mips_arch_opt_value) String(r34kf2_1) Value(57)
 
 EnumValue
-Enum(mips_arch_opt_value) String(34kf2_1) Value(59) Canonical
+Enum(mips_arch_opt_value) String(34kf) Value(58) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r34kf2_1) Value(59)
+Enum(mips_arch_opt_value) String(r34kf) Value(58)
 
 EnumValue
-Enum(mips_arch_opt_value) String(34kf) Value(60) Canonical
+Enum(mips_arch_opt_value) String(34kf1_1) Value(59) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r34kf) Value(60)
+Enum(mips_arch_opt_value) String(r34kf1_1) Value(59)
 
 EnumValue
-Enum(mips_arch_opt_value) String(34kf1_1) Value(61) Canonical
+Enum(mips_arch_opt_value) String(34kfx) Value(60) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r34kf1_1) Value(61)
+Enum(mips_arch_opt_value) String(r34kfx) Value(60)
 
 EnumValue
-Enum(mips_arch_opt_value) String(34kfx) Value(62) Canonical
+Enum(mips_arch_opt_value) String(34kx) Value(61) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r34kfx) Value(62)
+Enum(mips_arch_opt_value) String(r34kx) Value(61)
 
 EnumValue
-Enum(mips_arch_opt_value) String(34kx) Value(63) Canonical
+Enum(mips_arch_opt_value) String(34kn) Value(62) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r34kx) Value(63)
+Enum(mips_arch_opt_value) String(r34kn) Value(62)
 
 EnumValue
-Enum(mips_arch_opt_value) String(34kn) Value(64) Canonical
+Enum(mips_arch_opt_value) String(74kc) Value(63) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r34kn) Value(64)
+Enum(mips_arch_opt_value) String(r74kc) Value(63)
 
 EnumValue
-Enum(mips_arch_opt_value) String(74kc) Value(65) Canonical
+Enum(mips_arch_opt_value) String(74kf2_1) Value(64) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r74kc) Value(65)
+Enum(mips_arch_opt_value) String(r74kf2_1) Value(64)
 
 EnumValue
-Enum(mips_arch_opt_value) String(74kf2_1) Value(66) Canonical
+Enum(mips_arch_opt_value) String(74kf) Value(65) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r74kf2_1) Value(66)
+Enum(mips_arch_opt_value) String(r74kf) Value(65)
 
 EnumValue
-Enum(mips_arch_opt_value) String(74kf) Value(67) Canonical
+Enum(mips_arch_opt_value) String(74kf1_1) Value(66) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r74kf) Value(67)
+Enum(mips_arch_opt_value) String(r74kf1_1) Value(66)
 
 EnumValue
-Enum(mips_arch_opt_value) String(74kf1_1) Value(68) Canonical
+Enum(mips_arch_opt_value) String(74kfx) Value(67) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r74kf1_1) Value(68)
+Enum(mips_arch_opt_value) String(r74kfx) Value(67)
 
 EnumValue
-Enum(mips_arch_opt_value) String(74kfx) Value(69) Canonical
+Enum(mips_arch_opt_value) String(74kx) Value(68) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r74kfx) Value(69)
+Enum(mips_arch_opt_value) String(r74kx) Value(68)
 
 EnumValue
-Enum(mips_arch_opt_value) String(74kx) Value(70) Canonical
+Enum(mips_arch_opt_value) String(74kf3_2) Value(69) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r74kx) Value(70)
+Enum(mips_arch_opt_value) String(r74kf3_2) Value(69)
 
 EnumValue
-Enum(mips_arch_opt_value) String(74kf3_2) Value(71) Canonical
+Enum(mips_arch_opt_value) String(1004kc) Value(70) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r74kf3_2) Value(71)
+Enum(mips_arch_opt_value) String(r1004kc) Value(70)
 
 EnumValue
-Enum(mips_arch_opt_value) String(1004kc) Value(72) Canonical
+Enum(mips_arch_opt_value) String(1004kf2_1) Value(71) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r1004kc) Value(72)
+Enum(mips_arch_opt_value) String(r1004kf2_1) Value(71)
 
 EnumValue
-Enum(mips_arch_opt_value) String(1004kf2_1) Value(73) Canonical
+Enum(mips_arch_opt_value) String(1004kf) Value(72) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r1004kf2_1) Value(73)
+Enum(mips_arch_opt_value) String(r1004kf) Value(72)
 
 EnumValue
-Enum(mips_arch_opt_value) String(1004kf) Value(74) Canonical
+Enum(mips_arch_opt_value) String(1004kf1_1) Value(73) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r1004kf) Value(74)
+Enum(mips_arch_opt_value) String(r1004kf1_1) Value(73)
 
 EnumValue
-Enum(mips_arch_opt_value) String(1004kf1_1) Value(75) Canonical
+Enum(mips_arch_opt_value) String(5kc) Value(74) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r1004kf1_1) Value(75)
+Enum(mips_arch_opt_value) String(r5kc) Value(74)
 
 EnumValue
-Enum(mips_arch_opt_value) String(5kc) Value(76) Canonical
+Enum(mips_arch_opt_value) String(5kf) Value(75) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r5kc) Value(76)
+Enum(mips_arch_opt_value) String(r5kf) Value(75)
 
 EnumValue
-Enum(mips_arch_opt_value) String(5kf) Value(77) Canonical
+Enum(mips_arch_opt_value) String(20kc) Value(76) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r5kf) Value(77)
+Enum(mips_arch_opt_value) String(r20kc) Value(76)
 
 EnumValue
-Enum(mips_arch_opt_value) String(20kc) Value(78) Canonical
+Enum(mips_arch_opt_value) String(sb1) Value(77) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(r20kc) Value(78)
+Enum(mips_arch_opt_value) String(sb1a) Value(78) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(sb1) Value(79) Canonical
+Enum(mips_arch_opt_value) String(sr71000) Value(79) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(sb1a) Value(80) Canonical
+Enum(mips_arch_opt_value) String(sr71k) Value(79)
 
 EnumValue
-Enum(mips_arch_opt_value) String(sr71000) Value(81) Canonical
+Enum(mips_arch_opt_value) String(xlr) Value(80) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(sr71k) Value(81)
+Enum(mips_arch_opt_value) String(loongson3a) Value(81) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(xlr) Value(82) Canonical
+Enum(mips_arch_opt_value) String(octeon) Value(82) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(loongson3a) Value(83) Canonical
+Enum(mips_arch_opt_value) String(octeon+) Value(83) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(octeon) Value(84) Canonical
+Enum(mips_arch_opt_value) String(octeon2) Value(84) Canonical
 
 EnumValue
-Enum(mips_arch_opt_value) String(octeon+) Value(85) Canonical
-
-EnumValue
-Enum(mips_arch_opt_value) String(octeon2) Value(86) Canonical
-
-EnumValue
-Enum(mips_arch_opt_value) String(xlp) Value(87) Canonical
+Enum(mips_arch_opt_value) String(xlp) Value(85) Canonical
 
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index e4ab271..252e828 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -77,9 +77,6 @@ along with GCC; see the file COPYING3.  If not see
    preserve the maximum stack alignment.  We therefore use a value
    of 0x7ff0 in this case.
 
-   microMIPS LWM and SWM support 12-bit offsets (from -0x800 to 0x7ff),
-   so we use a maximum of 0x7f0 for TARGET_MICROMIPS.
-
    MIPS16e SAVE and RESTORE instructions can adjust the stack pointer by
    up to 0x7f8 bytes and can usually save or restore all the registers
    that we need to save or restore.  (Note that we can only use these
@@ -90,8 +87,8 @@ along with GCC; see the file COPYING3.  If not see
    to save and restore registers, and to allocate and deallocate the top
    part of the frame.  */
 #define MIPS_MAX_FIRST_STACK_STEP					\
-  (!TARGET_COMPRESSION ? 0x7ff0						\
-   : TARGET_MICROMIPS || GENERATE_MIPS16E_SAVE_RESTORE ? 0x7f8		\
+  (!TARGET_MIPS16 ? 0x7ff0						\
+   : GENERATE_MIPS16E_SAVE_RESTORE ? 0x7f8				\
    : TARGET_64BIT ? 0x100 : 0x400)
 
 /* True if INSN is a mips.md pattern or asm statement.  */
@@ -563,8 +560,8 @@ static const struct mips_rtx_cost_data *mips_cost;
 /* The ambient target flags, excluding MASK_MIPS16.  */
 static int mips_base_target_flags;
 
-/* The default compression mode.  */
-unsigned int mips_base_compression_flags;
+/* True if MIPS16 is the default mode.  */
+bool mips_base_mips16;
 
 /* The ambient values of other global variables.  */
 static int mips_base_schedule_insns; /* flag_schedule_insns */
@@ -677,9 +674,6 @@ static const struct attribute_spec mips_attribute_table[] = {
      code generation but don't carry other semantics.  */
   { "mips16", 	   0, 0, true,  false, false, NULL, false },
   { "nomips16",    0, 0, true,  false, false, NULL, false },
-  { "micromips",   0, 0, true,  false, false, NULL, false },
-  { "nomicromips", 0, 0, true,  false, false, NULL, false },
-  { "nocompression", 0, 0, true,  false, false, NULL, false },
   /* Allow functions to be specified as interrupt handlers */
   { "interrupt",   0, 0, false, true,  true, NULL, false },
   { "use_shadow_register_set",	0, 0, false, true,  true, NULL, false },
@@ -1173,11 +1167,10 @@ mflip_mips16_use_mips16_p (tree decl)
   const char *name;
   hashval_t hash;
   void **slot;
-  bool base_is_mips16 = (mips_base_compression_flags & MASK_MIPS16) != 0;
 
   /* Use the opposite of the command-line setting for anonymous decls.  */
   if (!DECL_NAME (decl))
-    return !base_is_mips16;
+    return !mips_base_mips16;
 
   if (!mflip_mips16_htab)
     mflip_mips16_htab = htab_create_ggc (37, mflip_mips16_htab_hash,
@@ -1192,7 +1185,7 @@ mflip_mips16_use_mips16_p (tree decl)
       mips16_flipper = !mips16_flipper;
       entry = ggc_alloc_mflip_mips16_entry ();
       entry->name = name;
-      entry->mips16_p = mips16_flipper ? !base_is_mips16 : base_is_mips16;
+      entry->mips16_p = mips16_flipper ? !mips_base_mips16 : mips_base_mips16;
       *slot = entry;
     }
   return entry->mips16_p;
@@ -1214,6 +1207,19 @@ mips_far_type_p (const_tree type)
 	  || lookup_attribute ("far", TYPE_ATTRIBUTES (type)) != NULL);
 }
 
+/* Similar predicates for "mips16"/"nomips16" function attributes.  */
+
+static bool
+mips_mips16_decl_p (const_tree decl)
+{
+  return lookup_attribute ("mips16", DECL_ATTRIBUTES (decl)) != NULL;
+}
+
+static bool
+mips_nomips16_decl_p (const_tree decl)
+{
+  return lookup_attribute ("nomips16", DECL_ATTRIBUTES (decl)) != NULL;
+}
 
 /* Check if the interrupt attribute is set for a function.  */
 
@@ -1251,52 +1257,12 @@ mips_use_debug_exception_return_p (tree type)
 			   TYPE_ATTRIBUTES (type)) != NULL;
 }
 
-/* Return the set of compression modes that are explicitly required
-   by the attributes in ATTRIBUTES.  */
-
-static unsigned int
-mips_get_compress_on_flags (tree attributes)
-{
-  unsigned int flags = 0;
-
-  if (lookup_attribute ("mips16", attributes) != NULL)
-    flags |= MASK_MIPS16;
-
-  if (lookup_attribute ("micromips", attributes) != NULL)
-    flags |= MASK_MICROMIPS;
-
-  return flags;
-}
-
-/* Return the set of compression modes that are explicitly forbidden
-   by the attributes in ATTRIBUTES.  */
-
-static unsigned int
-mips_get_compress_off_flags (tree attributes)
-{
-  unsigned int flags = 0;
-
-  if (lookup_attribute ("nocompression", attributes) != NULL)
-    flags |= MASK_MIPS16 | MASK_MICROMIPS;
-
-  if (lookup_attribute ("nomips16", attributes) != NULL)
-    flags |= MASK_MIPS16;
-
-  if (lookup_attribute ("nomicromips", attributes) != NULL)
-    flags |= MASK_MICROMIPS;
-
-  return flags;
-}
-
-/* Return the compression mode that should be used for function DECL.
-   Return the ambient setting if DECL is null.  */
+/* Return true if function DECL is a MIPS16 function.  Return the ambient
+   setting if DECL is null.  */
 
-static unsigned int
-mips_get_compress_mode (tree decl)
+static bool
+mips_use_mips16_mode_p (tree decl)
 {
-  unsigned int flags, force_on;
-
-  flags = mips_base_compression_flags;
   if (decl)
     {
       /* Nested functions must use the same frame pointer as their
@@ -1304,36 +1270,12 @@ mips_get_compress_mode (tree decl)
       tree parent = decl_function_context (decl);
       if (parent)
 	decl = parent;
-      force_on = mips_get_compress_on_flags (DECL_ATTRIBUTES (decl));
-      if (force_on)
-	return force_on;
-      flags &= ~mips_get_compress_off_flags (DECL_ATTRIBUTES (decl));
+      if (mips_mips16_decl_p (decl))
+	return true;
+      if (mips_nomips16_decl_p (decl))
+	return false;
     }
-  return flags;
-}
-
-/* Return the attribute name associated with MASK_MIPS16 and MASK_MICROMIPS
-   flags FLAGS.  */
-
-static const char *
-mips_get_compress_on_name (unsigned int flags)
-{
-  if (flags == MASK_MIPS16)
-    return "mips16";
-  return "micromips";
-}
-
-/* Return the attribute name that forbids MASK_MIPS16 and MASK_MICROMIPS
-   flags FLAGS.  */
-
-static const char *
-mips_get_compress_off_name (unsigned int flags)
-{
-  if (flags == MASK_MIPS16)
-    return "nomips16";
-  if (flags == MASK_MICROMIPS)
-    return "nomicromips";
-  return "nocompression";
+  return mips_base_mips16;
 }
 
 /* Implement TARGET_COMP_TYPE_ATTRIBUTES.  */
@@ -1355,50 +1297,37 @@ static void
 mips_insert_attributes (tree decl, tree *attributes)
 {
   const char *name;
-  unsigned int compression_flags, nocompression_flags;
+  bool mips16_p, nomips16_p;
 
   /* Check for "mips16" and "nomips16" attributes.  */
-  compression_flags = mips_get_compress_on_flags (*attributes);
-  nocompression_flags = mips_get_compress_off_flags (*attributes);
-
+  mips16_p = lookup_attribute ("mips16", *attributes) != NULL;
+  nomips16_p = lookup_attribute ("nomips16", *attributes) != NULL;
   if (TREE_CODE (decl) != FUNCTION_DECL)
     {
-      if (nocompression_flags)
-	error ("%qs attribute only applies to functions",
-	       mips_get_compress_off_name (nocompression_flags));
-
-      if (compression_flags)
-	error ("%qs attribute only applies to functions",
-	       mips_get_compress_on_name (nocompression_flags));
+      if (mips16_p)
+	error ("%qs attribute only applies to functions", "mips16");
+      if (nomips16_p)
+	error ("%qs attribute only applies to functions", "nomips16");
     }
   else
     {
-      compression_flags |= mips_get_compress_on_flags (DECL_ATTRIBUTES (decl));
-      nocompression_flags |=
-	mips_get_compress_off_flags (DECL_ATTRIBUTES (decl));
-
-      if (compression_flags && nocompression_flags)
-	error ("%qE cannot have both %qs and %qs attributes",
-	       DECL_NAME (decl), mips_get_compress_on_name (compression_flags),
-	       mips_get_compress_off_name (nocompression_flags));
-
-      if (compression_flags & MASK_MIPS16
-          && compression_flags & MASK_MICROMIPS)
-	error ("%qE cannot have both %qs and %qs attributes",
-	       DECL_NAME (decl), "mips16", "micromips");
-
-      if (TARGET_FLIP_MIPS16
-	  && !DECL_ARTIFICIAL (decl)
-	  && compression_flags == 0
-	  && nocompression_flags == 0)
+      mips16_p |= mips_mips16_decl_p (decl);
+      nomips16_p |= mips_nomips16_decl_p (decl);
+      if (mips16_p || nomips16_p)
+	{
+	  /* DECL cannot be simultaneously "mips16" and "nomips16".  */
+	  if (mips16_p && nomips16_p)
+	    error ("%qE cannot have both %<mips16%> and "
+		   "%<nomips16%> attributes",
+		   DECL_NAME (decl));
+	}
+      else if (TARGET_FLIP_MIPS16 && !DECL_ARTIFICIAL (decl))
 	{
 	  /* Implement -mflip-mips16.  If DECL has neither a "nomips16" nor a
 	     "mips16" attribute, arbitrarily pick one.  We must pick the same
 	     setting for duplicate declarations of a function.  */
 	  name = mflip_mips16_use_mips16_p (decl) ? "mips16" : "nomips16";
 	  *attributes = tree_cons (get_identifier (name), NULL, *attributes);
-	  name = "nomicromips";
-	  *attributes = tree_cons (get_identifier (name), NULL, *attributes);
 	}
     }
 }
@@ -1408,19 +1337,13 @@ mips_insert_attributes (tree decl, tree *attributes)
 static tree
 mips_merge_decl_attributes (tree olddecl, tree newdecl)
 {
-  unsigned int diff;
-
-  diff = (mips_get_compress_on_flags (DECL_ATTRIBUTES (olddecl))
-	  ^ mips_get_compress_on_flags (DECL_ATTRIBUTES (newdecl)));
-  if (diff)
+  /* The decls' "mips16" and "nomips16" attributes must match exactly.  */
+  if (mips_mips16_decl_p (olddecl) != mips_mips16_decl_p (newdecl))
     error ("%qE redeclared with conflicting %qs attributes",
-	   DECL_NAME (newdecl), mips_get_compress_on_name (diff));
-
-  diff = (mips_get_compress_off_flags (DECL_ATTRIBUTES (olddecl))
-	  ^ mips_get_compress_off_flags (DECL_ATTRIBUTES (newdecl)));
-  if (diff)
+	   DECL_NAME (newdecl), "mips16");
+  if (mips_nomips16_decl_p (olddecl) != mips_nomips16_decl_p (newdecl))
     error ("%qE redeclared with conflicting %qs attributes",
-	   DECL_NAME (newdecl), mips_get_compress_off_name (diff));
+	   DECL_NAME (newdecl), "nomips16");
 
   return merge_attributes (DECL_ATTRIBUTES (olddecl),
 			   DECL_ATTRIBUTES (newdecl));
@@ -1627,7 +1550,7 @@ mips16_local_function_p (const_rtx x)
   return (GET_CODE (x) == SYMBOL_REF
 	  && SYMBOL_REF_LOCAL_P (x)
 	  && !SYMBOL_REF_EXTERNAL_P (x)
-	  && (mips_get_compress_mode (SYMBOL_REF_DECL (x)) & MASK_MIPS16));
+	  && mips_use_mips16_mode_p (SYMBOL_REF_DECL (x)));
 }
 
 /* Return true if SYMBOL_REF X binds locally.  */
@@ -2377,20 +2300,6 @@ mips_address_insns (rtx x, enum machine_mode mode, bool might_split_p)
   return 0;
 }
 
-/* Return true if X is a legitimate address with a 12-bit offset.
-   MODE is the mode of the value being accessed.  */
-
-bool
-umips_12bit_offset_address_p (rtx x, enum machine_mode mode)
-{
-  struct mips_address_info addr;
-
-  return (mips_classify_address (&addr, x, mode, false)
-	  && addr.type == ADDRESS_REG
-	  && CONST_INT_P (addr.offset)
-	  && UMIPS_12BIT_OFFSET_P (INTVAL (addr.offset)));
-}
-
 /* Return the number of instructions needed to load constant X.
    Return 0 if X isn't a valid constant.  */
 
@@ -6188,13 +6097,6 @@ mips_start_function_definition (const char *name, bool mips16_p)
   else
     fprintf (asm_out_file, "\t.set\tnomips16\n");
 
-  if (TARGET_MICROMIPS)
-    fprintf (asm_out_file, "\t.set\tmicromips\n");
-#ifdef HAVE_GAS_MICROMIPS
-  else
-    fprintf (asm_out_file, "\t.set\tnomicromips\n");
-#endif
-
   if (!flag_inhibit_size_directive)
     {
       fputs ("\t.ent\t", asm_out_file);
@@ -7001,37 +6903,6 @@ mips_split_call (rtx insn, rtx call_pattern)
     mips_restore_gp_from_cprestore_slot (gen_rtx_REG (Pmode, GP_ARG_FIRST + 2));
 }
 
-/* Return true if a call to DECL may need to use JALX.  */
-
-static bool
-mips_call_may_need_jalx_p (tree decl)
-{
-  /* If the current translation unit would use a different mode for DECL,
-     assume that the call needs JALX.  */
-  if (mips_get_compress_mode (decl) != TARGET_COMPRESSION)
-    return true;
-
-  /* mips_get_compress_mode is always accurate for locally-binding
-     functions in the current translation unit.  */
-  if (!DECL_EXTERNAL (decl) && targetm.binds_local_p (decl))
-    return false;
-
-  /* When -minterlink-compressed is in effect, assume that functions
-     could use a different encoding mode unless an attribute explicitly
-     tells us otherwise.  */
-  if (TARGET_INTERLINK_COMPRESSED)
-    {
-      if (!TARGET_COMPRESSION
-	  && mips_get_compress_off_flags (DECL_ATTRIBUTES (decl)) ==0)
-	return true;
-      if (TARGET_COMPRESSION
-	  && mips_get_compress_on_flags (DECL_ATTRIBUTES (decl)) == 0)
-	return true;
-    }
-
-  return false;
-}
-
 /* Implement TARGET_FUNCTION_OK_FOR_SIBCALL.  */
 
 static bool
@@ -7045,11 +6916,23 @@ mips_function_ok_for_sibcall (tree decl, tree exp ATTRIBUTE_UNUSED)
   if (mips_interrupt_type_p (TREE_TYPE (current_function_decl)))
     return false;
 
-  /* Direct Js are only possible to functions that use the same ISA encoding.
-     There is no JX counterpoart of JALX.  */
+  /* We can't do a sibcall if the called function is a MIPS16 function
+     because there is no direct "jx" instruction equivalent to "jalx" to
+     switch the ISA mode.  We only care about cases where the sibling
+     and normal calls would both be direct.  */
   if (decl
-      && const_call_insn_operand (XEXP (DECL_RTL (decl), 0), VOIDmode)
-      && mips_call_may_need_jalx_p (decl))
+      && mips_use_mips16_mode_p (decl)
+      && const_call_insn_operand (XEXP (DECL_RTL (decl), 0), VOIDmode))
+    return false;
+
+  /* When -minterlink-mips16 is in effect, assume that non-locally-binding
+     functions could be MIPS16 ones unless an attribute explicitly tells
+     us otherwise.  */
+  if (TARGET_INTERLINK_MIPS16
+      && decl
+      && (DECL_EXTERNAL (decl) || !targetm.binds_local_p (decl))
+      && !mips_nomips16_decl_p (decl)
+      && const_call_insn_operand (XEXP (DECL_RTL (decl), 0), VOIDmode))
     return false;
 
   /* Otherwise OK.  */
@@ -7915,9 +7798,6 @@ mips_pop_asm_switch (struct mips_asm_switch *asm_switch)
    '^'	Print the name of the pic call-through register (t9 or $25).
    '+'	Print the name of the gp register (usually gp or $28).
    '$'	Print the name of the stack pointer register (sp or $29).
-   ':'  Print "c" to use the compact version if the delay slot is a nop.
-   '!'  Print "s" to use the short version if the delay slot contains a
-	16-bit instruction.
 
    See also mips_init_print_operand_pucnt.  */
 
@@ -8001,20 +7881,6 @@ mips_print_operand_punctuation (FILE *file, int ch)
       fputs (reg_names[STACK_POINTER_REGNUM], file);
       break;
 
-    case ':':
-      /* When final_sequence is 0, the delay slot will be a nop.  We can
-	 use the compact version for microMIPS.  */
-      if (final_sequence == 0)
-	putc ('c', file);
-      break;
-
-    case '!':
-      /* When final_sequence is 0, the delay slot will be a nop.  We can
-	 a 16-bit delay slot for microMIPS.  */
-      if (final_sequence == 0)
-	putc ('s', file);
-      break;
-
     default:
       gcc_unreachable ();
       break;
@@ -8028,7 +7894,7 @@ mips_init_print_operand_punct (void)
 {
   const char *p;
 
-  for (p = "()[]<>*#/?~.@^+$:!"; *p; p++)
+  for (p = "()[]<>*#/?~.@^+$"; *p; p++)
     mips_print_operand_punct[(unsigned char) *p] = true;
 }
 
@@ -10370,126 +10236,6 @@ mips_for_each_saved_acc (HOST_WIDE_INT sp_offset, mips_save_restore_fn fn)
       }
 }
 
-/* Save register REG to MEM.  Make the instruction frame-related.  */
-
-static void
-mips_save_reg (rtx reg, rtx mem)
-{
-  if (GET_MODE (reg) == DFmode && !TARGET_FLOAT64)
-    {
-      rtx x1, x2;
-
-      mips_emit_move_or_split (mem, reg, SPLIT_IF_NECESSARY);
-
-      x1 = mips_frame_set (mips_subword (mem, false),
-			   mips_subword (reg, false));
-      x2 = mips_frame_set (mips_subword (mem, true),
-			   mips_subword (reg, true));
-      mips_set_frame_expr (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, x1, x2)));
-    }
-  else
-    mips_emit_save_slot_move (mem, reg, MIPS_PROLOGUE_TEMP (GET_MODE (reg)));
-}
-
-/* Capture the register combinations that are allowed in a SWM or LWM
-   instruction.  The entries are ordered by number of registers set in
-   the mask.  We also ignore the single register encodings because a
-   normal SW/LW is preferred.  */
-
-static const unsigned int umips_swm_mask[17] = {
-  0xc0ff0000, 0x80ff0000, 0x40ff0000, 0x807f0000,
-  0x00ff0000, 0x803f0000, 0x007f0000, 0x801f0000,
-  0x003f0000, 0x800f0000, 0x001f0000, 0x80070000,
-  0x000f0000, 0x80030000, 0x00070000, 0x80010000,
-  0x00030000
-};
-
-static const unsigned int umips_swm_encoding[17] = {
-  25, 24, 9, 23, 8, 22, 7, 21, 6, 20, 5, 19, 4, 18, 3, 17, 2
-};
-
-/* Try to use a microMIPS LWM or SWM instruction to save or restore
-   as many GPRs in *MASK as possible.  *OFFSET is the offset from the
-   stack pointer of the topmost save slot.
-
-   Remove from *MASK all registers that were handled using LWM and SWM.
-   Update *OFFSET so that it points to the first unused save slot.  */
-
-static bool
-umips_build_save_restore (mips_save_restore_fn fn,
-			  unsigned *mask, HOST_WIDE_INT *offset)
-{
-  int nregs;
-  unsigned int i, j;
-  rtx pattern, set, reg, mem;
-  HOST_WIDE_INT this_offset;
-  rtx this_base;
-
-  /* Try matching $16 to $31 (s0 to ra).  */
-  for (i = 0; i < ARRAY_SIZE (umips_swm_mask); i++)
-    if ((*mask & 0xffff0000) == umips_swm_mask[i])
-      break;
-
-  if (i == ARRAY_SIZE (umips_swm_mask))
-    return false;
-
-  /* Get the offset of the lowest save slot.  */
-  nregs = (umips_swm_encoding[i] & 0xf) + (umips_swm_encoding[i] >> 4);
-  this_offset = *offset - UNITS_PER_WORD * (nregs - 1);
-
-  /* LWM/SWM can only support offsets from -2048 to 2047.  */
-  if (!UMIPS_12BIT_OFFSET_P (this_offset))
-    return false;
-
-  /* Create the final PARALLEL.  */
-  pattern = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nregs));
-  this_base = stack_pointer_rtx;
-
-  /* For registers $16-$23 and $30.  */
-  for (j = 0; j < (umips_swm_encoding[i] & 0xf); j++)
-    {
-      HOST_WIDE_INT offset = this_offset + j * UNITS_PER_WORD;
-      mem = gen_frame_mem (SImode, plus_constant (Pmode, this_base, offset));
-      unsigned int regno = (j != 8) ? 16 + j : 30;
-      *mask &= ~(1 << regno);
-      reg = gen_rtx_REG (SImode, regno);
-      if (fn == mips_save_reg)
-	set = mips_frame_set (mem, reg);
-      else
-	{
-	  set = gen_rtx_SET (VOIDmode, reg, mem);
-	  mips_add_cfa_restore (reg);
-	}
-      XVECEXP (pattern, 0, j) = set;
-    }
-
-  /* For register $31.  */
-  if (umips_swm_encoding[i] >> 4)
-    {
-      HOST_WIDE_INT offset = this_offset + j * UNITS_PER_WORD;
-      *mask &= ~(1 << 31);
-      mem = gen_frame_mem (SImode, plus_constant (Pmode, this_base, offset));
-      reg = gen_rtx_REG (SImode, 31);
-      if (fn == mips_save_reg)
-	set = mips_frame_set (mem, reg);
-      else
-	{
-	  set = gen_rtx_SET (VOIDmode, reg, mem);
-	  mips_add_cfa_restore (reg);
-	}
-      XVECEXP (pattern, 0, j) = set;
-    }
-
-  pattern = emit_insn (pattern);
-  if (fn == mips_save_reg)
-    RTX_FRAME_RELATED_P (pattern) = 1;
-
-  /* Adjust the last offset.  */
-  *offset -= UNITS_PER_WORD * nregs;
-
-  return true;
-}
-
 /* Call FN for each register that is saved by the current function.
    SP_OFFSET is the offset of the current stack pointer from the start
    of the frame.  */
@@ -10499,23 +10245,16 @@ mips_for_each_saved_gpr_and_fpr (HOST_WIDE_INT sp_offset,
 				 mips_save_restore_fn fn)
 {
   enum machine_mode fpr_mode;
-  int regno;
-  const struct mips_frame_info *frame = &cfun->machine->frame;
   HOST_WIDE_INT offset;
-  unsigned int mask;
+  int regno;
 
   /* Save registers starting from high to low.  The debuggers prefer at least
      the return register be stored at func+4, and also it allows us not to
      need a nop in the epilogue if at least one register is reloaded in
      addition to return address.  */
-  offset = frame->gp_sp_offset - sp_offset;
-  mask = frame->mask;
-
-  if (TARGET_MICROMIPS)
-    umips_build_save_restore (fn, &mask, &offset);
-
+  offset = cfun->machine->frame.gp_sp_offset - sp_offset;
   for (regno = GP_REG_LAST; regno >= GP_REG_FIRST; regno--)
-    if (BITSET_P (mask, regno - GP_REG_FIRST))
+    if (BITSET_P (cfun->machine->frame.mask, regno - GP_REG_FIRST))
       {
 	/* Record the ra offset for use by mips_function_profiler.  */
 	if (regno == RETURN_ADDR_REGNUM)
@@ -10762,6 +10501,26 @@ mips_frame_barrier (void)
   emit_clobber (gen_frame_mem (BLKmode, stack_pointer_rtx));
 }
 
+/* Save register REG to MEM.  Make the instruction frame-related.  */
+
+static void
+mips_save_reg (rtx reg, rtx mem)
+{
+  if (GET_MODE (reg) == DFmode && !TARGET_FLOAT64)
+    {
+      rtx x1, x2;
+
+      mips_emit_move_or_split (mem, reg, SPLIT_IF_NECESSARY);
+
+      x1 = mips_frame_set (mips_subword (mem, false),
+			   mips_subword (reg, false));
+      x2 = mips_frame_set (mips_subword (mem, true),
+			   mips_subword (reg, true));
+      mips_set_frame_expr (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, x1, x2)));
+    }
+  else
+    mips_emit_save_slot_move (mem, reg, MIPS_PROLOGUE_TEMP (GET_MODE (reg)));
+}
 
 /* The __gnu_local_gp symbol.  */
 
@@ -11480,7 +11239,7 @@ mips_expand_epilogue (bool sibcall_p)
 	  mips_emit_move (gen_rtx_REG (word_mode, K0_REG_NUM), mem);
 	  offset -= UNITS_PER_WORD;
 
-	  /* If we don't use shadow register set, we need to update SP.  */
+	  /* If we don't use shoadow register set, we need to update SP.  */
 	  if (!cfun->machine->use_shadow_register_set_p)
 	    mips_deallocate_stack (stack_pointer_rtx, GEN_INT (step2), 0);
 	  else
@@ -11495,7 +11254,6 @@ mips_expand_epilogue (bool sibcall_p)
 	/* Deallocate the final bit of the frame.  */
 	mips_deallocate_stack (stack_pointer_rtx, GEN_INT (step2), 0);
     }
-
   gcc_assert (!mips_epilogue.cfa_restores);
 
   /* Add in the __builtin_eh_return stack adjustment.  We need to
@@ -16453,19 +16211,17 @@ mips_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED,
   reload_completed = 0;
 }
 
+/* The last argument passed to mips_set_mips16_mode, or negative if the
+   function hasn't been called yet.  */
+static int was_mips16_p = -1;
 
-/* The last argument passed to mips_set_compression_mode,
-   or negative if the function hasn't been called yet.  */
-static unsigned int old_compression_mode = -1;
-
-/* Set up the target-dependent global state for ISA mode COMPRESSION_MODE,
-   which is either MASK_MIPS16 or MASK_MICROMIPS.  */
+/* Set up the target-dependent global state so that it matches the
+   current function's ISA mode.  */
 
 static void
-mips_set_compression_mode (unsigned int compression_mode)
+mips_set_mips16_mode (int mips16_p)
 {
-
-  if (compression_mode == old_compression_mode)
+  if (mips16_p == was_mips16_p)
     return;
 
   /* Restore base settings of various flags.  */
@@ -16476,10 +16232,8 @@ mips_set_compression_mode (unsigned int compression_mode)
   align_loops = mips_base_align_loops;
   align_jumps = mips_base_align_jumps;
   align_functions = mips_base_align_functions;
-  target_flags &= ~(MASK_MIPS16 | MASK_MICROMIPS);
-  target_flags |= compression_mode;
 
-  if (compression_mode & MASK_MIPS16)
+  if (mips16_p)
     {
       /* Switch to MIPS16 mode.  */
       target_flags |= MASK_MIPS16;
@@ -16533,11 +16287,8 @@ mips_set_compression_mode (unsigned int compression_mode)
     }
   else
     {
-      /* Switch to microMIPS or the standard encoding.  */
-
-      if (TARGET_MICROMIPS)
-	/* Avoid branch likely.  */
-	target_flags &= ~MASK_BRANCHLIKELY;
+      /* Switch to normal (non-MIPS16) mode.  */
+      target_flags &= ~MASK_MIPS16;
 
       /* Provide default values for align_* for 64-bit targets.  */
       if (TARGET_64BIT)
@@ -16559,7 +16310,7 @@ mips_set_compression_mode (unsigned int compression_mode)
   /* (Re)initialize MIPS target internals for new ISA.  */
   mips_init_relocs ();
 
-  if (compression_mode & MASK_MIPS16)
+  if (mips16_p)
     {
       if (!mips16_globals)
 	mips16_globals = save_target_globals_default_opts ();
@@ -16569,17 +16320,16 @@ mips_set_compression_mode (unsigned int compression_mode)
   else
     restore_target_globals (&default_target_globals);
 
-  old_compression_mode = compression_mode;
+  was_mips16_p = mips16_p;
 }
 
 /* Implement TARGET_SET_CURRENT_FUNCTION.  Decide whether the current
-   function should use the MIPS16 or microMIPS ISA and switch modes
-   accordingly.  */
+   function should use the MIPS16 ISA and switch modes accordingly.  */
 
 static void
 mips_set_current_function (tree fndecl)
 {
-  mips_set_compression_mode (mips_get_compress_mode (fndecl));
+  mips_set_mips16_mode (mips_use_mips16_mode_p (fndecl));
 }
 
 /* Allocate a chunk of memory for per-function machine-dependent data.  */
@@ -16687,19 +16437,14 @@ mips_option_override (void)
   if (global_options_set.x_mips_isa_option)
     mips_isa_option_info = &mips_cpu_info_table[mips_isa_option];
 
+  /* Process flags as though we were generating non-MIPS16 code.  */
+  mips_base_mips16 = TARGET_MIPS16;
+  target_flags &= ~MASK_MIPS16;
+
 #ifdef SUBTARGET_OVERRIDE_OPTIONS
   SUBTARGET_OVERRIDE_OPTIONS;
 #endif
 
-  /* MIPS16 and microMIPS cannot coexist.  */
-  if (TARGET_MICROMIPS && TARGET_MIPS16)
-    error ("unsupported combination: %s", "-mips16 -mmicromips");
-
-  /* Save the base compression state and process flags as though we
-     were generating uncompressed code.  */
-  mips_base_compression_flags = TARGET_COMPRESSION;
-  target_flags &= ~TARGET_COMPRESSION;
-
   /* -mno-float overrides -mhard-float and -msoft-float.  */
   if (TARGET_NO_FLOAT)
     {
@@ -16708,7 +16453,7 @@ mips_option_override (void)
     }
 
   if (TARGET_FLIP_MIPS16)
-    TARGET_INTERLINK_COMPRESSED = 1;
+    TARGET_INTERLINK_MIPS16 = 1;
 
   /* Set the small data limit.  */
   mips_small_data_threshold = (global_options_set.x_g_switch_value
@@ -17081,9 +16826,9 @@ mips_option_override (void)
 
   /* Now select the ISA mode.
 
-     Do all CPP-sensitive stuff in uncompressed mode; we'll switch modes
-     later if required.  */
-  mips_set_compression_mode (0);
+     Do all CPP-sensitive stuff in non-MIPS16 mode; we'll switch to
+     MIPS16 mode afterwards if need be.  */
+  mips_set_mips16_mode (false);
 }
 
 /* Swap the register information for registers I and I + 1, which
@@ -17343,277 +17088,6 @@ mips_mulsidi3_gen_fn (enum rtx_code ext_code)
       return signed_p ? gen_mulsidi3_32bit : gen_umulsidi3_32bit;
     }
 }
-
-/* Return true if PATTERN matches the kind of instruction generated by
-   umips_build_save_restore.  SAVE_P is true for store.  */
-
-bool
-umips_save_restore_pattern_p (bool save_p, rtx pattern)
-{
-  int n;
-  unsigned int i;
-  HOST_WIDE_INT first_offset = 0;
-  rtx first_base = 0;
-  unsigned int regmask = 0;
-
-  for (n = 0; n < XVECLEN (pattern, 0); n++)
-    {
-      rtx set, reg, mem, this_base;
-      HOST_WIDE_INT this_offset;
-
-      /* Check that we have a SET.  */
-      set = XVECEXP (pattern, 0, n);
-      if (GET_CODE (set) != SET)
-	return false;
-
-      /* Check that the SET is a load (if restoring) or a store
-	 (if saving).  */
-      mem = save_p ? SET_DEST (set) : SET_SRC (set);
-      if (!MEM_P (mem) || MEM_VOLATILE_P (mem))
-	return false;
-
-      /* Check that the address is the sum of base and a possibly-zero
-	 constant offset.  Determine if the offset is in range.  */
-      mips_split_plus (XEXP (mem, 0), &this_base, &this_offset);
-      if (!REG_P (this_base))
-	return false;
-
-      if (n == 0)
-	{
-	  if (!UMIPS_12BIT_OFFSET_P (this_offset))
-	    return false;
-	  first_base = this_base;
-	  first_offset = this_offset;
-	}
-      else
-	{
-	  /* Check that the save slots are consecutive.  */
-	  if (REGNO (this_base) != REGNO (first_base)
-	      || this_offset != first_offset + UNITS_PER_WORD * n)
-	    return false;
-	}
-
-      /* Check that SET's other operand is a register.  */
-      reg = save_p ? SET_SRC (set) : SET_DEST (set);
-      if (!REG_P (reg))
-	return false;
-
-      regmask |= 1 << REGNO (reg);
-    }
-
-  for (i = 0; i < ARRAY_SIZE (umips_swm_mask); i++)
-    if (regmask == umips_swm_mask[i])
-      return true;
-
-  return false;
-}
-
-/* Return the assembly instruction for microMIPS LWM or SWM.
-   SAVE_P and PATTERN are as for umips_save_restore_pattern_p.  */
-
-const char *
-umips_output_save_restore (bool save_p, rtx pattern)
-{
-  static char buffer[300];
-  char *s;
-  int n;
-  HOST_WIDE_INT offset;
-  rtx base, mem, set, last_set, last_reg;
-
-  /* Parse the pattern.  */
-  gcc_assert (umips_save_restore_pattern_p (save_p, pattern));
-
-  s = strcpy (buffer, save_p ? "swm\t" : "lwm\t");
-  s += strlen (s);
-  n = XVECLEN (pattern, 0);
-
-  set = XVECEXP (pattern, 0, 0);
-  mem = save_p ? SET_DEST (set) : SET_SRC (set);
-  mips_split_plus (XEXP (mem, 0), &base, &offset);
-
-  last_set = XVECEXP (pattern, 0, n - 1);
-  last_reg = save_p ? SET_SRC (last_set) : SET_DEST (last_set);
-
-  if (REGNO (last_reg) == 31)
-    n--;
-
-  gcc_assert (n <= 9);
-  if (n == 0)
-    ;
-  else if (n == 1)
-    s += sprintf (s, "%s,", reg_names[16]);
-  else if (n < 9)
-    s += sprintf (s, "%s-%s,", reg_names[16], reg_names[15 + n]);
-  else if (n == 9)
-    s += sprintf (s, "%s-%s,%s,", reg_names[16], reg_names[23],
-		  reg_names[30]);
-
-  if (REGNO (last_reg) == 31)
-    s += sprintf (s, "%s,", reg_names[31]);
-
-  s += sprintf (s, "%d(%s)", (int)offset, reg_names[REGNO (base)]);
-  return buffer;
-}
-
-/* Return true if MEM1 and MEM2 use the same base register, and the
-   offset of MEM2 equals the offset of MEM1 plus 4.  FIRST_REG is the
-   register into (from) which the contents of MEM1 will be loaded
-   (stored), depending on the value of LOAD_P.
-   SWAP_P is true when the 1st and 2nd instructions are swapped.  */
-
-static bool
-umips_load_store_pair_p_1 (bool load_p, bool swap_p,
-			   rtx first_reg, rtx mem1, rtx mem2)
-{
-  rtx base1, base2;
-  HOST_WIDE_INT offset1, offset2;
-
-  if (!MEM_P (mem1) || !MEM_P (mem2))
-    return false;
-
-  mips_split_plus (XEXP (mem1, 0), &base1, &offset1);
-  mips_split_plus (XEXP (mem2, 0), &base2, &offset2);
-
-  if (!REG_P (base1) || !rtx_equal_p (base1, base2))
-    return false;
-
-  /* Avoid invalid load pair instructions.  */
-  if (load_p && REGNO (first_reg) == REGNO (base1))
-    return false;
-
-  /* We must avoid this case for anti-dependence.
-     Ex:  lw $3, 4($3)
-          lw $2, 0($3)
-     first_reg is $2, but the base is $3.  */
-  if (load_p
-      && swap_p
-      && REGNO (first_reg) + 1 == REGNO (base1))
-    return false;
-
-  if (offset2 != offset1 + 4)
-    return false;
-
-  if (!UMIPS_12BIT_OFFSET_P (offset1))
-    return false;
-
-  return true;
-}
-
-/* OPERANDS describes the operands to a pair of SETs, in the order
-   dest1, src1, dest2, src2.  Return true if the operands can be used
-   in an LWP or SWP instruction; LOAD_P says which.  */
-
-bool
-umips_load_store_pair_p (bool load_p, rtx *operands)
-{
-  rtx reg1, reg2, mem1, mem2;
-
-  if (load_p)
-    {
-      reg1 = operands[0];
-      reg2 = operands[2];
-      mem1 = operands[1];
-      mem2 = operands[3];
-    }
-  else
-    {
-      reg1 = operands[1];
-      reg2 = operands[3];
-      mem1 = operands[0];
-      mem2 = operands[2];
-    }
-
-  if (REGNO (reg2) == REGNO (reg1) + 1)
-    return umips_load_store_pair_p_1 (load_p, false, reg1, mem1, mem2);
-
-  if (REGNO (reg1) == REGNO (reg2) + 1)
-    return umips_load_store_pair_p_1 (load_p, true, reg2, mem2, mem1);
-
-  return false;
-}
-
-/* Return the assembly instruction for a microMIPS LWP or SWP in which
-   the first register is REG and the first memory slot is MEM.
-   LOAD_P is true for LWP.  */
-
-static void
-umips_output_load_store_pair_1 (bool load_p, rtx reg, rtx mem)
-{
-  rtx ops[] = {reg, mem};
-
-  if (load_p)
-    output_asm_insn ("lwp\t%0,%1", ops);
-  else
-    output_asm_insn ("swp\t%0,%1", ops);
-}
-
-/* Output the assembly instruction for a microMIPS LWP or SWP instruction.
-   LOAD_P and OPERANDS are as for umips_load_store_pair_p.  */
-
-void
-umips_output_load_store_pair (bool load_p, rtx *operands)
-{
-  rtx reg1, reg2, mem1, mem2;
-  if (load_p)
-    {
-      reg1 = operands[0];
-      reg2 = operands[2];
-      mem1 = operands[1];
-      mem2 = operands[3];
-    }
-  else
-    {
-      reg1 = operands[1];
-      reg2 = operands[3];
-      mem1 = operands[0];
-      mem2 = operands[2];
-    }
-
-  if (REGNO (reg2) == REGNO (reg1) + 1)
-    {
-      umips_output_load_store_pair_1 (load_p, reg1, mem1);
-      return;
-    }
-
-  gcc_assert (REGNO (reg1) == REGNO (reg2) + 1);
-  umips_output_load_store_pair_1 (load_p, reg2, mem2);
-}
-
-/* Return true if REG1 and REG2 match the criteria for a movep insn.  */
-
-bool
-umips_movep_target_p (rtx reg1, rtx reg2)
-{
-  int regno1, regno2, pair;
-  unsigned int i;
-  static const int match[8] = {
-    0x00000060, /* 5, 6 */
-    0x000000a0, /* 5, 7 */
-    0x000000c0, /* 6, 7 */
-    0x00200010, /* 4, 21 */
-    0x00400010, /* 4, 22 */
-    0x00000030, /* 4, 5 */
-    0x00000050, /* 4, 6 */
-    0x00000090  /* 4, 7 */
-  };
-
-  if (!REG_P (reg1) || !REG_P (reg2))
-    return false;
-
-  regno1 = REGNO (reg1);
-  regno2 = REGNO (reg2);
-
-  if (!GP_REG_P (regno1) || !GP_REG_P (regno2))
-    return false;
-
-  pair = (1 << regno1) | (1 << regno2);
-
-  for (i = 0; i < ARRAY_SIZE (match); i++)
-    if (pair == match[i])
-      return true;
-
-  return false;
-}
 
 /* Return the size in bytes of the trampoline code, padded to
    TRAMPOLINE_ALIGNMENT bits.  The static chain pointer and target
@@ -17868,7 +17342,7 @@ mips_prepare_pch_save (void)
      It therefore seems best to switch back to non-MIPS16 mode at
      save time, and to ensure that mips16_globals remains null after
      a PCH load.  */
-  mips_set_compression_mode (0);
+  mips_set_mips16_mode (false);
   mips16_globals = 0;
 }
 
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 0db3698..0acce14 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -174,9 +174,6 @@ struct mips_cpu_info {
 #define ISA_HAS_DSP_MULT ISA_HAS_DSPR2
 #endif
 
-/* The ISA compression flags that are currently in effect.  */
-#define TARGET_COMPRESSION (target_flags & (MASK_MIPS16 | MASK_MICROMIPS))
-
 /* Generate mips16 code */
 #define TARGET_MIPS16		((target_flags & MASK_MIPS16) != 0)
 /* Generate mips16e code. Default 16bit ASE for mips32* and mips64* */
@@ -377,7 +374,7 @@ struct mips_cpu_info {
       else								\
 	builtin_define ("__mips_fpr=32");				\
 									\
-      if (mips_base_compression_flags & MASK_MIPS16)			\
+      if (mips_base_mips16)						\
 	builtin_define ("__mips16");					\
 									\
       if (TARGET_MIPS3D)						\
@@ -386,9 +383,6 @@ struct mips_cpu_info {
       if (TARGET_SMARTMIPS)						\
 	builtin_define ("__mips_smartmips");				\
 									\
-      if (mips_base_compression_flags & MASK_MICROMIPS)			\
-	builtin_define ("__mips_micromips");				\
-									\
       if (TARGET_MCU)							\
 	builtin_define ("__mips_mcu");					\
 									\
@@ -708,7 +702,7 @@ struct mips_cpu_info {
        |march=r10000|march=r12000|march=r14000|march=r16000:-mips4} \
      %{march=mips32|march=4kc|march=4km|march=4kp|march=4ksc:-mips32} \
      %{march=mips32r2|march=m4k|march=4ke*|march=4ksd|march=24k* \
-       |march=34k*|march=74k*|march=m14k*|march=1004k*: -mips32r2} \
+       |march=34k*|march=74k*|march=1004k*: -mips32r2} \
      %{march=mips64|march=5k*|march=20k*|march=sb1*|march=sr71000 \
        |march=xlr|march=loongson3a: -mips64} \
      %{march=mips64r2|march=octeon|march=xlp: -mips64r2} \
@@ -722,7 +716,7 @@ struct mips_cpu_info {
   "%{mhard-float|msoft-float|mno-float|march=mips*:; \
      march=vr41*|march=m4k|march=4k*|march=24kc|march=24kec \
      |march=34kc|march=34kn|march=74kc|march=1004kc|march=5kc \
-     |march=m14k*|march=octeon|march=xlr: -msoft-float;		  \
+     |march=octeon|march=xlr: -msoft-float;		  \
      march=*: -mhard-float}"
 
 /* A spec condition that matches 32-bit options.  It only works if
@@ -995,8 +989,7 @@ struct mips_cpu_info {
 				     || ISA_MIPS64R2))
 
 /* ISA has lwxs instruction (load w/scaled index address.  */
-#define ISA_HAS_LWXS		((TARGET_SMARTMIPS || TARGET_MICROMIPS) \
-				 && !TARGET_MIPS16)
+#define ISA_HAS_LWXS		(TARGET_SMARTMIPS && !TARGET_MIPS16)
 
 /* ISA has lbx, lbux, lhx, lhx, lhux, lwx, lwux, or ldx instruction. */
 #define ISA_HAS_LBX		(TARGET_OCTEON2)
@@ -1019,8 +1012,7 @@ struct mips_cpu_info {
    and "addiu $4,$4,1".  */
 #define ISA_HAS_LOAD_DELAY	(ISA_MIPS1				\
 				 && !TARGET_MIPS3900			\
-				 && !TARGET_MIPS16			\
-				 && !TARGET_MICROMIPS)
+				 && !TARGET_MIPS16)
 
 /* Likewise mtc1 and mfc1.  */
 #define ISA_HAS_XFER_DELAY	(mips_isa <= 3			\
@@ -1131,7 +1123,6 @@ struct mips_cpu_info {
 %{G*} %(endian_spec) %{mips1} %{mips2} %{mips3} %{mips4} \
 %{mips32*} %{mips64*} \
 %{mips16} %{mno-mips16:-no-mips16} \
-%{mmicromips} %{mno-micromips} \
 %{mips3d} %{mno-mips3d:-no-mips3d} \
 %{mdmx} %{mno-mdmx:-no-mdmx} \
 %{mdsp} %{mno-dsp} \
@@ -1681,8 +1672,6 @@ struct mips_cpu_info {
   ((unsigned int) ((int) (REGNO) - GP_REG_FIRST) < GP_REG_NUM)
 #define M16_REG_P(REGNO) \
   (((REGNO) >= 2 && (REGNO) <= 7) || (REGNO) == 16 || (REGNO) == 17)
-#define M16STORE_REG_P(REGNO) \
-  (((REGNO) >= 2 && (REGNO) <= 7) || (REGNO) == 0 || (REGNO) == 17)
 #define FP_REG_P(REGNO)  \
   ((unsigned int) ((int) (REGNO) - FP_REG_FIRST) < FP_REG_NUM)
 #define MD_REG_P(REGNO) \
@@ -2045,7 +2034,6 @@ enum reg_class
 #define SMALL_INT(X) SMALL_OPERAND (INTVAL (X))
 #define SMALL_INT_UNSIGNED(X) SMALL_OPERAND_UNSIGNED (INTVAL (X))
 #define LUI_INT(X) LUI_OPERAND (INTVAL (X))
-#define UMIPS_12BIT_OFFSET_P(OFFSET) (IN_RANGE (OFFSET, -2048, 2047))
 
 /* The HI and LO registers can only be reloaded via the general
    registers.  Condition code registers can only be loaded to the
@@ -2464,32 +2452,17 @@ typedef struct mips_args {
    all calls should use assembly macros.  Otherwise, all indirect
    calls should use "jr" or "jalr"; we will arrange to restore $gp
    afterwards if necessary.  Finally, we can only generate direct
-   calls for -mabicalls by temporarily switching to non-PIC mode.
-
-   For microMIPS jal(r), we try to generate jal(r)s when a 16-bit
-   instruction is in the delay slot of jal(r).  */
+   calls for -mabicalls by temporarily switching to non-PIC mode.  */
 #define MIPS_CALL(INSN, OPERANDS, TARGET_OPNO, SIZE_OPNO)	\
   (TARGET_USE_GOT && !TARGET_EXPLICIT_RELOCS			\
    ? "%*" INSN "\t%" #TARGET_OPNO "%/"				\
+   : (REG_P (OPERANDS[TARGET_OPNO])				\
+      && mips_get_pic_call_symbol (OPERANDS, SIZE_OPNO))	\
+   ? ("%*.reloc\t1f,R_MIPS_JALR,%" #SIZE_OPNO "\n"		\
+      "1:\t" INSN "r\t%" #TARGET_OPNO "%/")			\
    : REG_P (OPERANDS[TARGET_OPNO])				\
-   ? (mips_get_pic_call_symbol (OPERANDS, SIZE_OPNO)		\
-      ? ("%*.reloc\t1f,R_MIPS_JALR,%" #SIZE_OPNO "\n"		\
-	 "1:\t" INSN "r\t%" #TARGET_OPNO "%/")			\
-      : TARGET_MICROMIPS && !TARGET_INTERLINK_COMPRESSED	\
-      ? "%*" INSN "r%!\t%" #TARGET_OPNO "%/"			\
-      : "%*" INSN "r\t%" #TARGET_OPNO "%/")			\
+   ? "%*" INSN "r\t%" #TARGET_OPNO "%/"				\
    : MIPS_ABSOLUTE_JUMP ("%*" INSN "\t%" #TARGET_OPNO "%/"))
-
-/* Similar to MIPS_CALL, but this is for MICROMIPS "j" to generate
-   "jrc" when nop is in the delay slot of "jr".  */
-
-#define MICROMIPS_J(INSN, OPERANDS, OPNO)			\
-  (TARGET_USE_GOT && !TARGET_EXPLICIT_RELOCS			\
-   ? "%*j\t%" #OPNO "%/"					\
-   : REG_P (OPERANDS[OPNO])					\
-   ? "%*jr%:\t%" #OPNO						\
-   : MIPS_ABSOLUTE_JUMP ("%*" INSN "\t%" #OPNO "%/"))
-
 
 /* Control the assembler format that we output.  */
 
@@ -2904,7 +2877,7 @@ extern enum processor mips_tune;        /* which cpu to schedule for */
 extern int mips_isa;			/* architectural level */
 extern const struct mips_cpu_info *mips_arch_info;
 extern const struct mips_cpu_info *mips_tune_info;
-extern unsigned int mips_base_compression_flags;
+extern bool mips_base_mips16;
 extern GTY(()) struct target_globals *mips16_globals;
 #endif
 
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index bbcc5c9..7aa461d 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -342,14 +342,13 @@
 ;; syncloop	memory atomic operation implemented as a sync loop
 ;; nop		no operation
 ;; ghost	an instruction that produces no real code
-;; multimem	microMIPS multiword load and store
 (define_attr "type"
   "unknown,branch,jump,call,load,fpload,fpidxload,store,fpstore,fpidxstore,
    prefetch,prefetchx,condmove,mtc,mfc,mthi,mtlo,mfhi,mflo,const,arith,logical,
    shift,slt,signext,clz,pop,trap,imul,imul3,imul3nc,imadd,idiv,idiv3,move,
    fmove,fadd,fmul,fmadd,fdiv,frdiv,frdiv1,frdiv2,fabs,fneg,fcmp,fcvt,fsqrt,
    frsqrt,frsqrt1,frsqrt2,dspmac,dspmacsat,accext,accmod,dspalu,dspalusat,
-   multi,atomic,syncloop,nop,ghost,multimem"
+   multi,atomic,syncloop,nop,ghost"
   (cond [(eq_attr "jal" "!unset") (const_string "call")
 	 (eq_attr "got" "load") (const_string "load")
 
@@ -414,15 +413,9 @@
 
 ;; Length of instruction in bytes.
 (define_attr "length" ""
-   (cond [(and (eq_attr "extended_mips16" "yes")
-	       (match_test "TARGET_MIPS16"))
-	  (const_int 8)
-
-	  ;; Direct microMIPS branch instructions have a range of
-	  ;; [-0x10000,0xfffe], otherwise the range is [-0x20000,0x1fffc].
-	  ;; If a branch is outside this range, we have a choice of two
-	  ;; sequences.
-	  ;;
+   (cond [;; Direct branch instructions have a range of [-0x20000,0x1fffc],
+	  ;; relative to the address of the delay slot.  If a branch is
+	  ;; outside this range, we have a choice of two sequences.
 	  ;; For PIC, an out-of-range branch like:
 	  ;;
 	  ;;	bne	r1,r2,target
@@ -458,15 +451,8 @@
 	  ;; from the shorten_branches reference address.
 	  (and (eq_attr "type" "branch")
 	       (not (match_test "TARGET_MIPS16")))
-	  (cond [;; Any variant can handle the 17-bit range.
-		 (and (le (minus (match_dup 0) (pc)) (const_int 65532))
-		      (le (minus (pc) (match_dup 0)) (const_int 65534)))
-		   (const_int 4)
-
-		 ;; The 18-bit range is OK other than for microMIPS.
-		 (and (not (match_test "TARGET_MICROMIPS"))
-		      (and (le (minus (match_dup 0) (pc)) (const_int 131064))
-		      	   (le (minus (pc) (match_dup 0)) (const_int 131068))))
+	  (cond [(and (le (minus (match_dup 0) (pc)) (const_int 131064))
+		      (le (minus (pc) (match_dup 0)) (const_int 131068)))
 		   (const_int 4)
 
 		 ;; The non-PIC case: branch, first delay slot, and J.
@@ -726,9 +712,6 @@
 ;; modes.
 (define_mode_iterator GPR2 [SI (DI "TARGET_64BIT")])
 
-(define_mode_iterator MOVEP1 [SI SF])
-(define_mode_iterator MOVEP2 [SI SF])
-
 ;; This mode iterator allows :HILO to be used as the mode of the
 ;; concatenated HI and LO registers.
 (define_mode_iterator HILO [(DI "!TARGET_64BIT") (TI "TARGET_64BIT")])
@@ -3954,7 +3937,7 @@
 (define_insn "mov_<load>l"
   [(set (match_operand:GPR 0 "register_operand" "=d")
 	(unspec:GPR [(match_operand:BLK 1 "memory_operand" "m")
-		     (match_operand:QI 2 "memory_operand" "ZC")]
+		     (match_operand:QI 2 "memory_operand" "m")]
 		    UNSPEC_LOAD_LEFT))]
   "!TARGET_MIPS16 && mips_mem_fits_mode_p (<MODE>mode, operands[1])"
   "<load>l\t%0,%2"
@@ -3964,7 +3947,7 @@
 (define_insn "mov_<load>r"
   [(set (match_operand:GPR 0 "register_operand" "=d")
 	(unspec:GPR [(match_operand:BLK 1 "memory_operand" "m")
-		     (match_operand:QI 2 "memory_operand" "ZC")
+		     (match_operand:QI 2 "memory_operand" "m")
 		     (match_operand:GPR 3 "register_operand" "0")]
 		    UNSPEC_LOAD_RIGHT))]
   "!TARGET_MIPS16 && mips_mem_fits_mode_p (<MODE>mode, operands[1])"
@@ -3975,7 +3958,7 @@
 (define_insn "mov_<store>l"
   [(set (match_operand:BLK 0 "memory_operand" "=m")
 	(unspec:BLK [(match_operand:GPR 1 "reg_or_0_operand" "dJ")
-		     (match_operand:QI 2 "memory_operand" "ZC")]
+		     (match_operand:QI 2 "memory_operand" "m")]
 		    UNSPEC_STORE_LEFT))]
   "!TARGET_MIPS16 && mips_mem_fits_mode_p (<MODE>mode, operands[0])"
   "<store>l\t%z1,%2"
@@ -3985,7 +3968,7 @@
 (define_insn "mov_<store>r"
   [(set (match_operand:BLK 0 "memory_operand" "+m")
 	(unspec:BLK [(match_operand:GPR 1 "reg_or_0_operand" "dJ")
-		     (match_operand:QI 2 "memory_operand" "ZC")
+		     (match_operand:QI 2 "memory_operand" "m")
 		     (match_dup 0)]
 		    UNSPEC_STORE_RIGHT))]
   "!TARGET_MIPS16 && mips_mem_fits_mode_p (<MODE>mode, operands[0])"
@@ -5464,14 +5447,6 @@
 	 (pc)))]
   "!TARGET_MIPS16"
 {
-  /* For a simple BNEZ or BEQZ microMIPS branch.  */
-  if (TARGET_MICROMIPS
-      && operands[3] == const0_rtx
-      && get_attr_length (insn) <= 8)
-    return mips_output_conditional_branch (insn, operands,
-					   "%*b%C1z%:\t%2,%0",
-					   "%*b%N1z%:\t%2,%0");
-
   return mips_output_conditional_branch (insn, operands,
 					 MIPS_BRANCH ("b%C1", "%2,%z3,%0"),
 					 MIPS_BRANCH ("b%N1", "%2,%z3,%0"));
@@ -5488,14 +5463,6 @@
 	 (label_ref (match_operand 0 "" ""))))]
   "!TARGET_MIPS16"
 {
-  /* For a simple BNEZ or BEQZ microMIPS branch.  */
-  if (TARGET_MICROMIPS
-      && operands[3] == const0_rtx
-      && get_attr_length (insn) <= 8)
-    return mips_output_conditional_branch (insn, operands,
-					   "%*b%N0z%:\t%2,%1",
-					   "%*b%C0z%:\t%2,%1");
-
   return mips_output_conditional_branch (insn, operands,
 					 MIPS_BRANCH ("b%N1", "%2,%z3,%0"),
 					 MIPS_BRANCH ("b%C1", "%2,%z3,%0"));
@@ -5799,14 +5766,7 @@
   [(set (pc)
 	(label_ref (match_operand 0)))]
   "!TARGET_MIPS16 && TARGET_ABSOLUTE_JUMPS"
-{
-  /* Use a branch for microMIPS.  The assembler will choose
-     a 16-bit branch, a 32-bit branch, or a 32-bit jump.  */
-  if (TARGET_MICROMIPS && !TARGET_ABICALLS_PIC2)
-    return "%*b\t%l0%/";
-  else
-    return MIPS_ABSOLUTE_JUMP ("%*j\t%l0%/");
-}
+  { return MIPS_ABSOLUTE_JUMP ("%*j\t%l0%/"); }
   [(set_attr "type" "jump")])
 
 (define_insn "*jump_pic"
@@ -5869,12 +5829,7 @@
 (define_insn "indirect_jump_<mode>"
   [(set (pc) (match_operand:P 0 "register_operand" "d"))]
   ""
-{
-  if (TARGET_MICROMIPS)
-    return "%*jr%:\t%0";
-  else
-    return "%*j\t%0%/";
-}
+  "%*j\t%0%/"
   [(set_attr "type" "jump")
    (set_attr "mode" "none")])
 
@@ -5918,12 +5873,7 @@
 	(match_operand:P 0 "register_operand" "d"))
    (use (label_ref (match_operand 1 "" "")))]
   ""
-{
-  if (TARGET_MICROMIPS)
-    return "%*jr%:\t%0";
-  else
-    return "%*j\t%0%/";
-}
+  "%*j\t%0%/"
   [(set_attr "type" "jump")
    (set_attr "mode" "none")])
 
@@ -6144,12 +6094,7 @@
   [(any_return)
    (use (match_operand 0 "pmode_register_operand" ""))]
   ""
-{
-  if (TARGET_MICROMIPS)
-    return "%*jr%:\t%0";
-  else
-    return "%*j\t%0%/";
-}
+  "%*j\t%0%/"
   [(set_attr "type"	"jump")
    (set_attr "mode"	"none")])
 
@@ -6405,12 +6350,7 @@
   [(call (mem:SI (match_operand 0 "call_insn_operand" "j,S"))
 	 (match_operand 1 "" ""))]
   "TARGET_SIBCALLS && SIBLING_CALL_P (insn)"
-{
-  if (TARGET_MICROMIPS)
-    return MICROMIPS_J ("j", operands, 0);
-  else
-    return MIPS_CALL ("j", operands, 0, 1);
-}
+  { return MIPS_CALL ("j", operands, 0, 1); }
   [(set_attr "jal" "indirect,direct")
    (set_attr "jal_macro" "no")])
 
@@ -6431,12 +6371,7 @@
         (call (mem:SI (match_operand 1 "call_insn_operand" "j,S"))
               (match_operand 2 "" "")))]
   "TARGET_SIBCALLS && SIBLING_CALL_P (insn)"
-{
-  if (TARGET_MICROMIPS)
-    return MICROMIPS_J ("j", operands, 1);
-  else
-    return MIPS_CALL ("j", operands, 1, 2);
-}
+  { return MIPS_CALL ("j", operands, 1, 2); }
   [(set_attr "jal" "indirect,direct")
    (set_attr "jal_macro" "no")])
 
@@ -6448,12 +6383,7 @@
 	(call (mem:SI (match_dup 1))
 	      (match_dup 2)))]
   "TARGET_SIBCALLS && SIBLING_CALL_P (insn)"
-{
-  if (TARGET_MICROMIPS)
-    return MICROMIPS_J ("j", operands, 1);
-  else
-    return MIPS_CALL ("j", operands, 1, 2);
-}
+  { return MIPS_CALL ("j", operands, 1, 2); }
   [(set_attr "jal" "indirect,direct")
    (set_attr "jal_macro" "no")])
 
@@ -6699,7 +6629,7 @@
 
 
 (define_insn "prefetch"
-  [(prefetch (match_operand:QI 0 "address_operand" "ZD")
+  [(prefetch (match_operand:QI 0 "address_operand" "p")
 	     (match_operand 1 "const_int_operand" "n")
 	     (match_operand 2 "const_int_operand" "n"))]
   "ISA_HAS_PREFETCH && TARGET_EXPLICIT_RELOCS"
@@ -6992,9 +6922,6 @@
 ; MIPS fixed-point instructions.
 (include "mips-fixed.md")
 
-; microMIPS patterns.
-(include "micromips.md")
-
 ; ST-Microelectronics Loongson-2E/2F-specific patterns.
 (include "loongson.md")
 
diff --git a/gcc/config/mips/mips.opt b/gcc/config/mips/mips.opt
index f9e88b3..d8ef2e7 100644
--- a/gcc/config/mips/mips.opt
+++ b/gcc/config/mips/mips.opt
@@ -217,13 +217,9 @@ mhard-float
 Target Report RejectNegative InverseMask(SOFT_FLOAT_ABI, HARD_FLOAT_ABI)
 Allow the use of hardware floating-point ABI and instructions
 
-minterlink-compressed
-Target Report Var(TARGET_INTERLINK_COMPRESSED) Init(0)
-Generate code that is link-compatible with MIPS16 and microMIPS code.
-
 minterlink-mips16
-Target Report Var(TARGET_INTERLINK_COMPRESSED) Init(0)
-An alias for minterlink-compressed provided for backward-compatibility.
+Target Report Var(TARGET_INTERLINK_MIPS16) Init(0)
+Generate code that can be safely linked with MIPS16 code.
 
 mips
 Target RejectNegative Joined ToLower Enum(mips_mips_opt_value) Var(mips_isa_option)
@@ -265,10 +261,6 @@ mmemcpy
 Target Report Mask(MEMCPY)
 Don't optimize block moves
 
-mmicromips
-Target Report Mask(MICROMIPS)
-Use microMIPS instructions
-
 mmt
 Target Report Var(TARGET_MT)
 Allow the use of MT instructions
diff --git a/gcc/config/mips/predicates.md b/gcc/config/mips/predicates.md
index c6d7707..397d541 100644
--- a/gcc/config/mips/predicates.md
+++ b/gcc/config/mips/predicates.md
@@ -122,15 +122,6 @@
 		    ? M16_REG_P (REGNO (op))
 		    : GP_REG_P (REGNO (op))")))
 
-(define_predicate "movep_src_register"
-  (and (match_code "reg")
-       (ior (match_test ("IN_RANGE (REGNO (op), 2, 3)"))
-	    (match_test ("IN_RANGE (REGNO (op), 16, 20)")))))
-
-(define_predicate "movep_src_operand"
-  (ior (match_operand 0 "const_0_operand")
-       (match_operand 0 "movep_src_register")))
-
 (define_predicate "lo_operand"
   (and (match_code "reg")
        (match_test "REGNO (op) == LO_REGNUM")))
@@ -380,8 +371,3 @@
 (define_predicate "mem_noofs_operand"
   (and (match_code "mem")
        (match_code "reg" "0")))
-
-;; Return 1 if the operand is in non-volatile memory.
-(define_predicate "non_volatile_mem_operand"
-  (and (match_operand 0 "memory_operand")
-       (not (match_test "MEM_VOLATILE_P (op)"))))
diff --git a/gcc/config/mips/sync.md b/gcc/config/mips/sync.md
index d40c224..3cd8343 100644
--- a/gcc/config/mips/sync.md
+++ b/gcc/config/mips/sync.md
@@ -59,7 +59,7 @@
 ;; Can be removed in favor of atomic_compare_and_swap below.
 (define_insn "sync_compare_and_swap<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
 	(unspec_volatile:GPR [(match_operand:GPR 2 "reg_or_0_operand" "dJ,dJ")
 			      (match_operand:GPR 3 "arith_operand" "I,d")]
@@ -89,7 +89,7 @@
 ;; Helper insn for mips_expand_atomic_qihi.
 (define_insn "compare_and_swap_12"
   [(set (match_operand:SI 0 "register_operand" "=&d,&d")
-	(match_operand:SI 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:SI 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
 	(unspec_volatile:SI [(match_operand:SI 2 "register_operand" "d,d")
 			     (match_operand:SI 3 "register_operand" "d,d")
@@ -106,7 +106,7 @@
    (set_attr "sync_insn1_op2" "5")])
 
 (define_insn "sync_add<mode>"
-  [(set (match_operand:GPR 0 "memory_operand" "+ZR,ZR")
+  [(set (match_operand:GPR 0 "memory_operand" "+R,R")
 	(unspec_volatile:GPR
           [(plus:GPR (match_dup 0)
 		     (match_operand:GPR 1 "arith_operand" "I,d"))]
@@ -134,7 +134,7 @@
 
 ;; Helper insn for sync_<optab><mode>
 (define_insn "sync_<optab>_12"
-  [(set (match_operand:SI 0 "memory_operand" "+ZR")
+  [(set (match_operand:SI 0 "memory_operand" "+R")
 	(unspec_volatile:SI
           [(match_operand:SI 1 "register_operand" "d")
 	   (match_operand:SI 2 "register_operand" "d")
@@ -174,7 +174,7 @@
 ;; Helper insn for sync_old_<optab><mode>
 (define_insn "sync_old_<optab>_12"
   [(set (match_operand:SI 0 "register_operand" "=&d")
-	(match_operand:SI 1 "memory_operand" "+ZR"))
+	(match_operand:SI 1 "memory_operand" "+R"))
    (set (match_dup 1)
 	(unspec_volatile:SI
           [(match_operand:SI 2 "register_operand" "d")
@@ -217,7 +217,7 @@
 (define_insn "sync_new_<optab>_12"
   [(set (match_operand:SI 0 "register_operand" "=&d")
 	(unspec_volatile:SI
-          [(match_operand:SI 1 "memory_operand" "+ZR")
+          [(match_operand:SI 1 "memory_operand" "+R")
 	   (match_operand:SI 2 "register_operand" "d")
 	   (match_operand:SI 3 "register_operand" "d")
 	   (atomic_hiqi_op:SI (match_dup 0)
@@ -257,7 +257,7 @@
 
 ;; Helper insn for sync_nand<mode>
 (define_insn "sync_nand_12"
-  [(set (match_operand:SI 0 "memory_operand" "+ZR")
+  [(set (match_operand:SI 0 "memory_operand" "+R")
 	(unspec_volatile:SI
           [(match_operand:SI 1 "register_operand" "d")
 	   (match_operand:SI 2 "register_operand" "d")
@@ -296,7 +296,7 @@
 ;; Helper insn for sync_old_nand<mode>
 (define_insn "sync_old_nand_12"
   [(set (match_operand:SI 0 "register_operand" "=&d")
-	(match_operand:SI 1 "memory_operand" "+ZR"))
+	(match_operand:SI 1 "memory_operand" "+R"))
    (set (match_dup 1)
 	(unspec_volatile:SI
           [(match_operand:SI 2 "register_operand" "d")
@@ -337,7 +337,7 @@
 (define_insn "sync_new_nand_12"
   [(set (match_operand:SI 0 "register_operand" "=&d")
 	(unspec_volatile:SI
-          [(match_operand:SI 1 "memory_operand" "+ZR")
+          [(match_operand:SI 1 "memory_operand" "+R")
 	   (match_operand:SI 2 "register_operand" "d")
 	   (match_operand:SI 3 "register_operand" "d")
 	   (match_operand:SI 4 "reg_or_0_operand" "dJ")]
@@ -360,7 +360,7 @@
    (set_attr "sync_insn1_op2" "4")])
 
 (define_insn "sync_sub<mode>"
-  [(set (match_operand:GPR 0 "memory_operand" "+ZR")
+  [(set (match_operand:GPR 0 "memory_operand" "+R")
 	(unspec_volatile:GPR
           [(minus:GPR (match_dup 0)
 		      (match_operand:GPR 1 "register_operand" "d"))]
@@ -374,7 +374,7 @@
 ;; Can be removed in favor of atomic_fetch_add below.
 (define_insn "sync_old_add<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
 	(unspec_volatile:GPR
           [(plus:GPR (match_dup 1)
@@ -389,7 +389,7 @@
 
 (define_insn "sync_old_sub<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R"))
    (set (match_dup 1)
 	(unspec_volatile:GPR
           [(minus:GPR (match_dup 1)
@@ -404,7 +404,7 @@
 
 (define_insn "sync_new_add<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-        (plus:GPR (match_operand:GPR 1 "memory_operand" "+ZR,ZR")
+        (plus:GPR (match_operand:GPR 1 "memory_operand" "+R,R")
 		  (match_operand:GPR 2 "arith_operand" "I,d")))
    (set (match_dup 1)
 	(unspec_volatile:GPR
@@ -420,7 +420,7 @@
 
 (define_insn "sync_new_sub<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d")
-        (minus:GPR (match_operand:GPR 1 "memory_operand" "+ZR")
+        (minus:GPR (match_operand:GPR 1 "memory_operand" "+R")
 		   (match_operand:GPR 2 "register_operand" "d")))
    (set (match_dup 1)
 	(unspec_volatile:GPR
@@ -435,7 +435,7 @@
    (set_attr "sync_insn1_op2" "2")])
 
 (define_insn "sync_<optab><mode>"
-  [(set (match_operand:GPR 0 "memory_operand" "+ZR,ZR")
+  [(set (match_operand:GPR 0 "memory_operand" "+R,R")
 	(unspec_volatile:GPR
           [(fetchop_bit:GPR (match_operand:GPR 1 "uns_arith_operand" "K,d")
 			      (match_dup 0))]
@@ -448,7 +448,7 @@
 
 (define_insn "sync_old_<optab><mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
 	(unspec_volatile:GPR
           [(fetchop_bit:GPR (match_operand:GPR 2 "uns_arith_operand" "K,d")
@@ -463,7 +463,7 @@
 
 (define_insn "sync_new_<optab><mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
 	(unspec_volatile:GPR
           [(fetchop_bit:GPR (match_operand:GPR 2 "uns_arith_operand" "K,d")
@@ -478,7 +478,7 @@
    (set_attr "sync_insn1_op2" "2")])
 
 (define_insn "sync_nand<mode>"
-  [(set (match_operand:GPR 0 "memory_operand" "+ZR,ZR")
+  [(set (match_operand:GPR 0 "memory_operand" "+R,R")
 	(unspec_volatile:GPR [(match_operand:GPR 1 "uns_arith_operand" "K,d")]
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
@@ -490,7 +490,7 @@
 
 (define_insn "sync_old_nand<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
         (unspec_volatile:GPR [(match_operand:GPR 2 "uns_arith_operand" "K,d")]
 	 UNSPEC_SYNC_OLD_OP))]
@@ -504,7 +504,7 @@
 
 (define_insn "sync_new_nand<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
 	(unspec_volatile:GPR [(match_operand:GPR 2 "uns_arith_operand" "K,d")]
 	 UNSPEC_SYNC_NEW_OP))]
@@ -519,7 +519,7 @@
 
 (define_insn "sync_lock_test_and_set<mode>"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(match_operand:GPR 1 "memory_operand" "+ZR,ZR"))
+	(match_operand:GPR 1 "memory_operand" "+R,R"))
    (set (match_dup 1)
 	(unspec_volatile:GPR [(match_operand:GPR 2 "arith_operand" "I,d")]
 	 UNSPEC_SYNC_EXCHANGE))]
@@ -546,7 +546,7 @@
 
 (define_insn "test_and_set_12"
   [(set (match_operand:SI 0 "register_operand" "=&d")
-	(match_operand:SI 1 "memory_operand" "+ZR"))
+	(match_operand:SI 1 "memory_operand" "+R"))
    (set (match_dup 1)
 	(unspec_volatile:SI [(match_operand:SI 2 "register_operand" "d")
 			     (match_operand:SI 3 "register_operand" "d")
@@ -576,7 +576,7 @@
 	;; TODO: the obscuring unspec can be relaxed for permissive memory
 	;; models.
 	;; Same applies to other atomic_* patterns.
-	(unspec_volatile:GPR [(match_operand:GPR 2 "memory_operand" "+ZR,ZR")
+	(unspec_volatile:GPR [(match_operand:GPR 2 "memory_operand" "+R,R")
 			      (match_operand:GPR 3 "reg_or_0_operand" "dJ,dJ")]
 	 UNSPEC_ATOMIC_COMPARE_AND_SWAP))
    (set (match_operand:GPR 1 "register_operand" "=&d,&d")
@@ -629,7 +629,7 @@
 
 (define_insn "atomic_exchange<mode>_llsc"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(unspec_volatile:GPR [(match_operand:GPR 1 "memory_operand" "+ZR,ZR")]
+	(unspec_volatile:GPR [(match_operand:GPR 1 "memory_operand" "+R,R")]
 	 UNSPEC_ATOMIC_EXCHANGE))
    (set (match_dup 1)
 	(unspec_volatile:GPR [(match_operand:GPR 2 "arith_operand" "I,d")]
@@ -684,7 +684,7 @@
 
 (define_insn "atomic_fetch_add<mode>_llsc"
   [(set (match_operand:GPR 0 "register_operand" "=&d,&d")
-	(unspec_volatile:GPR [(match_operand:GPR 1 "memory_operand" "+ZR,ZR")]
+	(unspec_volatile:GPR [(match_operand:GPR 1 "memory_operand" "+R,R")]
 	 UNSPEC_ATOMIC_FETCH_OP))
    (set (match_dup 1)
 	(unspec_volatile:GPR
diff --git a/gcc/config/mips/t-sde b/gcc/config/mips/t-sde
index 15f506f..075f8f3 100644
--- a/gcc/config/mips/t-sde
+++ b/gcc/config/mips/t-sde
@@ -16,8 +16,8 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-MULTILIB_OPTIONS = EL/EB mips32/mips32r2/mips64/mips64r2 mips16/mmicromips msoft-float/mfp64 mcode-readable=no
-MULTILIB_DIRNAMES = el eb mips32 mips32r2 mips64 mips64r2 mips16 micromips sof f64 spram
+MULTILIB_OPTIONS = EL/EB mips32/mips32r2/mips64/mips64r2 mips16 msoft-float/mfp64 mcode-readable=no
+MULTILIB_DIRNAMES = el eb mips32 mips32r2 mips64 mips64r2 mips16 sof f64 spram
 MULTILIB_MATCHES = EL=mel EB=meb
 
 # The -mfp64 option is only valid in conjunction with -mips32r2.