yann@1: Fixes yann@1: yann@1: msort.c: In function 'msort_with_tmp': yann@1: msort.c:59: error: invalid lvalue in increment yann@1: msort.c:59: error: invalid lvalue in increment yann@1: msort.c:64: error: invalid lvalue in increment yann@1: msort.c:64: error: invalid lvalue in increment yann@1: make[2]: *** [/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.2.5/build-glibc/stdlib/msort.o] Error 1 yann@1: make[2]: Leaving directory `/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.2.5/glibc-2.2.5/stdlib' yann@1: make[1]: *** [stdlib/subdir_lib] Error 2 yann@1: make[1]: Leaving directory `/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.2.5/glibc-2.2.5' yann@1: make: *** [all] Error 2 yann@1: yann@1: when building glibc-2.2.5 with gcc-3.4. yann@1: yann@1: Taken from ../glibc-2.3.2/glibc-2.3.2-allow-gcc-3.5-msort.patch yann@1: and rediffed. yann@1: yann@1: --- glibc-2.2.5/stdlib/msort.c.old 2001-07-05 21:55:41.000000000 -0700 yann@1: +++ glibc-2.2.5/stdlib/msort.c 2005-03-10 08:24:24.152204976 -0800 yann@1: @@ -1,6 +1,6 @@ yann@1: /* An alternative to qsort, with an identical interface. yann@1: This file is part of the GNU C Library. yann@1: - Copyright (C) 1992, 1995-1997, 1999, 2000, 2001 Free Software Foundation, Inc. yann@1: + Copyright (C) 1992, 1995-1997, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. yann@1: Written by Mike Haertel, September 1988. yann@1: yann@1: The GNU C Library is free software; you can redistribute it and/or yann@1: @@ -56,12 +56,16 @@ yann@1: if ((*cmp) (b1, b2) <= 0) yann@1: { yann@1: --n1; yann@1: - *((op_t *) tmp)++ = *((op_t *) b1)++; yann@1: + *((op_t *) tmp) = *((op_t *) b1); yann@1: + tmp += sizeof (op_t); yann@1: + b1 += sizeof (op_t); yann@1: } yann@1: else yann@1: { yann@1: --n2; yann@1: - *((op_t *) tmp)++ = *((op_t *) b2)++; yann@1: + *((op_t *) tmp) = *((op_t *) b2); yann@1: + tmp += sizeof (op_t); yann@1: + b2 += sizeof (op_t); yann@1: } yann@1: } yann@1: else