[gcc-6] 332/401: * Apply proposed patch for PR rtl-optimization/65618. Addresses: #781457.

[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 acfcf60834c1794295bdb1665d4d9d3d9e3d7200
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Dec 31 02:26:14 2016 +0000

      * Apply proposed patch for PR rtl-optimization/65618. Addresses: #781457.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9207 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog            |  3 ++-
 debian/patches/pr65618.diff | 16 ++++++++++++++++
 debian/rules.patch          |  4 ++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5f67f13..9147340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,11 +13,12 @@ gcc-6 (6.3.0-1) UNRELEASED; urgency=medium
   * Stop applying PR c++/77379.
   * Fix ignoring dpkg's pie specs when pie is not enabled (James Clarke).
     Closes: #849542.
+  * Apply proposed patch for PR rtl-optimization/65618. Addresses: #781457.
 
   [ Samuel Thibault ]
   * libgo fixup for program invocation name.
 
- -- Matthias Klose <doko at debian.org>  Thu, 29 Dec 2016 04:28:48 +0100
+ -- Matthias Klose <doko at debian.org>  Sat, 31 Dec 2016 03:25:18 +0100
 
 gcc-6 (6.2.1-7) unstable; urgency=medium
 
diff --git a/debian/patches/pr65618.diff b/debian/patches/pr65618.diff
new file mode 100644
index 0000000..2ec703c
--- /dev/null
+++ b/debian/patches/pr65618.diff
@@ -0,0 +1,16 @@
+# DP: Proposed patch for PR rtl-optimization/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 96f0318..23c98e7 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -252,6 +252,10 @@ else ifeq ($(DEB_TARGET_ARCH),armel)
   endif
 endif
 
+ifneq (,$(findstring mips, $(DEB_TARGET_ARCH)))
+  debian_patches += pr65618
+endif
+
 ifeq ($(DEB_TARGET_ARCH),powerpcspe)
   debian_patches += powerpc_remove_many
   debian_patches += powerpc_nofprs

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