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 Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 402 197e1b49586e
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net> 
     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