Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.3.6/170-allow-gcc-4.0-arm.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 402 197e1b49586e
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
(transplanted from 1ba79f2126df8bd89120899a58f2d0bcc2e9c771) 
     1 Fixes

     2 In file included from dynamic-link.h:22,

     3                  from dl-reloc.c:265:

     4 ../sysdeps/arm/dl-machine.h: In function '_dl_relocate_object':

     5 ../sysdeps/arm/dl-machine.h:371: error: invalid storage class for function 'fix_bad_pc24'

     6 make[2]: Leaving directory `/home/dank/queue/jobdir.k8/crosstool-dev/build/arm-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.3.6/glibc-2.3.6/elf'

     7 

     8 when building glibc-2.3.6 with gcc-4.0

     9 

    10 Like

    11 http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/arm/dl-machine.h.diff?r1=1.51&r2=1.52&cvsroot=glibc

    12 but fixes fix_bad_pc24.

    13 

    14 

    15 --- glibc-2.3.6-orig/sysdeps/arm/dl-machine.h	Sun Mar 20 17:54:37 2005

    16 +++ glibc-2.3.6/sysdeps/arm/dl-machine.h	Sun Mar 20 17:57:32 2005

    17 @@ -357,7 +357,14 @@

    18  #ifdef RESOLVE

    19  

    20  /* Deal with an out-of-range PC24 reloc.  */

    21 -static Elf32_Addr

    22 +#if __GNUC__ >= 4

    23 +  auto inline Elf32_Addr

    24 +#else

    25 +  static inline Elf32_Addr

    26 +#endif

    27 +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)

    28 +  __attribute ((always_inline))

    29 +#endif

    30  fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)

    31  {

    32    static void *fix_page;

    33 

    34 Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

    35 with a little editing by dank@kegel.com
crosstool-ng