backport: re PR target/60486 ([avr] superfluous or missing comparision after addition...

	Backport from 2014-03-13 trunk r208532.

	PR target/60486
	* config/avr/avr.c (avr_out_plus): Swap cc_plus and cc_minus in
	calls of avr_out_plus_1.

From-SVN: r208534

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f643817c1800a1612477da3929f7fde93f07e5e..00604ecb0586d742a8574166b8bc714186607f79 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-13  Georg-Johann Lay  <avr@gjlay.de>
+
+       Backport from 2014-03-13 trunk r208532.
+       
+       PR target/60486
+       * config/avr/avr.c (avr_out_plus): Swap cc_plus and cc_minus in
+       calls of avr_out_plus_1.
+
 2014-03-13  Joey Ye  <joey.ye@arm.com>
 
        Backport from mainline

diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 74872aa6c50ed8bf9ac23fdcabac27e661aed899..90c41a38520f98c4a8304ec1c34cdd72e1737193 100644 (file)
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -6806,8 +6806,8 @@ avr_out_plus (rtx insn, rtx *xop, int *plen, int *pcc, bool out_label)
 
   /* Work out the shortest sequence.  */
 
-  avr_out_plus_1 (op, &len_minus, MINUS, &cc_plus, code_sat, sign, out_label);
-  avr_out_plus_1 (op, &len_plus, PLUS, &cc_minus, code_sat, sign, out_label);
+  avr_out_plus_1 (op, &len_minus, MINUS, &cc_minus, code_sat, sign, out_label);
+  avr_out_plus_1 (op, &len_plus, PLUS, &cc_plus, code_sat, sign, out_label);
 
   if (plen)
     {