re PR rtl-optimization/17698 (Mainline failed to bootstrap on ia64)

2004-09-27  Michael Matz <matz@suse.de>

        PR bootstrap/17698
        PR bootstrap/17702
        * bitmap.h (bmp_iter_single_init, bmp_iter_and_not_init,
        bmp_iter_and_init): Shift by bit_in_word.

From-SVN: r88201

gcc/ChangeLog

+2004-09-27  Michael Matz <matz@suse.de>
+
+	PR bootstrap/17698
+	PR bootstrap/17702
+	* bitmap.h (bmp_iter_single_init, bmp_iter_and_not_init,
+	bmp_iter_and_init): Shift by bit_in_word.
+
 2004-09-27  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* aclocal.m4: Quote m4_includes. Include ../config/gcc-lib-path.m4.

gcc/bitmap.h

@@ -269,7 +269,7 @@ bmp_iter_single_init (bitmap_iterator *bi, bitmap bmp, unsigned min)
       bi->word = word_in_elt;
       bi->word_bit = min - bit_in_word;
       bi->bit = min;
-      bi->actual = bi->ptr1->bits[word_in_elt] >> bit_in_elt;
+      bi->actual = bi->ptr1->bits[word_in_elt] >> bit_in_word;
     }
   else
     {
@@ -400,9 +400,9 @@ bmp_iter_and_not_init (bitmap_iterator *bi, bitmap bmp1, bitmap bmp2,
 
       if (bi->ptr2 && bi->ptr2->indx == indx)
 	bi->actual = (bi->ptr1->bits[word_in_elt]
-		      & ~bi->ptr2->bits[word_in_elt]) >> bit_in_elt;
+                     & ~bi->ptr2->bits[word_in_elt]) >> bit_in_word;
       else
-	bi->actual = bi->ptr1->bits[word_in_elt] >> bit_in_elt;
+       bi->actual = bi->ptr1->bits[word_in_elt] >> bit_in_word;
     }
   else
     {
@@ -539,7 +539,7 @@ bmp_iter_and_init (bitmap_iterator *bi, bitmap bmp1, bitmap bmp2,
       bi->bit = min;
 
       bi->actual = (bi->ptr1->bits[word_in_elt]
-		    & bi->ptr2->bits[word_in_elt]) >> bit_in_elt;
+                   & bi->ptr2->bits[word_in_elt]) >> bit_in_word;
     }
   else
     {