patches/uClibc/0.9.28.2/130-ctype.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 746 b150d6f590fc
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.
yann@1
     1
diff -urN uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h
yann@1
     2
--- uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h   Fri Jun  3 13:30:25 2005
yann@1
     3
+++ uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h   Fri Jun  3 13:30:39 2005
yann@1
     4
@@ -34,11 +34,11 @@
yann@1
     5
yann@1
     6
 /* glibc uses the equivalent of - typedef __int32_t __ctype_touplow_t; */
yann@1
     7
yann@1
     8
-typedef __uint16_t __ctype_mask_t;
yann@1
     9
+typedef __uint32_t __ctype_mask_t;
yann@1
    10
yann@1
    11
 #ifdef __UCLIBC_HAS_CTYPE_SIGNED__
yann@1
    12
yann@1
    13
-typedef __int16_t __ctype_touplow_t;
yann@1
    14
+typedef __int32_t __ctype_touplow_t;
yann@1
    15
 #define __UCLIBC_CTYPE_B_TBL_OFFSET       128
yann@1
    16
 #define __UCLIBC_CTYPE_TO_TBL_OFFSET      128
yann@1
    17