patches/glibc/2.5/180-alpha-cfi.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 744 4bf8448536d5
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@611
     1
--- libc/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h    2006/10/29 21:48:06     1.6
yann@611
     2
+++ libc/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h    2007/03/13 21:28:03     1.7
yann@611
     3
@@ -55,6 +55,7 @@
yann@611
     4
 	bne	a3, SYSCALL_ERROR_LABEL;			\
yann@611
     5
 __LABEL($pseudo_ret)						\
yann@611
     6
 	.subsection 2;						\
yann@611
     7
+	cfi_startproc;						\
yann@611
     8
 __LABEL($pseudo_cancel)						\
yann@611
     9
 	subq	sp, 64, sp;					\
yann@611
    10
 	cfi_def_cfa_offset(64);					\
yann@611
    11
@@ -90,12 +91,13 @@
yann@611
    12
 	cfi_def_cfa_offset(0);					\
yann@611
    13
 __LABEL($syscall_error)						\
yann@611
    14
 	SYSCALL_ERROR_HANDLER;					\
yann@611
    15
+	cfi_endproc;						\
yann@611
    16
 	.previous
yann@611
    17
 
yann@611
    18
 # undef PSEUDO_END
yann@611
    19
 # define PSEUDO_END(sym)					\
yann@611
    20
-	.subsection 2;						\
yann@611
    21
 	cfi_endproc;						\
yann@611
    22
+	.subsection 2;						\
yann@611
    23
 	.size sym, .-sym
yann@611
    24
 
yann@611
    25
 # define SAVE_ARGS_0	/* Nothing.  */