patches/glibc/ports-2.7/110-ARM-NPTL.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
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 --- glibc-2.7/glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h	2007-06-06 19:27:04.000000000 +0200
     2 +++ glibc-2.7/glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h	2008-05-18 16:57:21.000000000 +0200
     3 @@ -73,6 +73,9 @@
     4  # define DOCARGS_5	DOCARGS_4
     5  # define UNDOCARGS_5	UNDOCARGS_4
     6  
     7 +# define DOCARGS_6    DOCARGS_5
     8 +# define UNDOCARGS_6  UNDOCARGS_5
     9 +
    10  # ifdef IS_IN_libpthread
    11  #  define CENABLE	bl PLTJMP(__pthread_enable_asynccancel)
    12  #  define CDISABLE	bl PLTJMP(__pthread_disable_asynccancel)