3.0 branch bootstrap failure on irix6.5

[Richard Henderson]

On Wed, Mar 21, 2001 at 10:56:13AM -0000, Billinghurst, David (CRTS) wrote:
> > Bootstrap comparison failure!
> > bitmap.o differs
> > ...

Re-bootstrapping, but the following should do the trick.
The block-local "i" was shadowing a variable of the same
name in the surrounding scope.


r~



Index: iris4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/iris4.h,v
retrieving revision 1.4
diff -c -p -d -r1.4 iris4.h
*** iris4.h	1999/10/24 19:48:51	1.4
--- iris4.h	2001/03/23 22:48:38
*************** Boston, MA 02111-1307, USA.  */
*** 30,44 ****
  /* Some assemblers have a bug that causes backslash escaped chars in .ascii
     to be misassembled, so we just completely avoid it.  */
  #undef ASM_OUTPUT_ASCII
! #define ASM_OUTPUT_ASCII(FILE,PTR,LEN)			\
! do {							\
!   const unsigned char *s;				\
!   int i;						\
!   for (i = 0, s = (const unsigned char *)(PTR); i < (LEN); s++, i++) \
!     {							\
!       if ((i % 8) == 0)					\
! 	fputs ("\n\t.byte\t", (FILE));			\
!       fprintf ((FILE), "%s0x%x", (i%8?",":""), (unsigned)*s); \
!     }							\
!   fputs ("\n", (FILE));					\
  } while (0)
--- 30,45 ----
  /* Some assemblers have a bug that causes backslash escaped chars in .ascii
     to be misassembled, so we just completely avoid it.  */
  #undef ASM_OUTPUT_ASCII
! #define ASM_OUTPUT_ASCII(FILE,PTR,LEN)				\
! do {								\
!   const unsigned char *s_ = (const unsigned char *)(PTR);	\
!   unsigned len_ = (LEN);					\
!   unsigned i_;							\
!   for (i_ = 0; i_ < len_; s_++, i_++)				\
!     {								\
!       if ((i_ % 8) == 0)					\
! 	fputs ("\n\t.byte\t", (FILE));				\
!       fprintf ((FILE), "%s0x%x", (i_%8?",":""), *s_);		\
!     }								\
!   fputs ("\n", (FILE));						\
  } while (0)