Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/uClibc/0.9.28.1/160-mips-asm.h.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 1 eeea35fbf182
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 diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S

     2 --- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S	2007-02-07 11:18:12.000000000 +0100

     3 +++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S	2007-02-07 10:41:34.000000000 +0100

     4 @@ -24,7 +24,7 @@

     5  #include <sys/regdef.h>

     6  #define _ERRNO_H	1

     7  #include <bits/errno.h>

     8 -#include <asm/asm.h>

     9 +#include <sys/asm.h>

    10  

    11  /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */

    12  

    13 diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S

    14 --- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S	2007-02-07 11:18:12.000000000 +0100

    15 +++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S	2007-02-07 11:16:52.000000000 +0100

    16 @@ -3,9 +3,9 @@

    17  /*see uClibc's sh/pipe.c and glibc-2.2.4's mips/pipe.S */

    18  

    19  #include <features.h>

    20 -#include <asm/asm.h>

    21 +#include <sys/asm.h>

    22  #include <asm/unistd.h>

    23 -#include <asm/regdef.h>

    24 +#include <sys/regdef.h>

    25  

    26          .globl  pipe

    27          .ent    pipe, 0

    28 diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S

    29 --- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S	2007-02-07 11:18:12.000000000 +0100

    30 +++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S	2007-02-07 11:17:03.000000000 +0100

    31 @@ -17,8 +17,8 @@

    32     02111-1307 USA.  */

    33  

    34  #include <features.h>

    35 -#include <asm/asm.h>

    36 -#include <asm/regdef.h>

    37 +#include <sys/asm.h>

    38 +#include <sys/regdef.h>

    39  

    40  #ifdef __PIC__

    41  	.option pic2
crosstool-ng