S/390: Adjust to the recent branch probability changes.

This fixes the bootstrap failure triggered by the recent changes wrt
branch probabilities aka emit_cmp_and_jump_insns does not accept
integers as branch probability anymore.

gcc/ChangeLog:

2017-06-30  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* config/s390/s390.c (s390_expand_setmem): Adjust to the new data
	type for branch probabilities.

From-SVN: r249829

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f66b41ef48451ece8d57171e36926413bc6dd108..b8fb6262c3ce5a5b7fa66ae41ca700b6a7e4bcc3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-30  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       * config/s390/s390.c (s390_expand_setmem): Adjust to the new data
+       type for branch probabilities.
+
 2017-06-29  Julian Brown  <julian@codesourcery.com>
            Naveen H.S  <Naveen.Hurugalawadi@cavium.com>
 

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index bfc38db58f4ec812906bf1e719a074ef26db0fca..958ee3b926cac8969541ed1d575a2cd5a624af3c 100644 (file)
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -5349,8 +5349,6 @@ s390_expand_movmem (rtx dst, rtx src, rtx len)
 void
 s390_expand_setmem (rtx dst, rtx len, rtx val)
 {
-  const int very_unlikely = REG_BR_PROB_BASE / 100 - 1;
-
   if (GET_CODE (len) == CONST_INT && INTVAL (len) <= 0)
     return;
 
@@ -5424,7 +5422,7 @@ s390_expand_setmem (rtx dst, rtx len, rtx val)
       convert_move (count, len, 1);
       emit_cmp_and_jump_insns (count, const0_rtx,
                               EQ, NULL_RTX, mode, 1, zerobyte_end_label,
-                              very_unlikely);
+                              profile_probability::very_unlikely ());
 
       /* We need to make a copy of the target address since memset is
         supposed to return it unmodified.  We have to make it here
@@ -5441,7 +5439,8 @@ s390_expand_setmem (rtx dst, rtx len, rtx val)
          dstp1 = adjust_address (dst, VOIDmode, 1);
          emit_cmp_and_jump_insns (count,
                                   const1_rtx, EQ, NULL_RTX, mode, 1,
-                                  onebyte_end_label, very_unlikely);
+                                  onebyte_end_label,
+                                  profile_probability::very_unlikely ());
        }
 
       /* There is one unconditional (mvi+mvc)/xc after the loop