diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f9f3f5f148b9..053c044bcd81 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-17  Tom de Vries  <tom@codesourcery.com>
+
+	* hwint.c: Fix loop range.
+
 2012-07-17  Tom de Vries  <tom@codesourcery.com>
 
 	* double-int.h (double_int_popcount): New inline function.
diff --git a/gcc/hwint.c b/gcc/hwint.c
index 024fb7e36e36..b7bcfa597403 100644
--- a/gcc/hwint.c
+++ b/gcc/hwint.c
@@ -113,8 +113,9 @@ int
 popcount_hwi (unsigned HOST_WIDE_INT x)
 {
   int i, ret = 0;
+  size_t bits = sizeof (x) * CHAR_BIT;
 
-  for (i = 0; i < sizeof (x); i += 1)
+  for (i = 0; i < bits; i += 1)
     {
       ret += x & 1;
       x >>= 1;