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