From: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 29 Jun 2017 22:38:30 +0000 (+0000)
Subject: 	* arm/arm-builtins.c: Include profile-count.h
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ea846c4f1eac91076c54e5ec1d3473f4c280ce1;p=thirdparty%2Fgcc.git

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


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00431eede659..3b0723577ff6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-29  Jan Hubicka  <hubicka@ucw.cz>
+
+	* arm/arm-builtins.c: Include profile-count.h
+	* except.c (sjlj_emit_function_enter): Use
+	profile_probability::unlikely.
+
 2017-06-29  Aaron Sawdey  <acsawdey@linux.vnet.ibm.com>
 
         * config/rs6000/rs6000.c (toc_relative_expr_p): Make tocrel_base
diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c
index 8d14e58d9166..8ebdd96d9c7e 100644
--- a/gcc/config/arm/arm-builtins.c
+++ b/gcc/config/arm/arm-builtins.c
@@ -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"
diff --git a/gcc/except.c b/gcc/except.c
index 4ec2f82eb1f4..5709bdbed654 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1180,7 +1180,8 @@ sjlj_emit_function_enter (rtx_code_label *dispatch_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