re PR target/83822 (trunk/gcc/config/rs6000/rs6000-string.c:970]: (style) Redundant...

2018-03-30  Aaron Sawdey  <acsawdey@linux.vnet.ibm.com>

	PR target/83822
	* config/rs6000/rs6000-string.c (expand_compare_loop): Fix redundant
	condition.
	* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Fix redundant
	condition.

From-SVN: r258975

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 132d979c9eac0ba302b7371076a07f12bb1a36b0..9114947a763e0d245f58d2647808ebbf0337bf6f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-30  Aaron Sawdey  <acsawdey@linux.vnet.ibm.com>
+
+       PR target/83822
+       * config/rs6000/rs6000-string.c (expand_compare_loop): Fix redundant
+       condition.
+       * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Fix redundant
+       condition.
+
 2018-03-30  Julia Koval  <julia.koval@intel.com>
 
        PR target/84413

diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index ff6d05f93c07917e5daf51812669ab76258244db..8e0834a5d2ee8eb526042158dd1ab9b77320608e 100644 (file)
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -642,8 +642,7 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile)
          cpp_get_callbacks (pfile)->macro_to_expand = rs6000_macro_to_expand;
        }
     }
-  if (!TARGET_HARD_FLOAT
-      || (TARGET_HARD_FLOAT && !TARGET_DOUBLE_FLOAT))
+  if (!TARGET_HARD_FLOAT || !TARGET_DOUBLE_FLOAT)
     builtin_define ("_SOFT_DOUBLE");
   /* Used by lwarx/stwcx. errata work-around.  */
   if (rs6000_cpu == PROCESSOR_PPC405)

diff --git a/gcc/config/rs6000/rs6000-string.c b/gcc/config/rs6000/rs6000-string.c
index e817f3db20012556cf20f096d31c9d52e7ec6b6d..c70a4802119e6defe3a2bb6a0f844a2342d2a64d 100644 (file)
--- a/gcc/config/rs6000/rs6000-string.c
+++ b/gcc/config/rs6000/rs6000-string.c
@@ -966,8 +966,7 @@ expand_compare_loop (rtx operands[])
       rtx final_cleanup = gen_label_rtx ();
       rtx cmp_rem_before = gen_reg_rtx (word_mode);
       /* Compare one more word_mode chunk if needed.  */
-      if (!bytes_is_const
-         || (bytes_is_const && bytes_remaining >= load_mode_size))
+      if (!bytes_is_const || bytes_remaining >= load_mode_size)
        {
          /* If remainder length < word length, branch to final
             cleanup compare.  */