Revert parts of r216820.

	* config/i386/i386.md (movqi_internal): Correct type calculation
	for alternatives 3 and 5.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221840 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 119b403..8e4ca65 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-02  Uros Bizjak  <ubizjak@gmail.com>
+
+       Revert parts of r216820.
+       * config/i386/i386.md (movqi_internal): Correct type calculation
+       for alternatives 3 and 5.
+
 2015-04-02  Jakub Jelinek  <jakub@redhat.com>
 
        PR preprocessor/61977

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 1129b93..cf63afd 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2533,9 +2533,7 @@
 }
   [(set_attr "isa" "*,*,*,*,*,*,*,*,*,*,avx512dq,avx512dq")
    (set (attr "type")
-     (cond [(eq_attr "alternative" "3,5")
-             (const_string "imovx")
-           (eq_attr "alternative" "7,8,9,10,11")
+     (cond [(eq_attr "alternative" "7,8,9,10,11")
              (const_string "mskmov")
            (and (eq_attr "alternative" "5")
                 (not (match_operand:QI 1 "aligned_operand")))
@@ -2546,6 +2544,8 @@
                 (ior (not (match_test "TARGET_PARTIAL_REG_STALL"))
                      (not (match_test "TARGET_QIMODE_MATH"))))
              (const_string "imov")
+           (eq_attr "alternative" "3,5")
+             (const_string "imovx")
            (and (match_test "TARGET_MOVX")
                 (eq_attr "alternative" "2"))
              (const_string "imovx")