diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef9fb3db228..f2025eb6462 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-01  Tristan Gingold  <gingold@adacore.com>
+
+	* c-typeck.c (composite_type): Keep mode for pointers.
+
 2012-01-31  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* function.h (regno_reg_rtx): Adjust comment.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index b696e5e38be..2de1e5c6672 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -394,7 +394,7 @@ composite_type (tree t1, tree t2)
 	tree pointed_to_1 = TREE_TYPE (t1);
 	tree pointed_to_2 = TREE_TYPE (t2);
 	tree target = composite_type (pointed_to_1, pointed_to_2);
-	t1 = build_pointer_type (target);
+        t1 = build_pointer_type_for_mode (target, TYPE_MODE (t1), false);
 	t1 = build_type_attribute_variant (t1, attributes);
 	return qualify_type (t1, t2);
       }