Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.9/460-alpha-glibc-2.5-no-asm-elf-header.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 1201 c9967a6e3b25
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. 
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/6016_all_alpha-glibc-2.5-no-asm-elf-header.patch

     2 

     3 -= BEGIN original header =-

     4 2007-03-13  Mike Frysinger  <vapier@gentoo.org>

     5 

     6 	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h: Copy some defines

     7 	from alpha's asm/elf.h

     8 

     9 -= END original header =-

    10 

    11 diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/sys/procfs.h glibc-2_9/sysdeps/unix/sysv/linux/alpha/sys/procfs.h

    12 --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/sys/procfs.h	2001-07-06 06:56:13.000000000 +0200

    13 +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/sys/procfs.h	2009-02-02 22:01:33.000000000 +0100

    14 @@ -29,10 +29,23 @@

    15  #include <sys/types.h>

    16  #include <sys/ucontext.h>

    17  #include <sys/user.h>

    18 -#include <asm/elf.h>

    19  

    20  __BEGIN_DECLS

    21  

    22 +/*

    23 + * The OSF/1 version of <sys/procfs.h> makes gregset_t 46 entries long.

    24 + * I have no idea why that is so.  For now, we just leave it at 33

    25 + * (32 general regs + processor status word). 

    26 + */

    27 +#define ELF_NGREG	33

    28 +#define ELF_NFPREG	32

    29 +

    30 +typedef unsigned long elf_greg_t;

    31 +typedef elf_greg_t elf_gregset_t[ELF_NGREG];

    32 +

    33 +typedef double elf_fpreg_t;

    34 +typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];

    35 +

    36  struct elf_siginfo

    37    {

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