diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54b596b1f86..e1824ad844b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,7 +1,7 @@
 2012-10-29  Uros Bizjak  <ubizjak@gmail.com>
 
-	* config/i386/i386.c (ix86_decompose_address): Use simplify_gen_subreg
-	to generate SImode equivalent of address, zero-extended with AND RTX.
+	* config/i386/i386.c (ix86_decompose_address): Use simplify_subreg
+	to check SImode equivalent of address, zero-extended with AND RTX.
 	* config/i386/i386.md (ashift to lea splitter): Split to SImode mult.
 	(simple lea to add/shift peephole2s): Remove peephole2s that operate
 	on subregs of DImode operations.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 2931e62bed9..f766cf0c29d 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -11822,7 +11822,7 @@ ix86_decompose_address (rtx addr, struct ix86_address *out)
 	    }
 	  else if (GET_MODE (addr) == DImode)
 	    {
-	      addr = simplify_gen_subreg (SImode, addr, DImode, 0);
+	      addr = simplify_subreg (SImode, addr, DImode, 0);
 	      if (addr == NULL_RTX)
 		return 0;
 	    }