Patchwork Fix s390 trunk build

login
register
mail settings
Submitter Jakub Jelinek
Date June 14, 2010, 7:28 a.m.
Message ID <20100614072841.GE7811@tyan-ft48-01.lab.bos.redhat.com>
Download mbox | patch
Permalink /patch/55513/
State New
Headers show

Comments

Jakub Jelinek - June 14, 2010, 7:28 a.m.
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
Andreas Krebbel - June 14, 2010, 10:34 a.m.
> 2010-06-14  Jakub Jelinek  <jakub@redhat.com>
> 
> 	* config/s390/s390.md (*mov<mode>_64 DD_DF, mov<mode>): Properly
> 	adjust z10prop set_attr.

Thanks for fixing this! I probably forgot to refresh the patch before committing. The 4.4
and 4.5 changes were ok.

Bye,

-Andreas-

Patch

--- 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