--- gcc/config/m88k/m88k.md	2018/04/24 18:20:35	1.1.1.3
+++ gcc/config/m88k/m88k.md	2018/04/24 18:27:41	1.1.1.4
@@ -1,5 +1,5 @@
 ;;- Machine description for the Motorola 88000 for GNU C compiler
-;;  Copyright (C) 1988, 89, 90, 91, 93, 1994 Free Software Foundation, Inc.
+;;  Copyright (C) 1988, 92, 93, 94, 1995 Free Software Foundation, Inc.
 ;;  Contributed by Michael Tiemann (tiemann@mcc.com)
 ;;  Additional changes by Michael Meissner (meissner@osf.org)
 ;;  Version 2 port by Tom Wood (twood@pets.sps.mot.com)
@@ -18,7 +18,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU CC; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; the Free Software Foundation, 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 
 ;;- See file "rtl.def" for documentation on define_insn, match_*, et. al.
@@ -28,7 +29,7 @@
 (define_expand "m88k_rcs_id"
   [(match_operand:SI 0 "" "")]
   ""
-  "{ static char rcs_id[] = \"$What: <@(#) m88k.md,v	1.5> $\";
+  "{ static char rcs_id[] = \"$What: <@(#) m88k.md,v	1.1.1.2.2.2> $\";
      FAIL; }")
 
 ;; Attribute describing the processor.  This attribute must match exactly
@@ -2716,7 +2717,7 @@
 
 ;;- multiply instructions
 ;;
-;; There is an unfounded silicon eratta for E.1 requiring that an
+;; There is an unfounded silicon errata for E.1 requiring that an
 ;; immediate constant value in div/divu/mul instructions be less than
 ;; 0x800.  This is no longer provided for.
 
@@ -2728,13 +2729,14 @@
   "mul %0,%1,%2"
   [(set_attr "type" "imul")])
 
-(define_insn "umulsidi3"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-        (mult:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "%r"))
-                 (zero_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
-  "TARGET_88110"
-  "mulu.d %0,%1,%2"
-  [(set_attr "type" "imul")])
+;; Loses for acvs/P60504.c (mod case) on 88110
+;; (define_insn "umulsidi3"
+;;   [(set (match_operand:DI 0 "register_operand" "=r")
+;;         (mult:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "%r"))
+;;                  (zero_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
+;;   "TARGET_88110"
+;;   "mulu.d %0,%1,%2"
+;;   [(set_attr "type" "imul")])
 
 ;; patterns for mixed mode floating point
 ;; Do not define patterns that utilize mixed mode arithmetic that result
@@ -2810,9 +2812,9 @@
 ;; for divide-by-zero or take your chances.  If the div instruction is
 ;; used, the O/S must complete the operation if the operands are
 ;; negative.  The O/S will signal an overflow condition if the most
-;; negative number (-214783648) is divided by negative 1.
+;; negative number (-2147483648) is divided by negative 1.
 ;;
-;; There is an unfounded silicon eratta for E.1 requiring that an
+;; There is an unfounded silicon errata for E.1 requiring that an
 ;; immediate constant value in div/divu/mul instructions be less than
 ;; 0x800.  This is no longer provided for.
 
@@ -3852,7 +3854,7 @@
     emit_jump_insn (gen_casesi_enter (label, index_diff, operands[3]));
   else
     /* Load the table entry and jump to it.  */
-    emit_jump_insn (gen_casesi_jump (gen_reg_rtx (SImode), base, index_diff));
+    emit_jump_insn (gen_casesi_jump (gen_reg_rtx (SImode), base, index_diff, operands[3]));
 
   /* Claim that flow drops into the table so it will be adjacent by not
      emitting a barrier.  */
@@ -3864,10 +3866,18 @@
 	(mem:SI (plus:SI (match_operand:SI 1 "" "")
 			 (mult:SI (match_operand:SI 2 "" "")
 				  (const_int 4)))))
-   (set (pc) (match_dup 0))]
+   (parallel [(set (pc) (match_dup 0))
+              (use (label_ref (match_operand 3 "" "")))])]
   ""
   "")
 
+(define_insn ""
+  [(set (pc) (match_operand:SI 0 "register_operand" "r"))
+   (use (label_ref (match_operand 1 "" "")))]
+  ""
+  "jmp%. %0"
+  [(set_attr "type" "jump")])
+
 ;; The bsr.n instruction is directed to the END of the table.  See
 ;; ASM_OUTPUT_CASE_END.