--- gcc/config/a29k/a29k.md	2018/04/24 18:21:46	1.1.1.3
+++ gcc/config/a29k/a29k.md	2018/04/24 18:29:17	1.1.1.4
@@ -16,7 +16,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.
 
@@ -1120,32 +1121,12 @@
   ""
   "multiply %0,%1,%2")
 
-(define_insn ""
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-	(subreg:SI
-	 (mult:DI
-	  (sign_extend:DI (match_operand:SI 1 "gpc_reg_operand" "%r"))
-	  (sign_extend:DI (match_operand:SI 2 "gpc_reg_operand" "r"))) 0))
-   (clobber (match_scratch:SI 3 "=&q"))]
-  ""
-  "multm %0,%1,%2")
-
-(define_insn ""
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-	(subreg:SI
-	 (mult:DI
-	  (zero_extend:DI (match_operand:SI 1 "gpc_reg_operand" "%r"))
-	  (zero_extend:DI (match_operand:SI 2 "gpc_reg_operand" "r"))) 0))
-   (clobber (match_scratch:SI 3 "=&q"))]
-  ""
-  "multmu %0,%1,%2")
-
 (define_insn "mulsidi3"
   [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
 	(mult:DI (sign_extend:DI (match_operand:SI 1 "gpc_reg_operand" "r"))
 		 (sign_extend:DI (match_operand:SI 2 "gpc_reg_operand" "r"))))
    (clobber (match_scratch:SI 3 "=&q"))]
-  ""
+  "TARGET_MULTM"
   "multiply %L0,%1,%2\;multm %0,%1,%2"
   [(set_attr "type" "multi")])
 
@@ -1159,20 +1140,22 @@
 		   (mult:SI (match_dup 1) (match_dup 2)))
 	      (clobber (reg:SI 180))])
    (parallel [(set (match_dup 4)
-		   (subreg:SI (mult:DI
-			       (sign_extend:DI (match_dup 1))
-			       (sign_extend:DI (match_dup 2))) 0))
+		   (truncate:SI
+		    (lshiftrt:DI
+		     (mult:DI (sign_extend:DI (match_dup 1))
+			      (sign_extend:DI (match_dup 2)))
+		     (const_int 32))))
 	      (clobber (reg:SI 180))])]
   "
 { operands[3] = operand_subword (operands[0], 1, 1, DImode);
-  operands[4] = operand_subword (operands[1], 0, 1, DImode); } ")
+  operands[4] = operand_subword (operands[0], 0, 1, DImode); } ")
 			    
 (define_insn "umulsidi3"
   [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
 	(mult:DI (zero_extend:DI (match_operand:SI 1 "gpc_reg_operand" "r"))
 		 (zero_extend:DI (match_operand:SI 2 "gpc_reg_operand" "r"))))
    (clobber (match_scratch:SI 3 "=&q"))]
-  ""
+  "TARGET_MULTM"
   "multiplu %L0,%1,%2\;multmu %0,%1,%2"
   [(set_attr "type" "multi")])
 
@@ -1186,12 +1169,15 @@
 		   (mult:SI (match_dup 1) (match_dup 2)))
 	      (clobber (reg:SI 180))])
    (parallel [(set (match_dup 4)
-		   (subreg:SI (mult:DI (zero_extend:DI (match_dup 1))
-				       (zero_extend:DI (match_dup 2))) 0))
+		   (truncate:SI
+		    (lshiftrt:DI
+		     (mult:DI (zero_extend:DI (match_dup 1))
+			      (zero_extend:DI (match_dup 2)))
+		     (const_int 32))))
 	      (clobber (reg:SI 180))])]
   "
 { operands[3] = operand_subword (operands[0], 1, 1, DImode);
-  operands[4] = operand_subword (operands[1], 0, 1, DImode); } ")
+  operands[4] = operand_subword (operands[0], 0, 1, DImode); } ")
 			    
 (define_insn "smulsi3_highpart"
   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
@@ -1201,7 +1187,7 @@
 		   (sign_extend:DI (match_operand:SI 2 "gpc_reg_operand" "r")))
 	  (const_int 32))))
    (clobber (match_scratch:SI 3 "=&q"))]
-  ""
+  "TARGET_MULTM"
   "multm %0,%1,%2")
 
 (define_insn "umulsi3_highpart"
@@ -1212,7 +1198,7 @@
 		   (zero_extend:DI (match_operand:SI 2 "gpc_reg_operand" "r")))
 	  (const_int 32))))
    (clobber (match_scratch:SI 3 "=&q"))]
-  ""
+  "TARGET_MULTM"
   "multmu %0,%1,%2")
 
 ;; NAND