diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 49c23e81b57..f39f91a1cd7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-11  Mike Stump  <mikestump@comcast.net>
+
+	* emit-rtl.c (init_emit_once): Iterate through the
+	MODE_PARTIAL_INT modes with MIN_MODE_PARTIAL_INT and
+	MAX_MODE_PARTIAL_INT, as GET_MODE_WIDER_MODE doesn't step through
+	all the MIN_MODE_PARTIAL_INT modes anymore.
+
 2012-06-12  Maxim Kuvyrkov  <maxim@codesourcery.com>
 
 	* gcc/config/mips/mips-tables.opt (xlp): Fix merge typo.
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index f6d0a2e4bb6..c2d734bf17e 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -5699,9 +5699,9 @@ init_emit_once (void)
 	   mode = GET_MODE_WIDER_MODE (mode))
 	const_tiny_rtx[i][(int) mode] = GEN_INT (i);
 
-      for (mode = GET_CLASS_NARROWEST_MODE (MODE_PARTIAL_INT);
-	   mode != VOIDmode;
-	   mode = GET_MODE_WIDER_MODE (mode))
+      for (mode = MIN_MODE_PARTIAL_INT;
+	   mode <= MAX_MODE_PARTIAL_INT;
+	   mode = (enum machine_mode)((int)(mode) + 1))
 	const_tiny_rtx[i][(int) mode] = GEN_INT (i);
     }
 
@@ -5712,9 +5712,9 @@ init_emit_once (void)
        mode = GET_MODE_WIDER_MODE (mode))
     const_tiny_rtx[3][(int) mode] = constm1_rtx;
 
-  for (mode = GET_CLASS_NARROWEST_MODE (MODE_PARTIAL_INT);
-       mode != VOIDmode;
-       mode = GET_MODE_WIDER_MODE (mode))
+  for (mode = MIN_MODE_PARTIAL_INT;
+       mode <= MAX_MODE_PARTIAL_INT;
+       mode = (enum machine_mode)((int)(mode) + 1))
     const_tiny_rtx[3][(int) mode] = constm1_rtx;
       
   for (mode = GET_CLASS_NARROWEST_MODE (MODE_COMPLEX_INT);