diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7f45d2f9cb16080b114cd762542c2a3970fe90b..8bb4a2af011acd490e521da5d27837cd209ee1ae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* genpreds.c (write_insn_constraint_len): Change definition of
+	insn_constraint_len to return size_t to match the declaration.
+
 2006-03-10  DJ Delorie  <dj@redhat.com>
 
 	* config/m32c/m32c.c (m32c_const_ok_for_constraint_p): Bit numbers
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index 9c0bb352e17a5927c25dcce8fe81cf3825282155..aa941ce107ee1df2b4047c882bb529ec9cc78325 100644
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -904,7 +904,7 @@ write_insn_constraint_len (void)
   if (constraint_max_namelen == 1)
     return;
 
-  puts ("unsigned int\n"
+  puts ("size_t\n"
 	"insn_constraint_len (enum constraint_num c)\n"
 	"{\n"
 	"  switch (c)\n"