diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42f1bd862d8b9e84ed40911efc6e54cc966e2f86..fc79821d8722ec20361a7f43f56f23f75b47e87b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-10  Richard Biener  <rguenther@suse.de>
+
+	* builtins.c (expand_builtin_init_trampoline): Use
+	set_mem_attributes.
+
 2013-01-10  Richard Biener  <rguenther@suse.de>
 
 	PR bootstrap/55792
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 2b615a17c100d727f59c21c5dff0eb1cc2cc5520..8ae4988418a0bd2be75a07a113103946361e417f 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4853,8 +4853,7 @@ expand_builtin_init_trampoline (tree exp, bool onstack)
      within the local function's FRAME decl.  Either way, let's see if
      we can fill in the MEM_ATTRs for this memory.  */
   if (TREE_CODE (t_tramp) == ADDR_EXPR)
-    set_mem_attributes_minus_bitpos (m_tramp, TREE_OPERAND (t_tramp, 0),
-				     true, 0);
+    set_mem_attributes (m_tramp, TREE_OPERAND (t_tramp, 0), true);
 
   /* Creator of a heap trampoline is responsible for making sure the
      address is aligned to at least STACK_BOUNDARY.  Normally malloc