From patchwork Mon Jun 14 07:28:41 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Fix s390 trunk build
From: Jakub Jelinek <jakub@redhat.com>
X-Patchwork-Id: 55513
Message-Id: <20100614072841.GE7811@tyan-ft48-01.lab.bos.redhat.com>
To: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Cc: gcc-patches@gcc.gnu.org
Date: Mon, 14 Jun 2010 09:28:41 +0200

Hi!

After latest change s390 doesn't build on the trunk, there are too many
alternatives in z10prop attribute list on two insns where the first
alternative has been removed, but the corresponding *, hasn't been removed
from the list.

Fixed thusly, committed as obvious.

2010-06-14  Jakub Jelinek  <jakub@redhat.com>

	* config/s390/s390.md (*mov<mode>_64 DD_DF, mov<mode>): Properly
	adjust z10prop set_attr.


	Jakub


--- gcc/config/s390/s390.md.jj	2010-06-14 09:14:39.000000000 +0200
+++ gcc/config/s390/s390.md	2010-06-14 09:18:53.000000000 +0200
@@ -2079,7 +2079,7 @@ (define_insn "*mov<mode>_64"
   [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RRE,RXY,RXY")
    (set_attr "type" "fload<mode>,fload<mode>,fload<mode>,
                      fstore<mode>,fstore<mode>,lr,load,store")
-   (set_attr "z10prop" "*,*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_rec")])
+   (set_attr "z10prop" "*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_rec")])
 
 (define_insn "*mov<mode>_31"
   [(set (match_operand:DD_DF 0 "nonimmediate_operand"
@@ -2168,7 +2168,7 @@ (define_insn "mov<mode>"
   [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RR,RX,RXY,RX,RXY")
    (set_attr "type" "fload<mode>,fload<mode>,fload<mode>,
                      fstore<mode>,fstore<mode>,lr,load,load,store,store")
-   (set_attr "z10prop" "*,*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_fwd_A3,z10_rec,z10_rec")])
+   (set_attr "z10prop" "*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_fwd_A3,z10_rec,z10_rec")])
 
 ;
 ; movcc instruction pattern