From: rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 14 Jan 2016 21:36:12 +0000 (+0000)
Subject: PR c/69272
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c847d9692a1f0a735a087e523047cb0fdbc4fa79;p=thirdparty%2Fgcc.git

PR c/69272
PR tree-opt/68964

  * trans-mem.c (tm_log_emit_stmt): Fix unit size to bit size.
  * tree.c (build_tm_vector_builtins): Use builtin_decl_explicit_p
  instead of builtin_decl_declared_p to test for declaration.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee9620473c47..ba70e825e810 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-01-14  Richard Henderson  <rth@redhat.com>
+
+	PR c/69272
+	PR tree-opt/68964
+	* trans-mem.c (tm_log_emit_stmt): Fix unit size to bit size.
+	* tree.c (build_tm_vector_builtins): Use builtin_decl_explicit_p
+	instead of builtin_decl_declared_p to test for declaration.
+
 2016-01-14  Nicklas Bo Jensen  <nbjensen@gmail.com>
 
         * doc/loop.texi (Loop Analysis and Representation): Document
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index c4623071386e..b2047600dcb9 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -1229,16 +1229,16 @@ tm_log_emit_stmt (tree addr, gimple *stmt)
 	unhandled_vec:
 	  switch (type_size)
 	    {
-	    case 1:
+	    case 8:
 	      code = BUILT_IN_TM_LOG_1;
 	      break;
-	    case 2:
+	    case 16:
 	      code = BUILT_IN_TM_LOG_2;
 	      break;
-	    case 4:
+	    case 32:
 	      code = BUILT_IN_TM_LOG_4;
 	      break;
-	    case 8:
+	    case 64:
 	      code = BUILT_IN_TM_LOG_8;
 	      break;
 	    }
diff --git a/gcc/tree.c b/gcc/tree.c
index e6880f05b297..8ac2d90dea95 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -10393,7 +10393,7 @@ build_tm_vector_builtins (void)
   /* By default, 64 bit vectors go through the long long helpers.  */
 
   /* If a 128-bit vector is supported, declare those builtins.  */
-  if (!builtin_decl_declared_p (BUILT_IN_TM_STORE_M128)
+  if (!builtin_decl_explicit_p (BUILT_IN_TM_STORE_M128)
       && ((vtype = find_tm_vector_type (128, SImode))
 	  || (vtype = find_tm_vector_type (128, SFmode))))
     {
@@ -10430,7 +10430,7 @@ build_tm_vector_builtins (void)
     }
 
   /* If a 256-bit vector is supported, declare those builtins.  */
-  if (!builtin_decl_declared_p (BUILT_IN_TM_STORE_M256)
+  if (!builtin_decl_explicit_p (BUILT_IN_TM_STORE_M256)
       && ((vtype = find_tm_vector_type (256, SImode))
 	  || (vtype = find_tm_vector_type (256, SFmode))))
     {