|
yann@1
|
1 |
Fixes
|
|
yann@1
|
2 |
|
|
yann@1
|
3 |
msort.c: In function 'msort_with_tmp':
|
|
yann@1
|
4 |
msort.c:59: error: invalid lvalue in increment
|
|
yann@1
|
5 |
msort.c:59: error: invalid lvalue in increment
|
|
yann@1
|
6 |
msort.c:64: error: invalid lvalue in increment
|
|
yann@1
|
7 |
msort.c:64: error: invalid lvalue in increment
|
|
yann@1
|
8 |
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
|
9 |
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
|
10 |
make[1]: *** [stdlib/subdir_lib] Error 2
|
|
yann@1
|
11 |
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
|
12 |
make: *** [all] Error 2
|
|
yann@1
|
13 |
|
|
yann@1
|
14 |
when building glibc-2.2.5 with gcc-3.4.
|
|
yann@1
|
15 |
|
|
yann@1
|
16 |
Taken from ../glibc-2.3.2/glibc-2.3.2-allow-gcc-3.5-msort.patch
|
|
yann@1
|
17 |
and rediffed.
|
|
yann@1
|
18 |
|
|
yann@1
|
19 |
--- glibc-2.2.5/stdlib/msort.c.old 2001-07-05 21:55:41.000000000 -0700
|
|
yann@1
|
20 |
+++ glibc-2.2.5/stdlib/msort.c 2005-03-10 08:24:24.152204976 -0800
|
|
yann@1
|
21 |
@@ -1,6 +1,6 @@
|
|
yann@1
|
22 |
/* An alternative to qsort, with an identical interface.
|
|
yann@1
|
23 |
This file is part of the GNU C Library.
|
|
yann@1
|
24 |
- Copyright (C) 1992, 1995-1997, 1999, 2000, 2001 Free Software Foundation, Inc.
|
|
yann@1
|
25 |
+ Copyright (C) 1992, 1995-1997, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
|
|
yann@1
|
26 |
Written by Mike Haertel, September 1988.
|
|
yann@1
|
27 |
|
|
yann@1
|
28 |
The GNU C Library is free software; you can redistribute it and/or
|
|
yann@1
|
29 |
@@ -56,12 +56,16 @@
|
|
yann@1
|
30 |
if ((*cmp) (b1, b2) <= 0)
|
|
yann@1
|
31 |
{
|
|
yann@1
|
32 |
--n1;
|
|
yann@1
|
33 |
- *((op_t *) tmp)++ = *((op_t *) b1)++;
|
|
yann@1
|
34 |
+ *((op_t *) tmp) = *((op_t *) b1);
|
|
yann@1
|
35 |
+ tmp += sizeof (op_t);
|
|
yann@1
|
36 |
+ b1 += sizeof (op_t);
|
|
yann@1
|
37 |
}
|
|
yann@1
|
38 |
else
|
|
yann@1
|
39 |
{
|
|
yann@1
|
40 |
--n2;
|
|
yann@1
|
41 |
- *((op_t *) tmp)++ = *((op_t *) b2)++;
|
|
yann@1
|
42 |
+ *((op_t *) tmp) = *((op_t *) b2);
|
|
yann@1
|
43 |
+ tmp += sizeof (op_t);
|
|
yann@1
|
44 |
+ b2 += sizeof (op_t);
|
|
yann@1
|
45 |
}
|
|
yann@1
|
46 |
}
|
|
yann@1
|
47 |
else
|