diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 68487e94a4b..9e31001c0c5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-20  David Edelsohn  <edelsohn@gnu.org>
+
+	* genpreds.c (write_insn_extra_address_constraint): Argument `c'
+	is operand of switch, not str[0].
+
 2006-03-20  Alan Modra  <amodra@bigpond.net.au>
 
 	* config/rs6000/rs6000.c (rs6000_handle_option): Use
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index e31e64db842..425e7253f09 100644
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -1088,7 +1088,7 @@ write_insn_extra_address_constraint (void)
   puts ("bool\n"
 	"insn_extra_address_constraint (enum constraint_num c)\n"
 	"{\n"
-	"  switch (str[0])\n"
+	"  switch (c)\n"
 	"    {");
 
   FOR_ALL_CONSTRAINTS (c)