dhowells pushed to cross-gcc (f22). "Fix ICE in alpha cross-compiler [BZ 1219345 / gcc BZ 66140]"

[notifications at fedoraproject.org]

From 6b1fb83b88a1788422853ec2a9aea2b0b6fb623e Mon Sep 17 00:00:00 2001
From: David Howells <dhowells at redhat.com>
Date: Fri, 15 May 2015 13:58:06 +0100
Subject: Fix ICE in alpha cross-compiler [BZ 1219345 / gcc BZ 66140]


diff --git a/cross-gcc-alpha.patch b/cross-gcc-alpha.patch
new file mode 100644
index 0000000..5f445f2
--- /dev/null
+++ b/cross-gcc-alpha.patch
@@ -0,0 +1,34 @@
+2015-05-15  Uros Bizjak  <ubizjak at gmail.com>
+
+    PR target/66140
+    * config/alpha/alpha.c (get_aligned_mem): Also look for reload
+    replacements in memory addresses.
+    (get_unaligned_address): Ditto.
+
+Index: gcc/config/alpha/alpha.c
+===================================================================
+--- gcc/config/alpha/alpha.c	(revision 223211)
++++ gcc/config/alpha/alpha.c	(working copy)
+@@ -1556,8 +1556,7 @@ get_aligned_mem (rtx ref, rtx *paligned_mem, rtx *
+ 
+   gcc_assert (MEM_P (ref));
+ 
+-  if (reload_in_progress
+-      && ! memory_address_p (GET_MODE (ref), XEXP (ref, 0)))
++  if (reload_in_progress)
+     {
+       base = find_replacement (&XEXP (ref, 0));
+       gcc_assert (memory_address_p (GET_MODE (ref), base));
+@@ -1602,11 +1601,9 @@ get_unaligned_address (rtx ref)
+ 
+   gcc_assert (MEM_P (ref));
+ 
+-  if (reload_in_progress
+-      && ! memory_address_p (GET_MODE (ref), XEXP (ref, 0)))
++  if (reload_in_progress)
+     {
+       base = find_replacement (&XEXP (ref, 0));
+-
+       gcc_assert (memory_address_p (GET_MODE (ref), base));
+     }
+   else
diff --git a/cross-gcc.spec b/cross-gcc.spec
index e690cde..3faab54 100644
--- a/cross-gcc.spec
+++ b/cross-gcc.spec
@@ -72,7 +72,7 @@
 # line.  gcc_release is the Fedora gcc release that the patches were
 # taken from.
 %global gcc_release 1
-%global cross_gcc_release 1
+%global cross_gcc_release 2
 %global cross_binutils_version 2.25-1
 %global isl_version 0.14
 
@@ -119,6 +119,7 @@ Patch901: cross-gcc-with-libgcc.patch
 Patch902: cross-gcc-bfin.patch
 Patch903: cross-gcc-format-config.patch
 Patch904: cross-gcc-microblaze.patch
+Patch905: cross-gcc-alpha.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: binutils >= 2.24
@@ -313,6 +314,7 @@ rm -f libgo/go/crypto/elliptic/p224{,_test}.go
 %patch902 -p0 -b .bfin~
 %patch903 -p0 -b .format-config~
 %patch904 -p0 -b .microblaze~
+%patch905 -p0 -b .alpha~
 
 echo 'Red Hat Cross %{version}-%{cross_gcc_release}' > gcc/DEV-PHASE
 
@@ -901,5 +903,8 @@ rm -rf %{buildroot}
 %do_files xtensa-linux-gnu	%{build_xtensa}
 
 %changelog
+* Fri May 15 2015 David Howells <dhowells at redhat.com> - 5.1.1-2
+- Fix ICE in alpha cross-compiler [BZ 1219345 / gcc BZ 66140]
+
 * Thu Apr 23 2015 David Howells <dhowells at redhat.com> - 5.1.1-1
 - Switch to gcc-5.1
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cross-gcc.git/commit/?h=f22&id=6b1fb83b88a1788422853ec2a9aea2b0b6fb623e