From: Martin Jambor <mjambor@suse.cz>
Date: Thu, 8 Oct 2015 16:30:06 +0000 (+0200)
Subject: Fix Solaris bootstrap
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=170f473b525d0af69dc4577186762a3519b952a4;p=gcc.git

Fix Solaris bootstrap

2015-10-08  Martin Jambor  <mjambor@suse.cz>

	* ipa-cp.c (meet_with_1): Make the argument of abs signed.  Remove
	unnecessary MIN.

From-SVN: r228607
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ae4f39fb7d..d7820e41141 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-08  Martin Jambor  <mjambor@suse.cz>
+
+	* ipa-cp.c (meet_with_1): Make the argument of abs signed.  Remove
+	unnecessary MIN.
+
 2015-10-08  Yuri Rumyantsev  <ysrumyan@gmail.com>
 
 	* tree-vect-loop.c (vect_analyze_loop_operations): Skip virtual phi
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 0d9fdee79b6..d9d81f1e096 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -852,8 +852,8 @@ ipcp_alignment_lattice::meet_with_1 (unsigned new_align, unsigned new_misalign)
     }
   if (misalign != (new_misalign % align))
     {
-      int diff = abs (misalign - (new_misalign % align));
-      align = MIN (align, (unsigned) diff & -diff);
+      int diff = abs ((int) misalign - (int) (new_misalign % align));
+      align = (unsigned) diff & -diff;
       if (align)
 	misalign = misalign % align;
       else