[gcc-7] 213/354: Remove proposed patch for PR65618, the issue has been fixed upstream another way.

[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 5e107da758d0a1830363da0d421e350742a64a8b
Author: aurel32 <aurel32 at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Jun 17 09:33:16 2017 +0000

    Remove proposed patch for PR65618, the issue has been fixed upstream
    another way.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9516 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog            |  5 +++++
 debian/patches/pr65618.diff | 16 ----------------
 debian/rules.patch          |  3 ---
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3273f80..f1d26b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 gcc-7 (7.1.0-7) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Update to SVN 20170524 (r248432) from the gcc-7-branch.
   * Don't build libada with -O3 (ftbfs on ppc64el).
 
+  [ Aurelien Jarno ]
+  * Remove proposed patch for PR65618, the issue has been fixed upstream
+    another way.
+
  -- Matthias Klose <doko at debian.org>  Wed, 24 May 2017 15:29:32 -0700
 
 gcc-7 (7.1.0-6) experimental; urgency=medium
diff --git a/debian/patches/pr65618.diff b/debian/patches/pr65618.diff
deleted file mode 100644
index b7c5158..0000000
--- a/debian/patches/pr65618.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-# DP: Proposed patch for PR target/65618.
-
---- a/src/gcc/emit-rtl.c	
-+++ a/src/gcc/emit-rtl.c	
-@@ -3742,6 +3742,11 @@ try_split (rtx pat, rtx_insn *trial, int last)
- 		   next = NEXT_INSN (next))
- 		if (NOTE_KIND (next) == NOTE_INSN_CALL_ARG_LOCATION)
- 		  {
-+		    /* Advance after to the next instruction if it is about to
-+		       be removed */
-+		    if (after == next)
-+		      after = NEXT_INSN(after);
-+
- 		    remove_insn (next);
- 		    add_insn_after (next, insn, NULL);
- 		    break;
diff --git a/debian/rules.patch b/debian/rules.patch
index 1fb7582..ef5cc0b 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -274,9 +274,6 @@ debian_patches += go-testsuite
 
 # Ada patches needed for both the stable package and snapshot builds
 debian_patches += ada-749574
-ifneq (,$(findstring mips,$(DEB_TARGET_ARCH)))
-  debian_patches += pr65618
-endif
 
 # don't remove, this is regularly overwritten, see PR sanitizer/63958.
 #debian_patches += libasan-sparc

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