PR target/61271

	* config/i386/i386.c (ix86_rtx_costs)
	<case CONST_INT, case CONST, case LABEL_REF, case SYMBOL_REF>:
	Fix condition.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210937 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c64d833..7764890 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-26  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/61271
+       * config/i386/i386.c (ix86_rtx_costs)
+       <case CONST_INT, case CONST, case LABEL_REF, case SYMBOL_REF>:
+       Fix condition.
+
 2014-05-26  Martin Jambor  <mjambor@suse.cz>
 
        * ira.c (split_live_ranges_for_shrink_wrap): Remove bailout on
@@ -105,16 +112,14 @@
        mmix_shiftable_wyde_value, mmix_output_shiftvalue_op_from_str,
        mmix_output_octa, mmix_output_shifted_value): Adjust.
        (mmix_intval): Adjust.  Remove unreachable case.
-       * config/mmix/mmix.md (*nonlocal_goto_receiver_expanded): Use
-       int64_t.
+       * config/mmix/mmix.md (*nonlocal_goto_receiver_expanded): Use int64_t.
 
 2014-05-26  Richard Biener  <rguenther@suse.de>
 
        * configure.ac: Drop __int64 type check.  Insist that we
        found uint64_t and int64_t.
        * hwint.h (HOST_BITS_PER___INT64): Remove.
-       (HOST_BITS_PER_WIDE_INT): Define to 64 and remove
-       __int64 case.
+       (HOST_BITS_PER_WIDE_INT): Define to 64 and remove __int64 case.
        (HOST_WIDE_INT_PRINT_*): Remove 32bit case.
        (HOST_WIDEST_INT*): Define to HOST_WIDE_INT*.
        (HOST_WIDEST_FAST_INT): Remove __int64 case.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 0bde732..8827256 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -37903,10 +37903,10 @@ ix86_rtx_costs (rtx x, int code_i, int outer_code_i, int opno, int *total,
       else if (TARGET_64BIT && !x86_64_zext_immediate_operand (x, VOIDmode))
        *total = 2;
       else if (flag_pic && SYMBOLIC_CONST (x)
-              && (!TARGET_64BIT
-                  || (!GET_CODE (x) != LABEL_REF
-                      && (GET_CODE (x) != SYMBOL_REF
-                          || !SYMBOL_REF_LOCAL_P (x)))))
+              && !(TARGET_64BIT
+                   && (GET_CODE (x) == LABEL_REF
+                       || (GET_CODE (x) == SYMBOL_REF
+                           && SYMBOL_REF_LOCAL_P (x)))))
        *total = 1;
       else
        *total = 0;