yann@1: Fixes
yann@1: In file included from ldconfig.c:136:
yann@1: ../sysdeps/i386/dl-procinfo.c:53: error: static declaration of '_dl_x86_cap_flags' follows non-static declaration
yann@1: ../sysdeps/i386/dl-procinfo.c:61: error: previous declaration of '_dl_x86_cap_flags' was here
yann@1: ../sysdeps/i386/dl-procinfo.c:72: error: static declaration of '_dl_x86_platforms' follows non-static declaration
yann@1: ../sysdeps/i386/dl-procinfo.c:77: error: previous declaration of '_dl_x86_platforms' was here
yann@1: 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: when building with gcc-4.0.
yann@1: 
yann@1: 2004-07-10  Ulrich Drepper  <drepper@redhat.com>
yann@1: 
yann@1:         * elf/ldconfig.c: Define PROCINFO_CLASS as static before including
yann@1:         ldsodefs.h.
yann@1:         * sysdeps/generic/ldsodefs.h: Only define PROCINFO_CLASS if it is not
yann@1:         already defined.
yann@1:         * sysdeps/i386/dl-procinfo.c: Define PROCINFO_CALLS only if not
yann@1:         already defined.
yann@1: 
yann@1: See 
yann@1: http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00093.html
yann@1: http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00097.html
yann@1: 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: 
yann@1: rediffed against glibc-2.3.3
yann@1: 
yann@1: diff -ur glibc-2.3.3.orig/elf/ldconfig.c glibc-2.3.3/elf/ldconfig.c
yann@1: --- glibc-2.3.3.orig/elf/ldconfig.c	Tue Aug 26 01:07:19 2003
yann@1: +++ glibc-2.3.3/elf/ldconfig.c	Sat Mar 19 12:02:08 2005
yann@1: @@ -17,6 +17,7 @@
yann@1:     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
yann@1:     02111-1307 USA.  */
yann@1:  
yann@1: +#define PROCINFO_CLASS static
yann@1:  #include <alloca.h>
yann@1:  #include <argp.h>
yann@1:  #include <dirent.h>
yann@1: diff -ur glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h glibc-2.3.3/sysdeps/generic/ldsodefs.h
yann@1: --- glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h	Mon Nov 24 14:56:07 2003
yann@1: +++ glibc-2.3.3/sysdeps/generic/ldsodefs.h	Sat Mar 19 12:02:08 2005
yann@1: @@ -348,7 +348,9 @@
yann@1:  
yann@1:    /* Get architecture specific definitions.  */
yann@1:  #define PROCINFO_DECL
yann@1: -#define PROCINFO_CLASS EXTERN
yann@1: +#ifndef PROCINFO_CLASS
yann@1: +# define PROCINFO_CLASS EXTERN
yann@1: +#endif
yann@1:  #include <dl-procinfo.c>
yann@1:  
yann@1:    /* Structure describing the dynamic linker itself.  */
yann@1: Only in glibc-2.3.3/sysdeps/generic: ldsodefs.h~
yann@1: diff -ur glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c glibc-2.3.3/sysdeps/i386/dl-procinfo.c
yann@1: --- glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c	Wed Sep 24 20:54:54 2003
yann@1: +++ glibc-2.3.3/sysdeps/i386/dl-procinfo.c	Sat Mar 19 12:02:08 2005
yann@1: @@ -1,5 +1,5 @@
yann@1:  /* Data for i386 version of processor capability information.
yann@1: -   Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
yann@1: +   Copyright (C) 2001,2002,2003, 2004 Free Software Foundation, Inc.
yann@1:     This file is part of the GNU C Library.
yann@1:     Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
yann@1:  
yann@1: @@ -24,7 +24,7 @@
yann@1:     If anything should be added here check whether the size of each string
yann@1:     is still ok with the given array size.
yann@1:  
yann@1: -   All the #ifdefs in the definitions ar equite irritating but
yann@1: +   All the #ifdefs in the definitions are quite irritating but
yann@1:     necessary if we want to avoid duplicating the information.  There
yann@1:     are three different modes:
yann@1:  
yann@1: @@ -41,7 +41,7 @@
yann@1:    */
yann@1:  
yann@1:  #ifndef PROCINFO_CLASS
yann@1: -#define PROCINFO_CLASS
yann@1: +# define PROCINFO_CLASS
yann@1:  #endif
yann@1:  
yann@1:  #if !defined PROCINFO_DECL && defined SHARED