diff mbox

Convert profile probabilities to new type

Message ID 20170629223902.GB2195@kam.mff.cuni.cz
State New
Headers show

Commit Message

Jan Hubicka June 29, 2017, 10:39 p.m. UTC 
Hi,
this patch makes cross compiler for all three targets to build again.
Comitted as obvious.

	* arm/arm-builtins.c: Include profile-count.h
	* except.c (sjlj_emit_function_enter): Use
	profile_probability::unlikely.

Comments

Joseph Myers June 30, 2017, 11:06 p.m. UTC | #1 
Also seeing a possibly related failure from my glibc bot, building for 
hppa-linux-gnu:

/scratch/jmyers/glibc-bot/src/gcc/gcc/config/pa/pa.c: In function 'bool pa_expand_compare_and_swap_loop(rtx, rtx, rtx, rtx)':
/scratch/jmyers/glibc-bot/src/gcc/gcc/config/pa/pa.c:10726:59: error: could not convert '0' from 'int' to 'profile_probability'
                            GET_MODE (success), 1, label, 0);
                                                           ^
diff mbox

Patch

Index: config/arm/arm-builtins.c
===================================================================
--- config/arm/arm-builtins.c	(revision 249799)
+++ config/arm/arm-builtins.c	(working copy)
@@ -27,6 +27,7 @@ 
 #include "gimple-expr.h"
 #include "memmodel.h"
 #include "tm_p.h"
+#include "profile-count.h"
 #include "optabs.h"
 #include "emit-rtl.h"
 #include "recog.h"
Index: except.c
===================================================================
--- except.c	(revision 249800)
+++ except.c	(working copy)
@@ -1180,7 +1180,8 @@  sjlj_emit_function_enter (rtx_code_label
 
       emit_cmp_and_jump_insns (x, const0_rtx, NE, 0,
 			       TYPE_MODE (integer_type_node), 0,
-			       dispatch_label, REG_BR_PROB_BASE / 100);
+			       dispatch_label,
+			       profile_probability::unlikely ());
 #else
       expand_builtin_setjmp_setup (addr, dispatch_label);
 #endif