[gcc-6] 246/401: * Fix ICE in tree_to_shwi, Linaro issue #2575.

[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 ed3b5457e2850397b2fd2636d20daf54f5bb7292
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Nov 3 12:58:09 2016 +0000

      * Fix ICE in tree_to_shwi, Linaro issue #2575.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9022 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                     |  1 +
 debian/patches/linaro-issue2575.diff | 16 ++++++++++++++++
 debian/rules.patch                   |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ce8322..05606f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gcc-6 (6.2.0-11) UNRELEASED; urgency=medium
 
   * Fix symlinks for gcj manual pages. Closes: #842407.
+  * Fix ICE in tree_to_shwi, Linaro issue #2575.
 
  -- Matthias Klose <doko at debian.org>  Sat, 29 Oct 2016 12:24:50 +0200
 
diff --git a/debian/patches/linaro-issue2575.diff b/debian/patches/linaro-issue2575.diff
new file mode 100644
index 0000000..97bf780
--- /dev/null
+++ b/debian/patches/linaro-issue2575.diff
@@ -0,0 +1,16 @@
+# DP: Fix ICE in tree_to_shwi, Linaro issue #2575.
+
+--- a/src/gcc/varasm.c
++++ b/src/gcc/varasm.c
+@@ -6777,8 +6777,9 @@
+ 	 anchor range to reduce the amount of instructions require to refer
+ 	 to the entire declaration.  */
+       if (decl && DECL_SIZE (decl)
+-	 && tree_to_shwi (DECL_SIZE (decl))
+-	    >= (targetm.max_anchor_offset * BITS_PER_UNIT))
++         && (!tree_fits_shwi_p (DECL_SIZE (decl))
++             || tree_to_shwi (DECL_SIZE (decl))
++                >= (targetm.max_anchor_offset * BITS_PER_UNIT)))
+ 	return false;
+ 
+     }
diff --git a/debian/rules.patch b/debian/rules.patch
index 39b77b9..5385457 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -16,6 +16,7 @@ debian_patches = \
 	svn-updates \
 	$(if $(with_linaro_branch),gcc-linaro) \
 	$(if $(with_linaro_branch),gcc-linaro-no-macros) \
+	$(if $(with_linaro_branch),linaro-issue2575) \
 
 #	svn-updates \
 

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