[gcc-7] 71/354: * Apply proposed patch for PR target/78748.

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit a8a608cbdbc77b1c4096e6a08ed5ff52b64d957d
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Dec 12 15:04:47 2016 +0000

      * Apply proposed patch for PR target/78748.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9177 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog            |  1 +
 debian/patches/pr78748.diff | 53 +++++++++++++++++++++++++++++++++++++++++++++
 debian/rules.patch          |  1 +
 3 files changed, 55 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eb09dde..c816700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gcc-7 (7-20161208-1) UNRELEASED; urgency=medium
   * Build the cilk runtime on armel, armhf, sparc and sparc64.
   * Use --push-state/--pop-state for gold as well when linking libtsan.
   * In GCC ICE dumps, prefix each line with the PID of the driver.
+  * Apply proposed patch for PR target/78748.
 
  -- Matthias Klose <doko at debian.org>  Thu, 08 Dec 2016 12:02:16 +0100
 
diff --git a/debian/patches/pr78748.diff b/debian/patches/pr78748.diff
new file mode 100644
index 0000000..6cd2a2e
--- /dev/null
+++ b/debian/patches/pr78748.diff
@@ -0,0 +1,53 @@
+>From b48da97e3b2f5b0b49543ed35d8c667a607067cf Mon Sep 17 00:00:00 2001
+From: Dominik Vogt <vogt at linux.vnet.ibm.com>
+Date: Mon, 12 Dec 2016 10:35:21 +0100
+Subject: [PATCH] PR target/78748: S/390: Fix ICE with ANDC splitter.
+
+---
+ gcc/config/s390/s390.md                       |  6 +++++-
+ gcc/testsuite/gcc.c-torture/compile/pr78748.c | 16 ++++++++++++++++
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr78748.c
+
+diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
+index 4f2effd..9d8e6b6 100644
+--- a/src/gcc/config/s390/s390.md
++++ b/src/gcc/config/s390/s390.md
+@@ -7420,7 +7420,11 @@
+ 	(and:GPR (not:GPR (match_operand:GPR 1 "nonimmediate_operand" ""))
+ 		 (match_operand:GPR 2 "general_operand" "")))
+    (clobber (reg:CC CC_REGNUM))]
+-  "! reload_completed && s390_logical_operator_ok_p (operands)"
++  "! reload_completed
++   && (GET_CODE (operands[0]) != MEM
++      /* Ensure that s390_logical_operator_ok_p will succeed even
++	 on the split xor if (b & a) is stored into a pseudo.  */
++       || rtx_equal_p (operands[0], operands[2]))"
+   "#"
+   "&& 1"
+   [
+diff --git a/gcc/testsuite/gcc.c-torture/compile/pr78748.c b/gcc/testsuite/gcc.c-torture/compile/pr78748.c
+new file mode 100644
+index 0000000..d24a334
+--- /dev/null
++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr78748.c
+@@ -0,0 +1,16 @@
++/* PR target/78748 */
++/* { dg-options "-march=zEC12" { target { s390*-*-* } } } */
++
++void
++foo (int *p, int *q)
++{
++  *q = *p & ~*q;
++}
++
++#if 0 /*!!!*/
++void
++bar (int *p, int *q)
++{
++  *q = ~*p & *q;
++}
++#endif
+-- 
+2.3.0
+
diff --git a/debian/rules.patch b/debian/rules.patch
index 1045afc..75998d6 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -225,6 +225,7 @@ debian_patches += skip-bootstrap-multilib
 debian_patches += libffi-ro-eh_frame_sect
 debian_patches += libffi-mips
 debian_patches += ada-kfreebsd
+debian_patches += pr78748
 
 # sigaction on sparc changed between glibc 2.19 and 2.21
 ifeq (,$(filter 2.1%, $(shell dpkg-query -l libc-bin | awk '/^.i/ {print $$3}')))

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