patches/glibc/ports-2.6.1/100-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
parent 365 ba634892cc18
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)
yann@365
     1
diff -durN glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
yann@367
     2
--- glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h	2005-11-16 20:22:59.000000000 +0100
yann@367
     3
+++ glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h	2007-09-06 13:53:16.000000000 +0200
yann@365
     4
@@ -126,3 +126,9 @@
yann@365
     5
 # define NO_CANCELLATION 1
yann@365
     6
 
yann@365
     7
 #endif
yann@365
     8
+
yann@365
     9
+#ifndef __ASSEMBLER__
yann@365
    10
+# define RTLD_SINGLE_THREAD_P \
yann@365
    11
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
yann@365
    12
+                   header.multiple_threads) == 0, 1)
yann@365
    13
+#endif