patches/glibc/ports-2.10.1/410-alpha-no-page-header.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
yann@1625
     1
2008-06-07  Mike Frysinger  <vapier@gentoo.org>
yann@1625
     2
yann@1625
     3
	* sysdeps/unix/sysv/linux/alpha/sys/user.h: Copy page.h definitions
yann@1625
     4
	from the kernel header to sys/user.h and remove the #include of
yann@1625
     5
	sys/user.h.
yann@1625
     6
yann@1625
     7
diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sys/user.h glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sys/user.h
yann@1625
     8
--- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sys/user.h	2009-05-16 10:36:20.000000000 +0200
yann@1625
     9
+++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sys/user.h	2009-11-13 00:50:47.000000000 +0100
yann@1625
    10
@@ -23,7 +23,6 @@
yann@1625
    11
    only. Don't read too much into it. Don't use it for anything other
yann@1625
    12
    than gdb/strace unless you know what you are doing. */
yann@1625
    13
 
yann@1625
    14
-#include <asm/page.h>
yann@1625
    15
 #include <asm/reg.h>
yann@1625
    16
 
yann@1625
    17
 struct user
yann@1625
    18
@@ -41,6 +40,9 @@
yann@1625
    19
   char u_comm[32];				/* user command name */
yann@1625
    20
 };
yann@1625
    21
 
yann@1625
    22
+#define PAGE_SHIFT		13
yann@1625
    23
+#define PAGE_SIZE		(1 << PAGE_SHIFT)
yann@1625
    24
+#define PAGE_MASK		(~(PAGE_SIZE-1))
yann@1625
    25
 #define NBPG			PAGE_SIZE
yann@1625
    26
 #define UPAGES			1
yann@1625
    27
 #define HOST_TEXT_START_ADDR	(u.start_code)
yann@1625
    28
diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/sys/user.h glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/sys/user.h