Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.7/270-sh-fix-procfs.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 962 2ba4393e0441
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 diff -durN glibc-2.7.orig/sysdeps/unix/sysv/linux/sh/sys/procfs.h glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/procfs.h

     2 --- glibc-2.7.orig/sysdeps/unix/sysv/linux/sh/sys/procfs.h	2004-11-20 18:56:16.000000000 +0100

     3 +++ glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/procfs.h	2008-10-24 11:21:15.000000000 +0200

     4 @@ -29,10 +29,32 @@

     5  #include <sys/types.h>

     6  #include <sys/ucontext.h>

     7  #include <sys/user.h>

     8 -#include <asm/elf.h>

     9  

    10  __BEGIN_DECLS

    11  

    12 +/* BEGIN - UGLY HACK - YEM

    13 + * These definitions are copied from the Alpha file,

    14 + * and the register numbers are set accordingly to

    15 + * what I could find in the Linux kernel sources

    16 + * Highly dubious !!!!

    17 + * BIG FAT WARNING !!!

    18 + */

    19 +

    20 +/* Linux kernel says 16 (standards?) registers */

    21 +#define ELF_NGREG  16

    22 +/* Linux kernel says 16 floating point registers */

    23 +#define ELF_NFPREG 16

    24 +

    25 +/* Copied from Alpha as is */

    26 +typedef unsigned long elf_greg_t;

    27 +typedef elf_greg_t elf_gregset_t[ELF_NGREG];

    28 +

    29 +/* Ditto */

    30 +typedef double elf_fpreg_t;

    31 +typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];

    32 +

    33 +/* END - UGLY HACK - YEM */

    34 +

    35  struct elf_siginfo

    36    {

    37      int si_signo;			/* Signal number.  */
crosstool-ng