yann@1: Fixes
yann@1: gconv_open.c: In function `__gconv_open':
yann@1: gconv_open.c:186: error: invalid lvalue in assignment
yann@1: when building glibc-2.2.5 with gcc-4.0.
yann@1: Same as ../glibc-2.3.2/glibc-2.3.2-allow-gcc-3.5-gconv.patch
yann@1: but rediffed against glibc-2.2.5.
yann@1: 
yann@1: wget 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/iconv/gconv_simple.c.diff?r1=1.59&r2=1.63&cvsroot=glibc'
yann@1:         * (internal_ucs4_loop): Fix typo in last change.
yann@1: 
yann@1:         * (internal_ucs4le_loop): Remove cast used as lvalue.
yann@1: 
yann@1:         * Fix last commit.
yann@1: 
yann@1: 	* iconv/gconv_simple.c (ucs4le_internal_loop): Remove cast used as lvalue.
yann@1: 	(internal_ucs4le_loop_single): Likewise.
yann@1: 	(ucs4_internal_loop): Likewise.
yann@1: 	(BODY): Likewise.
yann@1: 	(internal_ucs4_loop_single): Likewise.
yann@1: 
yann@1: wget 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/iconv/gconv_open.c.diff?r1=1.32&r2=1.33&cvsroot=glibc'
yann@1: 	* iconv/gconv_simple.c (ucs4le_internal_loop): Remove cast used as lvalue.
yann@1: 	(internal_ucs4le_loop_single): Likewise.
yann@1: 	(ucs4_internal_loop): Likewise.
yann@1: 	(BODY): Likewise.
yann@1: 	(internal_ucs4_loop_single): Likewise.
yann@1: 
yann@1: 
yann@1: ===================================================================
yann@1: RCS file: /cvs/glibc/libc/iconv/gconv_open.c,v
yann@1: retrieving revision 1.32
yann@1: retrieving revision 1.33
yann@1: diff -u -r1.32 -r1.33
yann@1: --- libc/iconv/gconv_open.c	2001/11/29 04:51:58	1.32
yann@1: +++ libc/iconv/gconv_open.c	2004/02/07 15:56:32	1.33
yann@1: @@ -1,5 +1,5 @@
yann@1:  /* Find matching transformation algorithms and initialize steps.
yann@1: -   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
yann@1: +   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
yann@1:     This file is part of the GNU C Library.
yann@1:     Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
yann@1:  
yann@1: @@ -182,8 +182,13 @@
yann@1:  	      || __builtin_expect (__gconv_translit_find (runp), 0) == 0)
yann@1:  	    lastp = runp;
yann@1:  	  else
yann@1: -	    /* This means we haven't found the module.  Remove it.  */
yann@1: -	    (lastp == NULL ? trans : lastp->next) = runp->next;
yann@1: +	    {
yann@1: +	      /* This means we haven't found the module.  Remove it.  */
yann@1: +	      if (lastp == NULL)
yann@1: +		trans  = runp->next;
yann@1: +	      else
yann@1: +		lastp->next  = runp->next;
yann@1: +	    }
yann@1:  	}
yann@1:  
yann@1:        /* Allocate room for handle.  */
yann@1: ===================================================================
yann@1: --- glibc-2.2.5/iconv/gconv_simple.c.old	2001-08-03 15:06:46.000000000 -0700
yann@1: +++ glibc-2.2.5/iconv/gconv_simple.c	2005-03-10 00:49:45.558181608 -0800
yann@1: @@ -1,5 +1,5 @@
yann@1:  /* Simple transformations functions.
yann@1: -   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
yann@1: +   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
yann@1:     This file is part of the GNU C Library.
yann@1:     Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
yann@1:  
yann@1: @@ -73,12 +73,13 @@
yann@1:  #if __BYTE_ORDER == __LITTLE_ENDIAN
yann@1:    /* Sigh, we have to do some real work.  */
yann@1:    size_t cnt;
yann@1: +  uint32_t *outptr32 = (uint32_t *) outptr;
yann@1:  
yann@1:    for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
yann@1: -    *((uint32_t *) outptr)++ = bswap_32 (*(const uint32_t *) inptr);
yann@1: +    *outptr32++ = bswap_32 (*(const uint32_t *) inptr);
yann@1:  
yann@1:    *inptrp = inptr;
yann@1: -  *outptrp = outptr;
yann@1: +  *outptrp = (unsigned char *) outptr32;
yann@1:  #elif __BYTE_ORDER == __BIG_ENDIAN
yann@1:    /* Simply copy the data.  */
yann@1:    *inptrp = inptr + n_convert * 4;
yann@1: @@ -176,13 +177,16 @@
yann@1:    (*outptrp)[2] = state->__value.__wchb[1];
yann@1:    (*outptrp)[3] = state->__value.__wchb[0];
yann@1:  
yann@1: -  *outptrp += 4;
yann@1:  #elif __BYTE_ORDER == __BIG_ENDIAN
yann@1:    /* XXX unaligned */
yann@1: -  *(*((uint32_t **) outptrp)++) = state->__value.__wch;
yann@1: +  (*outptrp)[0] = state->__value.__wchb[0];
yann@1: +  (*outptrp)[1] = state->__value.__wchb[1];
yann@1: +  (*outptrp)[2] = state->__value.__wchb[2];
yann@1: +  (*outptrp)[3] = state->__value.__wchb[3];
yann@1:  #else
yann@1:  # error "This endianess is not supported."
yann@1:  #endif
yann@1: +  *outptrp += 4;
yann@1:  
yann@1:    /* Clear the state buffer.  */
yann@1:    state->__count &= ~7;
yann@1: @@ -251,7 +255,8 @@
yann@1:  	  return __GCONV_ILLEGAL_INPUT;
yann@1:  	}
yann@1:  
yann@1: -      *((uint32_t *) outptr)++ = inval;
yann@1: +      *((uint32_t *) outptr) = inval;
yann@1: +      outptr += sizeof (uint32_t);
yann@1:      }
yann@1:  
yann@1:    *inptrp = inptr;
yann@1: @@ -427,9 +432,11 @@
yann@1:  #if __BYTE_ORDER == __BIG_ENDIAN
yann@1:    /* Sigh, we have to do some real work.  */
yann@1:    size_t cnt;
yann@1: +  uint32_t *outptr32 = (uint32_t *) outptr;
yann@1:  
yann@1:    for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
yann@1: -    *((uint32_t *) outptr)++ = bswap_32 (*(const uint32_t *) inptr);
yann@1: +    *outptr32++ = bswap_32 (*(const uint32_t *) inptr);
yann@1: +  outptr = (unsigned char *) outptr32;
yann@1:  
yann@1:    *inptrp = inptr;
yann@1:    *outptrp = outptr;
yann@1: @@ -530,12 +537,17 @@
yann@1:    (*outptrp)[2] = state->__value.__wchb[1];
yann@1:    (*outptrp)[3] = state->__value.__wchb[0];
yann@1:  
yann@1: -  *outptrp += 4;
yann@1:  #else
yann@1:    /* XXX unaligned */
yann@1: -  *(*((uint32_t **) outptrp)++) = state->__value.__wch;
yann@1: +  (*outptrp)[0] = state->__value.__wchb[0];
yann@1: +  (*outptrp)[1] = state->__value.__wchb[1];
yann@1: +  (*outptrp)[2] = state->__value.__wchb[2];
yann@1: +  (*outptrp)[3] = state->__value.__wchb[3];
yann@1: +
yann@1:  #endif
yann@1:  
yann@1: +  *outptrp += 4;
yann@1: +
yann@1:    /* Clear the state buffer.  */
yann@1:    state->__count &= ~7;
yann@1:  
yann@1: @@ -600,7 +612,8 @@
yann@1:  	  return __GCONV_ILLEGAL_INPUT;
yann@1:  	}
yann@1:  
yann@1: -      *((uint32_t *) outptr)++ = inval;
yann@1: +      *((uint32_t *) outptr) = inval;
yann@1: +      outptr += sizeof (uint32_t);
yann@1:      }
yann@1:  
yann@1:    *inptrp = inptr;
yann@1: @@ -782,7 +795,8 @@
yann@1:        }									      \
yann@1:      else								      \
yann@1:        /* It's an one byte sequence.  */					      \
yann@1: -      *((uint32_t *) outptr)++ = *inptr++;				      \
yann@1: +      *((uint32_t *) outptr) = *inptr++;				      \
yann@1: +      outptr += sizeof (uint32_t);					      \
yann@1:    }
yann@1:  #define LOOP_NEED_FLAGS
yann@1:  #include <iconv/loop.c>
yann@1: @@ -812,7 +826,8 @@
yann@1:        }									      \
yann@1:      else								      \
yann@1:        /* It's an one byte sequence.  */					      \
yann@1: -      *outptr++ = *((const uint32_t *) inptr)++;			      \
yann@1: +      *outptr++ = *((const uint32_t *) inptr);				      \
yann@1: +      inptr += sizeof (uint32_t);					      \
yann@1:    }
yann@1:  #define LOOP_NEED_FLAGS
yann@1:  #include <iconv/loop.c>
yann@1: @@ -1031,7 +1046,8 @@
yann@1:        }									      \
yann@1:  									      \
yann@1:      /* Now adjust the pointers and store the result.  */		      \
yann@1: -    *((uint32_t *) outptr)++ = ch;					      \
yann@1: +    *((uint32_t *) outptr) = ch;					      \
yann@1: +    outptr += sizeof (uint32_t);					      \
yann@1:    }
yann@1:  #define LOOP_NEED_FLAGS
yann@1:  
yann@1: @@ -1174,7 +1190,8 @@
yann@1:  	continue;							      \
yann@1:        }									      \
yann@1:  									      \
yann@1: -    *((uint32_t *) outptr)++ = u1;					      \
yann@1: +    *((uint32_t *) outptr) = u1;					      \
yann@1: +    outptr += sizeof (uint32_t);					      \
yann@1:      inptr += 2;								      \
yann@1:    }
yann@1:  #define LOOP_NEED_FLAGS
yann@1: @@ -1224,7 +1241,8 @@
yann@1:        }									      \
yann@1:      else 								      \
yann@1:        {									      \
yann@1: -	*((uint16_t *) outptr)++ = val;					      \
yann@1: +	*((uint16_t *) outptr) = val;					      \
yann@1: +        outptr += sizeof (uint16_t);					      \
yann@1:  	inptr += 4;							      \
yann@1:        }									      \
yann@1:    }
yann@1: @@ -1265,7 +1283,8 @@
yann@1:  	continue;							      \
yann@1:        }									      \
yann@1:  									      \
yann@1: -    *((uint32_t *) outptr)++ = u1;					      \
yann@1: +    *((uint32_t *) outptr) = u1;					      \
yann@1: +    outptr += sizeof (uint32_t);					      \
yann@1:      inptr += 2;								      \
yann@1:    }
yann@1:  #define LOOP_NEED_FLAGS
yann@1: @@ -1314,7 +1333,8 @@
yann@1:        }									      \
yann@1:      else 								      \
yann@1:        {									      \
yann@1: -	*((uint16_t *) outptr)++ = bswap_16 (val);			      \
yann@1: +	*((uint16_t *) outptr) = bswap_16 (val);			      \
yann@1: +	outptr += sizeof (uint16_t);					      \
yann@1:  	inptr += 4;							      \
yann@1:        }									      \
yann@1:    }