Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
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> 
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/6015_all_alpha-glibc-2.5-no-page-header.patch

     2 

     3 -= BEGIN original header =-

     4 2008-06-07  Mike Frysinger  <vapier@gentoo.org>

     5 

     6 	* sysdeps/unix/sysv/linux/alpha/sys/user.h: Copy page.h definitions

     7 	from the kernel header to sys/user.h and remove the #include of

     8 	sys/user.h.

     9 

    10 -= END original header =-

    11 

    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

    13 --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/sys/user.h	2001-07-06 06:56:13.000000000 +0200

    14 +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/sys/user.h	2009-02-02 22:01:32.000000000 +0100

    15 @@ -23,7 +23,6 @@

    16     only. Don't read too much into it. Don't use it for anything other

    17     than gdb/strace unless you know what you are doing. */

    18  

    19 -#include <asm/page.h>

    20  #include <asm/reg.h>

    21  

    22  struct user

    23 @@ -41,6 +40,9 @@

    24    char u_comm[32];				/* user command name */

    25  };

    26  

    27 +#define PAGE_SHIFT		13

    28 +#define PAGE_SIZE		(1 << PAGE_SHIFT)

    29 +#define PAGE_MASK		(~(PAGE_SIZE-1))

    30  #define NBPG			PAGE_SIZE

    31  #define UPAGES			1

    32  #define HOST_TEXT_START_ADDR	(u.start_code)
crosstool-ng