Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.3.3/glibc-2.3.3-allow-gcc-4.0-elf-3.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Feb 24 11:00:05 2007 +0000 (2007-02-24)
changeset 1 eeea35fbf182
permissions -rw-r--r--
Add the full crosstool-NG sources to the new repository of its own.
You might just say: 'Yeah! crosstool-NG's got its own repo!".
Unfortunately, that's because the previous repo got damaged beyond repair and I had no backup.
That means I'm putting backups in place in the afternoon.
That also means we've lost history... :-( 
     1 Fixes

     2 In file included from ldconfig.c:136:

     3 ../sysdeps/i386/dl-procinfo.c:53: error: static declaration of '_dl_x86_cap_flags' follows non-static declaration

     4 ../sysdeps/i386/dl-procinfo.c:61: error: previous declaration of '_dl_x86_cap_flags' was here

     5 ../sysdeps/i386/dl-procinfo.c:72: error: static declaration of '_dl_x86_platforms' follows non-static declaration

     6 ../sysdeps/i386/dl-procinfo.c:77: error: previous declaration of '_dl_x86_platforms' was here

     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'

     8 when building with gcc-4.0.

     9 

    10 2004-07-10  Ulrich Drepper  <drepper@redhat.com>

    11 

    12         * elf/ldconfig.c: Define PROCINFO_CLASS as static before including

    13         ldsodefs.h.

    14         * sysdeps/generic/ldsodefs.h: Only define PROCINFO_CLASS if it is not

    15         already defined.

    16         * sysdeps/i386/dl-procinfo.c: Define PROCINFO_CALLS only if not

    17         already defined.

    18 

    19 See 

    20 http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00093.html

    21 http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg00097.html

    22 http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/i386/dl-procinfo.c.diff?cvsroot=glibc&r1=1.1&r2=1.2

    23 

    24 rediffed against glibc-2.3.3

    25 

    26 diff -ur glibc-2.3.3.orig/elf/ldconfig.c glibc-2.3.3/elf/ldconfig.c

    27 --- glibc-2.3.3.orig/elf/ldconfig.c	Tue Aug 26 01:07:19 2003

    28 +++ glibc-2.3.3/elf/ldconfig.c	Sat Mar 19 12:02:08 2005

    29 @@ -17,6 +17,7 @@

    30     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA

    31     02111-1307 USA.  */

    32  

    33 +#define PROCINFO_CLASS static

    34  #include <alloca.h>

    35  #include <argp.h>

    36  #include <dirent.h>

    37 diff -ur glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h glibc-2.3.3/sysdeps/generic/ldsodefs.h

    38 --- glibc-2.3.3.orig/sysdeps/generic/ldsodefs.h	Mon Nov 24 14:56:07 2003

    39 +++ glibc-2.3.3/sysdeps/generic/ldsodefs.h	Sat Mar 19 12:02:08 2005

    40 @@ -348,7 +348,9 @@

    41  

    42    /* Get architecture specific definitions.  */

    43  #define PROCINFO_DECL

    44 -#define PROCINFO_CLASS EXTERN

    45 +#ifndef PROCINFO_CLASS

    46 +# define PROCINFO_CLASS EXTERN

    47 +#endif

    48  #include <dl-procinfo.c>

    49  

    50    /* Structure describing the dynamic linker itself.  */

    51 Only in glibc-2.3.3/sysdeps/generic: ldsodefs.h~

    52 diff -ur glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c glibc-2.3.3/sysdeps/i386/dl-procinfo.c

    53 --- glibc-2.3.3.orig/sysdeps/i386/dl-procinfo.c	Wed Sep 24 20:54:54 2003

    54 +++ glibc-2.3.3/sysdeps/i386/dl-procinfo.c	Sat Mar 19 12:02:08 2005

    55 @@ -1,5 +1,5 @@

    56  /* Data for i386 version of processor capability information.

    57 -   Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.

    58 +   Copyright (C) 2001,2002,2003, 2004 Free Software Foundation, Inc.

    59     This file is part of the GNU C Library.

    60     Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.

    61  

    62 @@ -24,7 +24,7 @@

    63     If anything should be added here check whether the size of each string

    64     is still ok with the given array size.

    65  

    66 -   All the #ifdefs in the definitions ar equite irritating but

    67 +   All the #ifdefs in the definitions are quite irritating but

    68     necessary if we want to avoid duplicating the information.  There

    69     are three different modes:

    70  

    71 @@ -41,7 +41,7 @@

    72    */

    73  

    74  #ifndef PROCINFO_CLASS

    75 -#define PROCINFO_CLASS

    76 +# define PROCINFO_CLASS

    77  #endif

    78  

    79  #if !defined PROCINFO_DECL && defined SHARED
crosstool-ng