patches/glibc/2.7/150-alpha-asm_page.patch
author Esben Haabendal <eha@dev.doredevelopment.dk>
Wed Apr 06 20:15:23 2011 +0200 (2011-04-06)
changeset 2379 372245834071
parent 565 ef7dd7893e54
permissions -rw-r--r--
libc/glibc: workaround for autoconf'ed define of caddr_t

When building canadian cross compiler, I have some trouble with
configure defining caddr_t as a macro, like:
#define caddr_t char *

When combined with the types.h where caddr_t is protected together
with daddr_t, the typedef of caddr_t breaks.

This patch works around it by protecting the caddr_t typedef
specifically.

I am uncertain as to the real cause and solution to this :-(

Signed-off-by: Esben Haabendal <eha@dev.doredevelopment.dk>
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)