diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 83c000baabd6db9d98ab5ede005173ca96beb5d4..c8fff24e3752edcd52eb2d6cf53e2180ecc15aad 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-24  Nathan Sidwell  <nathan@acm.org>
+
+	* c=common.c (field_decl_cmp, resort_field_decl_cmp): Adjust T
+	const casts to avoid warning.
+
 2017-05-24  Martin Sebor  <msebor@redhat.com>
 
 	PR c/80731
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 708fbe519196b57b80bfe311ff7a431bafcf6c9d..4395e51847ca16550cdaf10c72ede8e2c2e9a708 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -5866,8 +5866,8 @@ check_builtin_function_arguments (location_t loc, vec<location_t> arg_loc,
 int
 field_decl_cmp (const void *x_p, const void *y_p)
 {
-  const tree *const x = (const tree *const) x_p;
-  const tree *const y = (const tree *const) y_p;
+  const tree *const x = (const tree *) x_p;
+  const tree *const y = (const tree *) y_p;
 
   if (DECL_NAME (*x) == DECL_NAME (*y))
     /* A nontype is "greater" than a type.  */
@@ -5892,8 +5892,8 @@ pointer operator in resort_data.  */
 static int
 resort_field_decl_cmp (const void *x_p, const void *y_p)
 {
-  const tree *const x = (const tree *const) x_p;
-  const tree *const y = (const tree *const) y_p;
+  const tree *const x = (const tree *) x_p;
+  const tree *const y = (const tree *) y_p;
 
   if (DECL_NAME (*x) == DECL_NAME (*y))
     /* A nontype is "greater" than a type.  */