diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 0e1b4dda006..375dad19358 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-06  Alexandre Oliva <aoliva@redhat.com>
+
+	* c-pretty-print.c (pp_c_tree_decl_identifier): Convert 16-bit
+	value to unsigned short to fit in 4 hex digits without
+	warnings.
+
 2017-01-05  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* c.opt (fsso-struct): Add 'native' value.
diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c
index 813bf1da8af..5d79519fa7d 100644
--- a/gcc/c-family/c-pretty-print.c
+++ b/gcc/c-family/c-pretty-print.c
@@ -2376,7 +2376,8 @@ pp_c_tree_decl_identifier (c_pretty_printer *pp, tree t)
   else
     {
       static char xname[8];
-      sprintf (xname, "<U%4x>", ((unsigned)((uintptr_t)(t) & 0xffff)));
+      sprintf (xname, "<U%4hx>", ((unsigned short) ((uintptr_t) (t)
+						    & 0xffff)));
       name = xname;
     }