--- gcc/config/fx80/fx80.md	2018/04/24 18:10:25	1.1.1.1
+++ gcc/config/fx80/fx80.md	2018/04/24 18:21:45	1.1.1.2
@@ -1,7 +1,7 @@
 ;;- Machine description for GNU C compiler for Alliant FX systems
-;;   Copyright (C) 1989 Free Software Foundation, Inc.
-;;   Adapted from m68k.md by Paul Petersen (petersen@uicsrd.csrd.uiuc.edu)
-;;   and Joe Weening (weening@gang-of-four.stanford.edu).
+;;  Copyright (C) 1989, 1994 Free Software Foundation, Inc.
+;;  Adapted from m68k.md by Paul Petersen (petersen@uicsrd.csrd.uiuc.edu)
+;;  and Joe Weening (weening@gang-of-four.stanford.edu).
 
 ;; This file is part of GNU CC.
 
@@ -1584,27 +1584,6 @@
 
 ;; logical shift instructions
 
-(define_insn "lshlsi3"
-  [(set (match_operand:SI 0 "general_operand" "=d")
-	(lshift:SI (match_operand:SI 1 "general_operand" "0")
-		   (match_operand:SI 2 "general_operand" "dI")))]
-  ""
-  "lsl%.l %2,%0")
-
-(define_insn "lshlhi3"
-  [(set (match_operand:HI 0 "general_operand" "=d")
-	(lshift:HI (match_operand:HI 1 "general_operand" "0")
-		   (match_operand:HI 2 "general_operand" "dI")))]
-  ""
-  "lsl%.w %2,%0")
-
-(define_insn "lshlqi3"
-  [(set (match_operand:QI 0 "general_operand" "=d")
-	(lshift:QI (match_operand:QI 1 "general_operand" "0")
-		   (match_operand:QI 2 "general_operand" "dI")))]
-  ""
-  "lsl%.b %2,%0")
-
 (define_insn "lshrsi3"
   [(set (match_operand:SI 0 "general_operand" "=d")
 	(lshiftrt:SI (match_operand:SI 1 "general_operand" "0")
@@ -2259,11 +2238,11 @@
   "")
 
 (define_expand "casesi_2"
-  [(set (match_operand:SI 0 "" "") (mem:HI (match_operand:SI 1 "" "")))
+  [(set (match_operand:HI 0 "" "") (mem:HI (match_operand:SI 1 "" "")))
    ;; The USE here is so that at least one jump-insn will refer to the label,
    ;; to keep it alive in jump_optimize.
    (parallel [(set (pc)
-		   (plus:SI (pc) (match_dup 0)))
+		   (plus:SI (pc) (sign_extend:SI (match_dup 0))))
 	      (use (label_ref (match_operand 2 "" "")))])]
   ""
   "")
@@ -2274,7 +2253,7 @@
 (define_expand "casesi"
   ;; We don't use these for generating the RTL, but we must describe
   ;; the operands here.
-  [(match_operand:SI 0 "general_operand" "")
+  [(match_operand:HI 0 "general_operand" "")
    (match_operand:SI 1 "immediate_operand" "")
    (match_operand:SI 2 "general_operand" "")
    (match_operand 3 "" "")
@@ -2306,7 +2285,8 @@
 ;; Recognize one of the insns resulting from casesi_2.
 (define_insn ""
   [(set (pc)
-	(plus:SI (pc) (match_operand:HI 0 "general_operand" "r")))
+	(plus:SI (pc)
+		 (sign_extend:SI (match_operand:HI 0 "general_operand" "r"))))
    (use (label_ref (match_operand 1 "" "")))]
   ""
   "*