|
yann@1
|
1 |
Fixes
|
|
yann@1
|
2 |
In file included from ldconfig.c:136:
|
|
yann@1
|
3 |
../sysdeps/i386/dl-procinfo.c:53: error: static declaration of '_dl_x86_cap_flags' follows non-static declaration
|
|
yann@1
|
4 |
../sysdeps/i386/dl-procinfo.c:61: error: previous declaration of '_dl_x86_cap_flags' was here
|
|
yann@1
|
5 |
../sysdeps/i386/dl-procinfo.c:72: error: static declaration of '_dl_x86_platforms' follows non-static declaration
|
|
yann@1
|
6 |
../sysdeps/i386/dl-procinfo.c:77: error: previous declaration of '_dl_x86_platforms' was here
|
|
yann@1
|
7 |
make[2]: Leaving directory `/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.3.3/glibc-2.3.3/elf'
|
|
yann@1
|
8 |
when building with gcc-4.0.
|
|
yann@1
|
9 |
|
|
yann@1
|
10 |
2004-07-10 Ulrich Drepper <drepper@redhat.com>
|
|
yann@1
|
11 |
|
|
yann@1
|
12 |
* elf/ldconfig.c: Define PROCINFO_CLASS as static before including
|
|
yann@1
|
13 |
ldsodefs.h.
|
|
yann@1
|
14 |
* sysdeps/generic/ldsodefs.h: Only define PROCINFO_CLASS if it is not
|
|
yann@1
|
15 |
already defined.
|
|
yann@1
|
16 |
* sysdeps/i386/dl-procinfo.c: Define PROCINFO_CALLS only if not
|
|
yann@1
|
17 |
already defined.
|
|
yann@1
|
18 |
|
|
yann@1
|
19 |
See
|
|
yann@1
|
20 |
http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00093.html
|
|
yann@1
|
21 |
http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00097.html
|
|
yann@1
|
22 |
http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/i386/dl-procinfo.c.diff?cvsroot=glibc&r1=1.1&r2=1.2
|
|
yann@1
|
23 |
|
|
yann@1
|
24 |
rediffed against glibc-2.3.3
|
|
yann@1
|
25 |
|
|
yann@1
|
26 |
diff -ur glibc-2.3.3.orig/elf/ldconfig.c glibc-2.3.3/elf/ldconfig.c
|
|
yann@1
|
27 |
--- glibc-2.3.3.orig/elf/ldconfig.c Tue Aug 26 01:07:19 2003
|
|
yann@1
|
28 |
+++ glibc-2.3.3/elf/ldconfig.c Sat Mar 19 12:02:08 2005
|
|
yann@1
|
29 |
@@ -17,6 +17,7 @@
|
|
yann@1
|
30 |
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
yann@1
|
31 |
02111-1307 USA. */
|
|
yann@1
|
32 |
|
|
yann@1
|
33 |
+#define PROCINFO_CLASS static
|
|
yann@1
|
34 |
#include <alloca.h>
|
|
yann@1
|
35 |
#include <argp.h>
|
|
yann@1
|
36 |
#include <dirent.h>
|
|
yann@1
|
37 |
diff -ur glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h glibc-2.3.3/sysdeps/generic/ldsodefs.h
|
|
yann@1
|
38 |
--- glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h Mon Nov 24 14:56:07 2003
|
|
yann@1
|
39 |
+++ glibc-2.3.3/sysdeps/generic/ldsodefs.h Sat Mar 19 12:02:08 2005
|
|
yann@1
|
40 |
@@ -348,7 +348,9 @@
|
|
yann@1
|
41 |
|
|
yann@1
|
42 |
/* Get architecture specific definitions. */
|
|
yann@1
|
43 |
#define PROCINFO_DECL
|
|
yann@1
|
44 |
-#define PROCINFO_CLASS EXTERN
|
|
yann@1
|
45 |
+#ifndef PROCINFO_CLASS
|
|
yann@1
|
46 |
+# define PROCINFO_CLASS EXTERN
|
|
yann@1
|
47 |
+#endif
|
|
yann@1
|
48 |
#include <dl-procinfo.c>
|
|
yann@1
|
49 |
|
|
yann@1
|
50 |
/* Structure describing the dynamic linker itself. */
|
|
yann@1
|
51 |
Only in glibc-2.3.3/sysdeps/generic: ldsodefs.h~
|
|
yann@1
|
52 |
diff -ur glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c glibc-2.3.3/sysdeps/i386/dl-procinfo.c
|
|
yann@1
|
53 |
--- glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c Wed Sep 24 20:54:54 2003
|
|
yann@1
|
54 |
+++ glibc-2.3.3/sysdeps/i386/dl-procinfo.c Sat Mar 19 12:02:08 2005
|
|
yann@1
|
55 |
@@ -1,5 +1,5 @@
|
|
yann@1
|
56 |
/* Data for i386 version of processor capability information.
|
|
yann@1
|
57 |
- Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
|
|
yann@1
|
58 |
+ Copyright (C) 2001,2002,2003, 2004 Free Software Foundation, Inc.
|
|
yann@1
|
59 |
This file is part of the GNU C Library.
|
|
yann@1
|
60 |
Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
|
|
yann@1
|
61 |
|
|
yann@1
|
62 |
@@ -24,7 +24,7 @@
|
|
yann@1
|
63 |
If anything should be added here check whether the size of each string
|
|
yann@1
|
64 |
is still ok with the given array size.
|
|
yann@1
|
65 |
|
|
yann@1
|
66 |
- All the #ifdefs in the definitions ar equite irritating but
|
|
yann@1
|
67 |
+ All the #ifdefs in the definitions are quite irritating but
|
|
yann@1
|
68 |
necessary if we want to avoid duplicating the information. There
|
|
yann@1
|
69 |
are three different modes:
|
|
yann@1
|
70 |
|
|
yann@1
|
71 |
@@ -41,7 +41,7 @@
|
|
yann@1
|
72 |
*/
|
|
yann@1
|
73 |
|
|
yann@1
|
74 |
#ifndef PROCINFO_CLASS
|
|
yann@1
|
75 |
-#define PROCINFO_CLASS
|
|
yann@1
|
76 |
+# define PROCINFO_CLASS
|
|
yann@1
|
77 |
#endif
|
|
yann@1
|
78 |
|
|
yann@1
|
79 |
#if !defined PROCINFO_DECL && defined SHARED
|