patches/glibc/2.3.6/270-alpha-asm_page.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 565 ef7dd7893e54
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 2008-06-07  Mike Frysinger  <vapier@gentoo.org>
     2 
     3 	* sysdeps/unix/sysv/linux/alpha/sys/user.h: Copy page.h definitions
     4 	from the kernel header to sys/user.h and remove the #include of
     5 	sys/user.h.
     6 
     7 --- a/sysdeps/unix/sysv/linux/alpha/sys/user.h
     8 +++ b/sysdeps/unix/sysv/linux/alpha/sys/user.h
     9 @@ -23,7 +23,6 @@
    10     only. Don't read too much into it. Don't use it for anything other
    11     than gdb/strace unless you know what you are doing. */
    12  
    13 -#include <asm/page.h>
    14  #include <asm/reg.h>
    15  
    16  struct user
    17 @@ -41,6 +40,9 @@ struct user
    18    char u_comm[32];				/* user command name */
    19  };
    20  
    21 +#define PAGE_SHIFT		13
    22 +#define PAGE_SIZE		(1 << PAGE_SHIFT)
    23 +#define PAGE_MASK		(~(PAGE_SIZE-1))
    24  #define NBPG			PAGE_SIZE
    25  #define UPAGES			1
    26  #define HOST_TEXT_START_ADDR	(u.start_code)