[gcc-7] 76/354: - Apply proposed patch for PR target/65618.

[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 e0a4b6b87f9491f176e135ac146adae791a1e20d
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Dec 17 14:09:46 2016 +0000

     - Apply proposed patch for PR target/65618.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9194 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/control                            |  2 +-
 debian/patches/ada-bootstrap-compare.diff | 17 -----------------
 debian/patches/pr65618.diff               | 16 ++++++++++++++++
 debian/rules.patch                        |  4 +++-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index f303032..b3cd5aa 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), 
-  g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>, g++-5 [arm64] <!cross>, 
+  g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>, 
   libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k], 
   m4, libtool, autoconf2.64, 
diff --git a/debian/patches/ada-bootstrap-compare.diff b/debian/patches/ada-bootstrap-compare.diff
deleted file mode 100644
index ef77da9..0000000
--- a/debian/patches/ada-bootstrap-compare.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-# DP: For the bootstrap comparison, ignore gcc/ada/a-except.o on
-# DP: mips and mipsel. See PR ada/65618.
-
-Index: b/src/configure.ac
-===================================================================
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3502,6 +3502,9 @@ compare_exclusions="gcc/cc*-checksum\$(o
- case "$target" in
-   hppa*64*-*-hpux*) ;;
-   hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
-+  mips-*linux-gnu|mipsel-*linux-gnu)
-+    compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | gcc/ada/a-except.o"
-+    ;;
-   powerpc*-ibm-aix*) compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | *libgomp*\$(objext)" ;;
- esac
- AC_SUBST(compare_exclusions)
diff --git a/debian/patches/pr65618.diff b/debian/patches/pr65618.diff
new file mode 100644
index 0000000..b7c5158
--- /dev/null
+++ b/debian/patches/pr65618.diff
@@ -0,0 +1,16 @@
+# 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 a2cf09c..4273075 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -268,7 +268,9 @@ debian_patches += go-testsuite
 # Ada patches needed for both the stable package and snapshot builds
 debian_patches += ada-749574
 debian_patches += ada-mips
-debian_patches += ada-bootstrap-compare
+ifneq (,$(findstring mips,$(DEB_TARGET_ARCH)))
+  debian_patches += pr65618
+endif
 ifeq ($(DEB_TARGET_ARCH),m68k)
   debian_patches += ada-m68k
   ifeq ($(with_ada),yes)

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