diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 236da5e7db6..db0e94cf7c9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-20  Richard Guenther  <rguenther@suse.de>
+
+	PR bootstrap/54326
+	* genoutput.c (note_constraint): Properly use CONST_CAST.
+
 2012-08-19  Nick Clifton  <nickc@redhat.com>
 
 	PR target/54306
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index 4e4e1edc6ac..2c6104cb25a 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -1175,7 +1175,7 @@ note_constraint (rtx exp, int lineno)
 	}
     }
   new_cdata = XNEWVAR (struct constraint_data, sizeof (struct constraint_data) + namelen);
-  strcpy ((char *)new_cdata + offsetof(struct constraint_data, name), name);
+  strcpy (CONST_CAST(char *, new_cdata->name), name);
   new_cdata->namelen = namelen;
   new_cdata->lineno = lineno;
   new_cdata->next_this_letter = *slot;