1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.3.3/glibc-2.3.3-allow-gcc-4.0-elf-3.patch Fri May 18 15:48:11 2007 +0000
1.3 @@ -0,0 +1,79 @@
1.4 +Fixes
1.5 +In file included from ldconfig.c:136:
1.6 +../sysdeps/i386/dl-procinfo.c:53: error: static declaration of '_dl_x86_cap_flags' follows non-static declaration
1.7 +../sysdeps/i386/dl-procinfo.c:61: error: previous declaration of '_dl_x86_cap_flags' was here
1.8 +../sysdeps/i386/dl-procinfo.c:72: error: static declaration of '_dl_x86_platforms' follows non-static declaration
1.9 +../sysdeps/i386/dl-procinfo.c:77: error: previous declaration of '_dl_x86_platforms' was here
1.10 +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'
1.11 +when building with gcc-4.0.
1.12 +
1.13 +2004-07-10 Ulrich Drepper <drepper@redhat.com>
1.14 +
1.15 + * elf/ldconfig.c: Define PROCINFO_CLASS as static before including
1.16 + ldsodefs.h.
1.17 + * sysdeps/generic/ldsodefs.h: Only define PROCINFO_CLASS if it is not
1.18 + already defined.
1.19 + * sysdeps/i386/dl-procinfo.c: Define PROCINFO_CALLS only if not
1.20 + already defined.
1.21 +
1.22 +See
1.23 +http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00093.html
1.24 +http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00097.html
1.25 +http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/i386/dl-procinfo.c.diff?cvsroot=glibc&r1=1.1&r2=1.2
1.26 +
1.27 +rediffed against glibc-2.3.3
1.28 +
1.29 +diff -ur glibc-2.3.3.orig/elf/ldconfig.c glibc-2.3.3/elf/ldconfig.c
1.30 +--- glibc-2.3.3.orig/elf/ldconfig.c Tue Aug 26 01:07:19 2003
1.31 ++++ glibc-2.3.3/elf/ldconfig.c Sat Mar 19 12:02:08 2005
1.32 +@@ -17,6 +17,7 @@
1.33 + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
1.34 + 02111-1307 USA. */
1.35 +
1.36 ++#define PROCINFO_CLASS static
1.37 + #include <alloca.h>
1.38 + #include <argp.h>
1.39 + #include <dirent.h>
1.40 +diff -ur glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h glibc-2.3.3/sysdeps/generic/ldsodefs.h
1.41 +--- glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h Mon Nov 24 14:56:07 2003
1.42 ++++ glibc-2.3.3/sysdeps/generic/ldsodefs.h Sat Mar 19 12:02:08 2005
1.43 +@@ -348,7 +348,9 @@
1.44 +
1.45 + /* Get architecture specific definitions. */
1.46 + #define PROCINFO_DECL
1.47 +-#define PROCINFO_CLASS EXTERN
1.48 ++#ifndef PROCINFO_CLASS
1.49 ++# define PROCINFO_CLASS EXTERN
1.50 ++#endif
1.51 + #include <dl-procinfo.c>
1.52 +
1.53 + /* Structure describing the dynamic linker itself. */
1.54 +Only in glibc-2.3.3/sysdeps/generic: ldsodefs.h~
1.55 +diff -ur glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c glibc-2.3.3/sysdeps/i386/dl-procinfo.c
1.56 +--- glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c Wed Sep 24 20:54:54 2003
1.57 ++++ glibc-2.3.3/sysdeps/i386/dl-procinfo.c Sat Mar 19 12:02:08 2005
1.58 +@@ -1,5 +1,5 @@
1.59 + /* Data for i386 version of processor capability information.
1.60 +- Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
1.61 ++ Copyright (C) 2001,2002,2003, 2004 Free Software Foundation, Inc.
1.62 + This file is part of the GNU C Library.
1.63 + Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
1.64 +
1.65 +@@ -24,7 +24,7 @@
1.66 + If anything should be added here check whether the size of each string
1.67 + is still ok with the given array size.
1.68 +
1.69 +- All the #ifdefs in the definitions ar equite irritating but
1.70 ++ All the #ifdefs in the definitions are quite irritating but
1.71 + necessary if we want to avoid duplicating the information. There
1.72 + are three different modes:
1.73 +
1.74 +@@ -41,7 +41,7 @@
1.75 + */
1.76 +
1.77 + #ifndef PROCINFO_CLASS
1.78 +-#define PROCINFO_CLASS
1.79 ++# define PROCINFO_CLASS
1.80 + #endif
1.81 +
1.82 + #if !defined PROCINFO_DECL && defined SHARED