patches/glibc/2.9/450-alpha-glibc-2.5-no-page-header.patch
author Esben Haabendal <eha@dev.doredevelopment.dk>
Wed Apr 06 20:15:23 2011 +0200 (2011-04-06)
changeset 2379 372245834071
parent 1201 c9967a6e3b25
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@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/6015_all_alpha-glibc-2.5-no-page-header.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
2008-06-07  Mike Frysinger  <vapier@gentoo.org>
yann@1201
     5
yann@1201
     6
	* sysdeps/unix/sysv/linux/alpha/sys/user.h: Copy page.h definitions
yann@1201
     7
	from the kernel header to sys/user.h and remove the #include of
yann@1201
     8
	sys/user.h.
yann@1201
     9
yann@1201
    10
-= END original header =-
yann@1201
    11
yann@1201
    12
diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/sys/user.h glibc-2_9/sysdeps/unix/sysv/linux/alpha/sys/user.h
yann@1201
    13
--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/sys/user.h	2001-07-06 06:56:13.000000000 +0200
yann@1201
    14
+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/sys/user.h	2009-02-02 22:01:32.000000000 +0100
yann@1201
    15
@@ -23,7 +23,6 @@
yann@1201
    16
    only. Don't read too much into it. Don't use it for anything other
yann@1201
    17
    than gdb/strace unless you know what you are doing. */
yann@1201
    18
 
yann@1201
    19
-#include <asm/page.h>
yann@1201
    20
 #include <asm/reg.h>
yann@1201
    21
 
yann@1201
    22
 struct user
yann@1201
    23
@@ -41,6 +40,9 @@
yann@1201
    24
   char u_comm[32];				/* user command name */
yann@1201
    25
 };
yann@1201
    26
 
yann@1201
    27
+#define PAGE_SHIFT		13
yann@1201
    28
+#define PAGE_SIZE		(1 << PAGE_SHIFT)
yann@1201
    29
+#define PAGE_MASK		(~(PAGE_SIZE-1))
yann@1201
    30
 #define NBPG			PAGE_SIZE
yann@1201
    31
 #define UPAGES			1
yann@1201
    32
 #define HOST_TEXT_START_ADDR	(u.start_code)