From: Ilya Enkovich <ilya.enkovich@intel.com>
Date: Mon, 17 Nov 2014 16:17:06 +0000 (+0000)
Subject: builtins.c (expand_builtin_memcpy_with_bounds): Use target hook instead of BNDmode.
X-Git-Tag: releases/gcc-5.1.0~3175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30975f633bf33625a0e89127ac509cac22ed4837;p=thirdparty%2Fgcc.git

builtins.c (expand_builtin_memcpy_with_bounds): Use target hook instead of BNDmode.

	* builtins.c (expand_builtin_memcpy_with_bounds): Use target hook
	instead of BNDmode.
	(expand_builtin_mempcpy_with_bounds): Likewise.
	(expand_builtin_memset_with_bounds): Likewise.

From-SVN: r217658
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4c10c901802..561fc438e9b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-17  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+	* builtins.c (expand_builtin_memcpy_with_bounds): Use target hook
+	instead of BNDmode.
+	(expand_builtin_mempcpy_with_bounds): Likewise.
+	(expand_builtin_memset_with_bounds): Likewise.
+
 2014-11-17  Ilya Enkovich  <ilya.enkovich@intel.com>
 
 	* tree-ssa-strlen.c: include ipa-chkp.h, cgraph.h,
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 7ec2d5f8e8c6..f48745ee23f4 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3297,7 +3297,7 @@ expand_builtin_memcpy_with_bounds (tree exp, rtx target)
       /* Return src bounds with the result.  */
       if (res)
 	{
-	  rtx bnd = force_reg (BNDmode,
+	  rtx bnd = force_reg (targetm.chkp_bound_mode (),
 			       expand_normal (CALL_EXPR_ARG (exp, 1)));
 	  res = chkp_join_splitted_slot (res, bnd);
 	}
@@ -3354,7 +3354,7 @@ expand_builtin_mempcpy_with_bounds (tree exp, rtx target, machine_mode mode)
       /* Return src bounds with the result.  */
       if (res)
 	{
-	  rtx bnd = force_reg (BNDmode,
+	  rtx bnd = force_reg (targetm.chkp_bound_mode (),
 			       expand_normal (CALL_EXPR_ARG (exp, 1)));
 	  res = chkp_join_splitted_slot (res, bnd);
 	}
@@ -3760,7 +3760,7 @@ expand_builtin_memset_with_bounds (tree exp, rtx target, machine_mode mode)
       /* Return src bounds with the result.  */
       if (res)
 	{
-	  rtx bnd = force_reg (BNDmode,
+	  rtx bnd = force_reg (targetm.chkp_bound_mode (),
 			       expand_normal (CALL_EXPR_ARG (exp, 1)));
 	  res = chkp_join_splitted_slot (res, bnd);
 	}