[gcc-6] 88/401: * Fix PR target/69885, bootstrap error on m68k.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit aca3932f45970b9de30c2b5d2582324742fa43a1
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Feb 22 11:37:33 2016 +0000

      * Fix PR target/69885, bootstrap error on m68k.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8685 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog            |  1 +
 debian/patches/pr69885.diff | 55 +++++++++++++++++++++++++++++++++++++++++++++
 debian/rules.patch          |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 295d89c..006e0fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gcc-6 (6-20160220-2) UNRELEASED; urgency=medium
 
   * Install missing architecture specific plugin header files.
+  * Fix PR target/69885, bootstrap error on m68k.
 
  -- Matthias Klose <doko at debian.org>  Sun, 21 Feb 2016 16:13:26 +0100
 
diff --git a/debian/patches/pr69885.diff b/debian/patches/pr69885.diff
new file mode 100644
index 0000000..be5f598
--- /dev/null
+++ b/debian/patches/pr69885.diff
@@ -0,0 +1,55 @@
+# DP: Proposed fix for PR target/69885 (m68k)
+
+2016-02-22  Jakub Jelinek  <jakub at redhat.com>
+
+	PR target/69885
+	* config/m68k/m68k.md (ashldi3, ashrdi3, lshrdi3): Use
+	SImode for last match_operand.
+
+	* gcc.dg/pr69885.c: New test.
+
+--- a/src/gcc/config/m68k/m68k.md.jj	2016-01-20 10:55:16.000000000 +0100
++++ a/src/gcc/config/m68k/m68k.md	2016-02-22 11:14:01.789697673 +0100
+@@ -4544,7 +4544,7 @@ (define_insn "*ashldi3"
+ (define_expand "ashldi3"
+   [(set (match_operand:DI 0 "register_operand" "")
+ 	(ashift:DI (match_operand:DI 1 "register_operand" "")
+-		   (match_operand 2 "const_int_operand" "")))]
++		   (match_operand:SI 2 "const_int_operand" "")))]
+   "!TARGET_COLDFIRE"
+ {
+   /* ???  This is a named pattern like this is not allowed to FAIL based
+@@ -4813,7 +4813,7 @@ (define_insn "ashrdi_const"
+ (define_expand "ashrdi3"
+   [(set (match_operand:DI 0 "register_operand" "")
+ 	(ashiftrt:DI (match_operand:DI 1 "register_operand" "")
+-		     (match_operand 2 "const_int_operand" "")))]
++		     (match_operand:SI 2 "const_int_operand" "")))]
+   "!TARGET_COLDFIRE"
+ {
+   /* ???  This is a named pattern like this is not allowed to FAIL based
+@@ -5082,7 +5082,7 @@ (define_insn "*lshrdi3_const"
+ (define_expand "lshrdi3"
+   [(set (match_operand:DI 0 "register_operand" "")
+ 	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
+-		     (match_operand 2 "const_int_operand" "")))]
++		     (match_operand:SI 2 "const_int_operand" "")))]
+   "!TARGET_COLDFIRE"
+ {
+   /* ???  This is a named pattern like this is not allowed to FAIL based
+--- a/src/gcc/testsuite/gcc.dg/pr69885.c.jj	2016-02-22 11:14:50.981023120 +0100
++++ a/src/gcc/testsuite/gcc.dg/pr69885.c	2016-02-22 11:13:45.000000000 +0100
+@@ -0,0 +1,13 @@
++/* PR target/69885 */
++/* { dg-do compile } */
++/* { dg-options "-O2" } */
++/* { dg-additional-options "-m68000" { target m68k*-*-* } } */
++
++void bar (void);
++
++void
++foo (long long x)
++{
++  if (x >> 1)
++    bar ();
++}
diff --git a/debian/rules.patch b/debian/rules.patch
index 0f96080..740343a 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -82,6 +82,7 @@ debian_patches += \
 	ada-gnattools-ldflags \
 	libjit-ldflags \
 	pr69895 \
+	pr69885 \
 
 # this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
 ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git