Remove the now really obsolete Linux kernel headers copy and sanitised.
Remove orphanned Linux kernel patchsets.
Initiate a kernel build scripts directory. Move the Linux kernel build script there.
/trunk/scripts/build/kernel/linux.sh | 146 11 135 0 +++---------------------------------------
/trunk/scripts/crosstool.sh | 2 1 1 0
/trunk/steps.mk | 1 0 1 0 -
/trunk/config/kernel/linux.in | 49 0 49 0 --------------
/trunk/config/kernel.in | 4 4 0 0 +
5 files changed, 16 insertions(+), 186 deletions(-)
1.1 --- a/config/kernel.in Fri Sep 05 16:15:34 2008 +0000
1.2 +++ b/config/kernel.in Wed Sep 10 21:40:23 2008 +0000
1.3 @@ -2,6 +2,10 @@
1.4
1.5 menu "Kernel"
1.6
1.7 +config KERNEL
1.8 + string
1.9 + default "linux" if KERNEL_LINUX
1.10 +
1.11 choice
1.12 bool
1.13 prompt "Target OS"
2.1 --- a/config/kernel/linux.in Fri Sep 05 16:15:34 2008 +0000
2.2 +++ b/config/kernel/linux.in Wed Sep 10 21:40:23 2008 +0000
2.3 @@ -11,27 +11,6 @@
2.4 This will make use of the new headers_install rule in recent kernels.
2.5 This is most probably what you want to use.
2.6
2.7 -config KERNEL_LINUX_HEADERS_SANITISED
2.8 - bool
2.9 - prompt "Mazur's sanitized headers (OBSOLETE)"
2.10 - depends on OBSOLETE
2.11 - select KERNEL_LINUX_NEEDS_CONFIG
2.12 - help
2.13 - M. Mazur used to maintain a tree of sanitised headers, but it is now
2.14 - obsoleted by the headers_install rule (above), and has not seen any
2.15 - update since 2.6.12
2.16 -
2.17 -config KERNEL_LINUX_HEADERS_COPY
2.18 - bool
2.19 - prompt "pure kernel headers (REALLY OBSOLETE)"
2.20 - depends on OBSOLETE
2.21 - select KERNEL_LINUX_NEEDS_CONFIG
2.22 - help
2.23 - This will simply copy the kernel headers to the toolchain.
2.24 -
2.25 - You do NOT want this. It's badly broken because it leaks kernel internals
2.26 - to userspace.
2.27 -
2.28 config KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR
2.29 bool
2.30 prompt "Use custom directory"
2.31 @@ -41,11 +20,6 @@
2.32
2.33 endchoice
2.34
2.35 -config KERNEL
2.36 - string
2.37 - default "linux" if ! KERNEL_LINUX_HEADERS_SANITISED
2.38 - default "linux-libc-headers" if KERNEL_LINUX_HEADERS_SANITISED
2.39 -
2.40 config KERNEL_VERSION_SEE_EXTRAVERSION
2.41 bool
2.42 prompt "See extra versions"
2.43 @@ -64,14 +38,6 @@
2.44 source config/kernel/linux_headers_install.in
2.45 endif
2.46
2.47 -if KERNEL_LINUX_HEADERS_COPY
2.48 -source config/kernel/linux_headers_copy.in
2.49 -endif
2.50 -
2.51 -if KERNEL_LINUX_HEADERS_SANITISED
2.52 -source config/kernel/linux_headers_sanitised.in
2.53 -endif
2.54 -
2.55 config KERNEL_LINUX_HEADERS_CUSTOM_DIR
2.56 string
2.57 prompt "Where are those custom headers?"
2.58 @@ -116,19 +82,4 @@
2.59 default 1 if KERNEL_LINUX_VERBOSITY_1
2.60 default 2 if KERNEL_LINUX_VERBOSITY_2
2.61
2.62 -config KERNEL_LINUX_NEEDS_CONFIG
2.63 - bool
2.64 - default n
2.65 -
2.66 -config KERNEL_LINUX_CONFIG_FILE
2.67 - string
2.68 - prompt "Configuration file"
2.69 - depends on KERNEL_LINUX_NEEDS_CONFIG
2.70 - default ""
2.71 - help
2.72 - Path to a kernel configuration file.
2.73 -
2.74 - If you don't provide one, then the default configuration for
2.75 - your target will be used.
2.76 -
2.77 endif
3.1 --- a/config/kernel/linux_headers_copy.in Fri Sep 05 16:15:34 2008 +0000
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,42 +0,0 @@
3.4 -choice
3.5 - bool
3.6 - prompt "Linux kernel version"
3.7 -
3.8 -config KERNEL_COPY_V_2_4_26
3.9 - bool
3.10 - prompt "2.4.26"
3.11 -
3.12 -config KERNEL_COPY_V_2_6_5
3.13 - bool
3.14 - prompt "2.6.5"
3.15 -
3.16 -config KERNEL_COPY_V_2_6_6
3.17 - bool
3.18 - prompt "2.6.6"
3.19 -
3.20 -config KERNEL_COPY_V_2_6_7
3.21 - bool
3.22 - prompt "2.6.7"
3.23 -
3.24 -config KERNEL_COPY_V_2_6_8
3.25 - bool
3.26 - prompt "2.6.8"
3.27 -
3.28 -config KERNEL_COPY_V_2_6_11_3
3.29 - bool
3.30 - prompt "2.6.11.3"
3.31 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
3.32 -
3.33 -# CT_INSERT_VERSION_ABOVE
3.34 -# Don't remove above line!
3.35 -endchoice
3.36 -
3.37 -config KERNEL_VERSION
3.38 - string
3.39 - default "2.6.5" if KERNEL_COPY_V_2_6_5
3.40 - default "2.6.6" if KERNEL_COPY_V_2_6_6
3.41 - default "2.6.7" if KERNEL_COPY_V_2_6_7
3.42 - default "2.6.8" if KERNEL_COPY_V_2_6_8
3.43 - default "2.6.11.3" if KERNEL_COPY_V_2_6_11_3
3.44 -# CT_INSERT_VERSION_STRING_ABOVE
3.45 -# Don't remove above line!
4.1 --- a/config/kernel/linux_headers_sanitised.in Fri Sep 05 16:15:34 2008 +0000
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,62 +0,0 @@
4.4 -choice
4.5 - bool
4.6 - prompt "Linux headers version"
4.7 -
4.8 -config KERNEL_SANITISED_V_2_6_7_0
4.9 - bool
4.10 - prompt "2.6.7.0"
4.11 -
4.12 -config KERNEL_SANITISED_V_2_6_8_0
4.13 - bool
4.14 - prompt "2.6.8.0"
4.15 -
4.16 -config KERNEL_SANITISED_V_2_6_8_1
4.17 - bool
4.18 - prompt "2.6.8.1"
4.19 -
4.20 -config KERNEL_SANITISED_V_2_6_9_0
4.21 - bool
4.22 - prompt "2.6.9.0"
4.23 -
4.24 -config KERNEL_SANITISED_V_2_6_9_1
4.25 - bool
4.26 - prompt "2.6.9.1"
4.27 -
4.28 -config KERNEL_SANITISED_V_2_6_10_0
4.29 - bool
4.30 - prompt "2.6.10.0"
4.31 -
4.32 -config KERNEL_SANITISED_V_2_6_11_0
4.33 - bool
4.34 - prompt "2.6.11.0"
4.35 -
4.36 -config KERNEL_SANITISED_V_2_6_11_1
4.37 - bool
4.38 - prompt "2.6.11.1"
4.39 -
4.40 -config KERNEL_SANITISED_V_2_6_11_2
4.41 - bool
4.42 - prompt "2.6.11.2"
4.43 -
4.44 -config KERNEL_SANITISED_V_2_6_12_0
4.45 - bool
4.46 - prompt "2.6.12.0"
4.47 -
4.48 -# CT_INSERT_VERSION_ABOVE
4.49 -# Don't remove above line!
4.50 -endchoice
4.51 -
4.52 -config KERNEL_VERSION
4.53 - string
4.54 - default "2.6.7.0" if KERNEL_SANITISED_V_2_6_7_0
4.55 - default "2.6.8.0" if KERNEL_SANITISED_V_2_6_8_0
4.56 - default "2.6.8.1" if KERNEL_SANITISED_V_2_6_8_1
4.57 - default "2.6.9.0" if KERNEL_SANITISED_V_2_6_9_0
4.58 - default "2.6.9.1" if KERNEL_SANITISED_V_2_6_9_1
4.59 - default "2.6.10.0" if KERNEL_SANITISED_V_2_6_10_0
4.60 - default "2.6.11.0" if KERNEL_SANITISED_V_2_6_11_0
4.61 - default "2.6.11.1" if KERNEL_SANITISED_V_2_6_11_1
4.62 - default "2.6.11.2" if KERNEL_SANITISED_V_2_6_11_2
4.63 - default "2.6.12.0" if KERNEL_SANITISED_V_2_6_12_0
4.64 -# CT_INSERT_VERSION_STRING_ABOVE
4.65 -# Don't remove above line!
5.1 --- a/patches/linux/2.4.26/100-kmap-types-cleanup.patch Fri Sep 05 16:15:34 2008 +0000
5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
5.3 @@ -1,306 +0,0 @@
5.4 -From http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/att-1234/01-kmap-types-cleanup.patch
5.5 -See http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/1234.html
5.6 -
5.7 -From: Marc-Christian Petersen (m.c.p@wolk-project.de)
5.8 -
5.9 -> > on alpha:
5.10 -> > internal.h:19:28: asm/kmap_types.h: No such file or directory
5.11 -> Same on s390 and some other platforms.We should just get rid of
5.12 -> this problem by providing a generic kmap_types header.
5.13 -I agree on this but your patch is bogus. Please use the attached one instead.
5.14 -
5.15 -Marcello, please apply this one instead. Against 2.4.22-BK (2.4.21-bk14)
5.16 -
5.17 -[ I commented out the hunk
5.18 -#+++ b/include/asm-mips/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.19 -to get this to apply to linux-2.4.26.
5.20 -- dank]
5.21 -
5.22 -diff -Naurp a/crypto/internal.h b/crypto/internal.h
5.23 ---- a/crypto/internal.h 2003-07-19 14:09:06.000000000 +0200
5.24 -+++ b/crypto/internal.h 2003-07-19 14:18:58.000000000 +0200
5.25 -@@ -14,9 +14,9 @@
5.26 - #include <linux/mm.h>
5.27 - #include <linux/highmem.h>
5.28 - #include <linux/init.h>
5.29 -+#include <linux/kmap_types.h>
5.30 - #include <asm/hardirq.h>
5.31 - #include <asm/softirq.h>
5.32 --#include <asm/kmap_types.h>
5.33 -
5.34 - extern enum km_type crypto_km_types[];
5.35 -
5.36 -diff -Naurp a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
5.37 ---- a/include/asm-i386/fixmap.h 2003-07-19 14:09:31.000000000 +0200
5.38 -+++ b/include/asm-i386/fixmap.h 2003-07-19 14:18:58.000000000 +0200
5.39 -@@ -20,7 +20,7 @@
5.40 - #include <asm/page.h>
5.41 - #ifdef CONFIG_HIGHMEM
5.42 - #include <linux/threads.h>
5.43 --#include <asm/kmap_types.h>
5.44 -+#include <linux/kmap_types.h>
5.45 - #endif
5.46 -
5.47 - /*
5.48 -diff -Naurp a/include/asm-i386/highmem.h b/include/asm-i386/highmem.h
5.49 ---- a/include/asm-i386/highmem.h 2003-07-15 10:28:54.000000000 +0200
5.50 -+++ b/include/asm-i386/highmem.h 2003-07-19 14:18:58.000000000 +0200
5.51 -@@ -23,7 +23,6 @@
5.52 - #include <linux/config.h>
5.53 - #include <linux/init.h>
5.54 - #include <linux/interrupt.h>
5.55 --#include <asm/kmap_types.h>
5.56 - #include <asm/pgtable.h>
5.57 -
5.58 - #ifdef CONFIG_DEBUG_HIGHMEM
5.59 -diff -Naurp a/include/asm-i386/kmap_types.h b/include/asm-i386/kmap_types.h
5.60 ---- a/include/asm-i386/kmap_types.h 2003-07-19 14:09:31.000000000 +0200
5.61 -+++ b/include/asm-i386/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.62 -@@ -1,16 +0,0 @@
5.63 --#ifndef _ASM_KMAP_TYPES_H
5.64 --#define _ASM_KMAP_TYPES_H
5.65 --
5.66 --enum km_type {
5.67 -- KM_BOUNCE_READ,
5.68 -- KM_SKB_SUNRPC_DATA,
5.69 -- KM_SKB_DATA_SOFTIRQ,
5.70 -- KM_USER0,
5.71 -- KM_USER1,
5.72 -- KM_BH_IRQ,
5.73 -- KM_SOFTIRQ0,
5.74 -- KM_SOFTIRQ1,
5.75 -- KM_TYPE_NR
5.76 --};
5.77 --
5.78 --#endif
5.79 -diff -Naurp a/include/asm-m68k/kmap_types.h b/include/asm-m68k/kmap_types.h
5.80 ---- a/include/asm-m68k/kmap_types.h 2003-07-19 14:09:33.000000000 +0200
5.81 -+++ b/include/asm-m68k/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.82 -@@ -1,18 +0,0 @@
5.83 --#ifdef __KERNEL__
5.84 --#ifndef _ASM_KMAP_TYPES_H
5.85 --#define _ASM_KMAP_TYPES_H
5.86 --
5.87 --enum km_type {
5.88 -- KM_BOUNCE_READ,
5.89 -- KM_SKB_SUNRPC_DATA,
5.90 -- KM_SKB_DATA_SOFTIRQ,
5.91 -- KM_USER0,
5.92 -- KM_USER1,
5.93 -- KM_BH_IRQ,
5.94 -- KM_SOFTIRQ0,
5.95 -- KM_SOFTIRQ1,
5.96 -- KM_TYPE_NR
5.97 --};
5.98 --
5.99 --#endif
5.100 --#endif /* __KERNEL__ */
5.101 -diff -Naurp a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h
5.102 ---- a/include/asm-mips/fixmap.h 2002-09-27 23:26:03.000000000 +0200
5.103 -+++ b/include/asm-mips/fixmap.h 2003-07-19 14:18:58.000000000 +0200
5.104 -@@ -18,7 +18,7 @@
5.105 - #include <asm/page.h>
5.106 - #ifdef CONFIG_HIGHMEM
5.107 - #include <linux/threads.h>
5.108 --#include <asm/kmap_types.h>
5.109 -+#include <linux/kmap_types.h>
5.110 - #endif
5.111 -
5.112 - /*
5.113 -diff -Naurp a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h
5.114 ---- a/include/asm-mips/highmem.h 2002-12-18 01:03:59.000000000 +0100
5.115 -+++ b/include/asm-mips/highmem.h 2003-07-19 14:18:58.000000000 +0200
5.116 -@@ -22,7 +22,6 @@
5.117 -
5.118 - #include <linux/init.h>
5.119 - #include <linux/interrupt.h>
5.120 --#include <asm/kmap_types.h>
5.121 - #include <asm/pgtable.h>
5.122 -
5.123 - /* undef for production */
5.124 -#diff -Naurp a/include/asm-mips/kmap_types.h b/include/asm-mips/kmap_types.h
5.125 -#--- a/include/asm-mips/kmap_types.h 2002-12-18 01:03:59.000000000 +0100
5.126 -#+++ b/include/asm-mips/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.127 -#@@ -1,14 +0,0 @@
5.128 -#-#ifndef _ASM_KMAP_TYPES_H
5.129 -#-#define _ASM_KMAP_TYPES_H
5.130 -#-
5.131 -#-enum km_type {
5.132 -#- KM_BOUNCE_READ,
5.133 -#- KM_SKB_SUNRPC_DATA,
5.134 -#- KM_SKB_DATA_SOFTIRQ,
5.135 -#- KM_USER0,
5.136 -#- KM_USER1,
5.137 -#- KM_BIO_IRQ,
5.138 -#- KM_TYPE_NR
5.139 -#-};
5.140 -#-
5.141 -#-#endif
5.142 -diff -Naurp a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h
5.143 ---- a/include/asm-ppc/highmem.h 2003-07-19 14:09:33.000000000 +0200
5.144 -+++ b/include/asm-ppc/highmem.h 2003-07-19 14:18:58.000000000 +0200
5.145 -@@ -24,7 +24,7 @@
5.146 -
5.147 - #include <linux/init.h>
5.148 - #include <linux/interrupt.h>
5.149 --#include <asm/kmap_types.h>
5.150 -+#include <linux/kmap_types.h>
5.151 - #include <asm/pgtable.h>
5.152 -
5.153 - /* undef for production */
5.154 -diff -Naurp a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h
5.155 ---- a/include/asm-ppc/kmap_types.h 2003-07-19 14:09:33.000000000 +0200
5.156 -+++ b/include/asm-ppc/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.157 -@@ -1,18 +0,0 @@
5.158 --#ifdef __KERNEL__
5.159 --#ifndef _ASM_KMAP_TYPES_H
5.160 --#define _ASM_KMAP_TYPES_H
5.161 --
5.162 --enum km_type {
5.163 -- KM_BOUNCE_READ,
5.164 -- KM_SKB_SUNRPC_DATA,
5.165 -- KM_SKB_DATA_SOFTIRQ,
5.166 -- KM_USER0,
5.167 -- KM_USER1,
5.168 -- KM_BH_IRQ,
5.169 -- KM_SOFTIRQ0,
5.170 -- KM_SOFTIRQ1,
5.171 -- KM_TYPE_NR
5.172 --};
5.173 --
5.174 --#endif
5.175 --#endif /* __KERNEL__ */
5.176 -diff -Naurp a/include/asm-ppc64/kmap_types.h b/include/asm-ppc64/kmap_types.h
5.177 ---- a/include/asm-ppc64/kmap_types.h 2003-07-19 14:09:35.000000000 +0200
5.178 -+++ b/include/asm-ppc64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.179 -@@ -1,23 +0,0 @@
5.180 --#ifdef __KERNEL__
5.181 --#ifndef _ASM_KMAP_TYPES_H
5.182 --#define _ASM_KMAP_TYPES_H
5.183 --
5.184 --enum km_type {
5.185 -- KM_BOUNCE_READ,
5.186 -- KM_SKB_SUNRPC_DATA,
5.187 -- KM_SKB_DATA_SOFTIRQ,
5.188 -- KM_USER0,
5.189 -- KM_USER1,
5.190 -- KM_BIO_SRC_IRQ,
5.191 -- KM_BIO_DST_IRQ,
5.192 -- KM_PTE0,
5.193 -- KM_PTE1,
5.194 -- KM_IRQ0,
5.195 -- KM_IRQ1,
5.196 -- KM_SOFTIRQ0,
5.197 -- KM_SOFTIRQ1,
5.198 -- KM_TYPE_NR
5.199 --};
5.200 --
5.201 --#endif
5.202 --#endif /* __KERNEL__ */
5.203 -diff -Naurp a/include/asm-sparc/highmem.h b/include/asm-sparc/highmem.h
5.204 ---- a/include/asm-sparc/highmem.h 2003-07-15 10:28:56.000000000 +0200
5.205 -+++ b/include/asm-sparc/highmem.h 2003-07-19 14:18:58.000000000 +0200
5.206 -@@ -21,7 +21,7 @@
5.207 - #ifdef __KERNEL__
5.208 -
5.209 - #include <linux/interrupt.h>
5.210 --#include <asm/kmap_types.h>
5.211 -+#include <linux/kmap_types.h>
5.212 -
5.213 - /* undef for production */
5.214 - #define HIGHMEM_DEBUG 1
5.215 -diff -Naurp a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h
5.216 ---- a/include/asm-sparc/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
5.217 -+++ b/include/asm-sparc/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.218 -@@ -1,16 +0,0 @@
5.219 --#ifndef _ASM_KMAP_TYPES_H
5.220 --#define _ASM_KMAP_TYPES_H
5.221 --
5.222 --enum km_type {
5.223 -- KM_BOUNCE_READ,
5.224 -- KM_SKB_SUNRPC_DATA,
5.225 -- KM_SKB_DATA_SOFTIRQ,
5.226 -- KM_USER0,
5.227 -- KM_USER1,
5.228 -- KM_BH_IRQ,
5.229 -- KM_SOFTIRQ0,
5.230 -- KM_SOFTIRQ1,
5.231 -- KM_TYPE_NR
5.232 --};
5.233 --
5.234 --#endif
5.235 -diff -Naurp a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
5.236 ---- a/include/asm-sparc64/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
5.237 -+++ b/include/asm-sparc64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.238 -@@ -1,20 +0,0 @@
5.239 --#ifndef _ASM_KMAP_TYPES_H
5.240 --#define _ASM_KMAP_TYPES_H
5.241 --
5.242 --/* Dummy header just to define km_type. None of this
5.243 -- * is actually used on sparc64. -DaveM
5.244 -- */
5.245 --
5.246 --enum km_type {
5.247 -- KM_BOUNCE_READ,
5.248 -- KM_SKB_SUNRPC_DATA,
5.249 -- KM_SKB_DATA_SOFTIRQ,
5.250 -- KM_USER0,
5.251 -- KM_USER1,
5.252 -- KM_BH_IRQ,
5.253 -- KM_SOFTIRQ0,
5.254 -- KM_SOFTIRQ1,
5.255 -- KM_TYPE_NR
5.256 --};
5.257 --
5.258 --#endif
5.259 -diff -Naurp a/include/asm-x86_64/kmap_types.h b/include/asm-x86_64/kmap_types.h
5.260 ---- a/include/asm-x86_64/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
5.261 -+++ b/include/asm-x86_64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.262 -@@ -1,15 +0,0 @@
5.263 --#ifndef _ASM_KMAP_TYPES_H
5.264 --#define _ASM_KMAP_TYPES_H
5.265 --
5.266 --enum km_type {
5.267 -- KM_BOUNCE_READ,
5.268 -- KM_SKB_DATA,
5.269 -- KM_SKB_DATA_SOFTIRQ,
5.270 -- KM_USER0,
5.271 -- KM_USER1,
5.272 -- KM_SOFTIRQ0,
5.273 -- KM_SOFTIRQ1,
5.274 -- KM_TYPE_NR
5.275 --};
5.276 --
5.277 --#endif
5.278 -diff -Naurp a/include/linux/highmem.h b/include/linux/highmem.h
5.279 ---- a/include/linux/highmem.h 2003-07-19 14:09:37.000000000 +0200
5.280 -+++ b/include/linux/highmem.h 2003-07-19 14:18:58.000000000 +0200
5.281 -@@ -2,6 +2,7 @@
5.282 - #define _LINUX_HIGHMEM_H
5.283 -
5.284 - #include <linux/config.h>
5.285 -+#include <linux/kmap_types.h>
5.286 - #include <asm/pgalloc.h>
5.287 -
5.288 - #ifdef CONFIG_HIGHMEM
5.289 -diff -Naurp a/include/linux/kmap_types.h b/include/linux/kmap_types.h
5.290 ---- a/include/linux/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
5.291 -+++ b/include/linux/kmap_types.h 2003-07-19 14:18:58.000000000 +0200
5.292 -@@ -0,0 +1,16 @@
5.293 -+#ifndef _LINUX_KMAP_TYPES_H
5.294 -+#define _LINUX_KMAP_TYPES_H
5.295 -+
5.296 -+enum km_type {
5.297 -+ KM_BOUNCE_READ,
5.298 -+ KM_SKB_SUNRPC_DATA,
5.299 -+ KM_SKB_DATA_SOFTIRQ,
5.300 -+ KM_USER0,
5.301 -+ KM_USER1,
5.302 -+ KM_BH_IRQ,
5.303 -+ KM_SOFTIRQ0,
5.304 -+ KM_SOFTIRQ1,
5.305 -+ KM_TYPE_NR
5.306 -+};
5.307 -+
5.308 -+#endif
5.309 -
6.1 --- a/patches/linux/2.4.26/110-kaz-types.patch Fri Sep 05 16:15:34 2008 +0000
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,60 +0,0 @@
6.4 -The following fixes an error that occurs when building glibc-2.3.2 (but not glibc-2.2.5) for sh4:
6.5 -
6.6 -In file included from sys/ustat.h:30,
6.7 - from ../sysdeps/unix/sysv/linux/ustat.c:21:
6.8 -../sysdeps/generic/bits/ustat.h:26: error: redefinition of `struct ustat'
6.9 -make[2]: *** [/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/build-glibc/misc/ustat.o] Error 1
6.10 -make[2]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2/misc'
6.11 -make[1]: *** [misc/subdir_lib] Error 2
6.12 -make[1]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2'
6.13 -make: *** [all] Error 2
6.14 -
6.15 ------------ snip ---------------
6.16 -
6.17 -Date: Fri, 06 Jun 2003 08:00:00 +0900
6.18 -From: kaz Kojima <kkojima@rr.iij4u.or.jp>
6.19 -Subject: [linux-sh:02770] Re: Compiling glibc-2.3.2 for sh4 fails with "include/asm/user.h:32:
6.20 - error: redefinition of `struct user_fpu_struct'"
6.21 -To: linux-sh@m17n.org
6.22 -Message-Id: <200306052250.h55Moeb08707@r-rr.iij4u.or.jp>
6.23 -
6.24 -Hi,
6.25 -
6.26 -Dan Kegel <dank@kegel.com> wrote:
6.27 -> When I try to build glibc-2.3.2 for sh4, it fails with the error
6.28 -[snip]
6.29 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:32: error: redefinition of `struct user_fpu_struct'
6.30 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:39: error: redefinition of `struct user'
6.31 -[snip]
6.32 -> The error reminds me of the kind of thing fixed by
6.33 -> http://www.kegel.com/crossgcc/crosstool-0.4/glibc-2.3.2-patches/sh-user.patch
6.34 -
6.35 -It seems that the definitions in asm/user.h and the above patch collide.
6.36 -I'm not sure why you need this patch, but is it needed for the problem
6.37 -about struct ustat that you pointed out in this list, isn't it?
6.38 -I found why I don't hit ustat problem - my local kernel tree includes
6.39 -the following patch, though I can't recall about it.
6.40 -
6.41 -Regards,
6.42 - kaz
6.43 ---
6.44 -diff -u linux-2.5.69-sf-orig/include/linux/types.h /usr/local/sh4-unknown-linux-gnu/include/linux/types.h
6.45 ---- linux-2.5.69-sf-orig/include/linux/types.h Wed Mar 5 12:29:34 2003
6.46 -+++ sh4-unknown-linux-gnu/include/linux/types.h Sat Apr 19 10:05:52 2003
6.47 -@@ -141,6 +141,7 @@
6.48 -
6.49 - #endif /* __KERNEL_STRICT_NAMES */
6.50 -
6.51 -+#ifdef __KERNEL__
6.52 - /*
6.53 - * Below are truly Linux-specific types that should never collide with
6.54 - * any application/library that wants linux/types.h.
6.55 -@@ -152,5 +153,6 @@
6.56 - char f_fname[6];
6.57 - char f_fpack[6];
6.58 - };
6.59 -+#endif
6.60 -
6.61 - #endif /* _LINUX_TYPES_H */
6.62 -
6.63 -
7.1 --- a/patches/linux/2.4.26/120-linux-2.4.21-allow-gcc-3.3-arm-lib.patch Fri Sep 05 16:15:34 2008 +0000
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,203 +0,0 @@
7.4 -Reconstructed from http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2003-December/018647.html
7.5 -See also http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=1540
7.6 -
7.7 -Message-ID: <DDA001.8070502@de.bosch.com>
7.8 -Subject: Help cross compiling the kernel for arm.
7.9 -From: dirk.behme at de.bosch.com
7.10 -
7.11 -Aitor Garcia wrote:
7.12 -> Hello everybody,
7.13 ->
7.14 -> I am having problems cross compiling the kernel for arm.
7.15 ->
7.16 -> This is the error message I get:
7.17 ->
7.18 -> blkpg.c: In function `blk_ioctl':
7.19 -> blkpg.c:252: error: asm-specifier for variable `__r1' conflicts with asm clobber list
7.20 -> blkpg.c:252: confused by earlier errors, bailing out make[3]: *** [blkpg.o] Error 1
7.21 -> make[3]: Leaving directory `/root/toolchain/kernel-arm/linux-2.4.21/drivers/block'
7.22 -> make[2]: *** [first_rule] Error 2
7.23 -> make[2]: Leaving directory `/root/toolchain/kernel-arm/linux-2.4.21/drivers/block'
7.24 -> make[1]: *** [_subdir_block] Error 2
7.25 -> make[1]: Leaving directory `/root/toolchain/kernel-arm/linux-2.4.21/drivers'
7.26 -> make: *** [_dir_drivers] Error 2
7.27 ->
7.28 -> These are the toolchain versions I am using:
7.29 -> host=i686-pc-linux-gnu
7.30 -> binutils_version=2.14
7.31 -> gcc_version=3.3.2
7.32 -> glibc_version=2.3.2
7.33 -> kernel_version=2.4.21
7.34 -> and applied the kernel patch for arm. 2.4.21-rmk1.
7.35 -> ...
7.36 -> I have also seen references to this bug in ARM linux
7.37 -> Developer. Patch Number = 1540. But this patch is
7.38 -> classified as discarded.
7.39 -
7.40 -You need something like 1540 to compile 2.4.21 with gcc 3.3.2. 1540 was
7.41 -discarded because of AFLAGS change.
7.42 -
7.43 -Try the attachment.
7.44 -
7.45 -Dirk
7.46 --------------- next part --------------
7.47 ---- linux/arch/arm/lib/getuser.S.orig Mon Nov 17 07:41:51 2003
7.48 -+++ linux/arch/arm/lib/getuser.S Mon Nov 17 07:43:16 2003
7.49 -@@ -17,7 +17,7 @@
7.50 - *
7.51 - * Inputs: r0 contains the address
7.52 - * Outputs: r0 is the error code
7.53 -- * r1, r2 contains the zero-extended value
7.54 -+ * r1, ip contains the zero-extended value
7.55 - * lr corrupted
7.56 - *
7.57 - * No other registers must be altered. (see include/asm-arm/uaccess.h
7.58 -@@ -42,14 +42,14 @@ __get_user_1:
7.59 -
7.60 - .global __get_user_2
7.61 - __get_user_2:
7.62 -- bic r2, sp, #0x1f00
7.63 -- bic r2, r2, #0x00ff
7.64 -- ldr r2, [r2, #TSK_ADDR_LIMIT]
7.65 -- sub r2, r2, #2
7.66 -- cmp r0, r2
7.67 -+ bic ip, sp, #0x1f00
7.68 -+ bic ip, ip, #0x00ff
7.69 -+ ldr ip, [ip, #TSK_ADDR_LIMIT]
7.70 -+ sub ip, ip, #2
7.71 -+ cmp r0, ip
7.72 - 2: ldrlsbt r1, [r0], #1
7.73 --3: ldrlsbt r2, [r0]
7.74 -- orrls r1, r1, r2, lsl #8
7.75 -+3: ldrlsbt ip, [r0]
7.76 -+ orrls r1, r1, ip, lsl #8
7.77 - movls r0, #0
7.78 - movls pc, lr
7.79 - b __get_user_bad
7.80 -@@ -68,20 +68,20 @@ __get_user_4:
7.81 -
7.82 - .global __get_user_8
7.83 - __get_user_8:
7.84 -- bic r2, sp, #0x1f00
7.85 -- bic r2, r2, #0x00ff
7.86 -- ldr r2, [r2, #TSK_ADDR_LIMIT]
7.87 -- sub r2, r2, #8
7.88 -- cmp r0, r2
7.89 -+ bic ip, sp, #0x1f00
7.90 -+ bic ip, ip, #0x00ff
7.91 -+ ldr ip, [ip, #TSK_ADDR_LIMIT]
7.92 -+ sub ip, ip, #8
7.93 -+ cmp r0, ip
7.94 - 5: ldrlst r1, [r0], #4
7.95 --6: ldrlst r2, [r0]
7.96 -+6: ldrlst ip, [r0]
7.97 - movls r0, #0
7.98 - movls pc, lr
7.99 -
7.100 - /* fall through */
7.101 -
7.102 - __get_user_bad_8:
7.103 -- mov r2, #0
7.104 -+ mov ip, #0
7.105 - __get_user_bad:
7.106 - mov r1, #0
7.107 - mov r0, #-14
7.108 ---- linux/arch/arm/lib/putuser.S.orig Mon Nov 17 07:41:57 2003
7.109 -+++ linux/arch/arm/lib/putuser.S Mon Nov 17 07:42:26 2003
7.110 -@@ -16,7 +16,7 @@
7.111 - * __put_user_X
7.112 - *
7.113 - * Inputs: r0 contains the address
7.114 -- * r1, r2 contains the value
7.115 -+ * r1, ip contains the value
7.116 - * Outputs: r0 is the error code
7.117 - * lr corrupted
7.118 - *
7.119 -@@ -30,11 +30,11 @@
7.120 -
7.121 - .global __put_user_1
7.122 - __put_user_1:
7.123 -- bic r2, sp, #0x1f00
7.124 -- bic r2, r2, #0x00ff
7.125 -- ldr r2, [r2, #TSK_ADDR_LIMIT]
7.126 -- sub r2, r2, #1
7.127 -- cmp r0, r2
7.128 -+ bic ip, sp, #0x1f00
7.129 -+ bic ip, ip, #0x00ff
7.130 -+ ldr ip, [ip, #TSK_ADDR_LIMIT]
7.131 -+ sub ip, ip, #1
7.132 -+ cmp r0, ip
7.133 - 1: strlsbt r1, [r0]
7.134 - movls r0, #0
7.135 - movls pc, lr
7.136 -@@ -42,11 +42,11 @@ __put_user_1:
7.137 -
7.138 - .global __put_user_2
7.139 - __put_user_2:
7.140 -- bic r2, sp, #0x1f00
7.141 -- bic r2, r2, #0x00ff
7.142 -- ldr r2, [r2, #TSK_ADDR_LIMIT]
7.143 -- sub r2, r2, #2
7.144 -- cmp r0, r2
7.145 -+ bic ip, sp, #0x1f00
7.146 -+ bic ip, ip, #0x00ff
7.147 -+ ldr ip, [ip, #TSK_ADDR_LIMIT]
7.148 -+ sub ip, ip, #2
7.149 -+ cmp r0, ip
7.150 - 2: strlsbt r1, [r0], #1
7.151 - movls r1, r1, lsr #8
7.152 - 3: strlsbt r1, [r0]
7.153 -@@ -56,11 +56,11 @@ __put_user_2:
7.154 -
7.155 - .global __put_user_4
7.156 - __put_user_4:
7.157 -- bic r2, sp, #0x1f00
7.158 -- bic r2, r2, #0x00ff
7.159 -- ldr r2, [r2, #TSK_ADDR_LIMIT]
7.160 -- sub r2, r2, #4
7.161 -- cmp r0, r2
7.162 -+ bic ip, sp, #0x1f00
7.163 -+ bic ip, ip, #0x00ff
7.164 -+ ldr ip, [ip, #TSK_ADDR_LIMIT]
7.165 -+ sub ip, ip, #4
7.166 -+ cmp r0, ip
7.167 - 4: strlst r1, [r0]
7.168 - movls r0, #0
7.169 - movls pc, lr
7.170 -@@ -74,7 +74,7 @@ __put_user_8:
7.171 - sub ip, ip, #8
7.172 - cmp r0, ip
7.173 - 5: strlst r1, [r0], #4
7.174 --6: strlst r2, [r0]
7.175 -+6: strlst ip, [r0]
7.176 - movls r0, #0
7.177 - movls pc, lr
7.178 -
7.179 ---- linux/include/asm-arm/uaccess.h.orig Mon Nov 17 07:41:04 2003
7.180 -+++ linux/include/asm-arm/uaccess.h Mon Nov 17 07:41:37 2003
7.181 -@@ -86,7 +86,7 @@ extern int __get_user_bad(void);
7.182 - __get_user_x(__r1, __p, __e, 1, "lr"); \
7.183 - break; \
7.184 - case 2: \
7.185 -- __get_user_x(__r1, __p, __e, 2, "r2", "lr"); \
7.186 -+ __get_user_x(__r1, __p, __e, 2, "ip", "lr"); \
7.187 - break; \
7.188 - case 4: \
7.189 - __get_user_x(__r1, __p, __e, 4, "lr"); \
7.190 -@@ -122,13 +122,13 @@ extern int __put_user_bad(void);
7.191 - register int __e asm("r0"); \
7.192 - switch (sizeof(*(p))) { \
7.193 - case 1: \
7.194 -- __put_user_x(__r1, __p, __e, 1, "r2", "lr"); \
7.195 -+ __put_user_x(__r1, __p, __e, 1, "ip", "lr"); \
7.196 - break; \
7.197 - case 2: \
7.198 -- __put_user_x(__r1, __p, __e, 2, "r2", "lr"); \
7.199 -+ __put_user_x(__r1, __p, __e, 2, "ip", "lr"); \
7.200 - break; \
7.201 - case 4: \
7.202 -- __put_user_x(__r1, __p, __e, 4, "r2", "lr"); \
7.203 -+ __put_user_x(__r1, __p, __e, 4, "ip", "lr"); \
7.204 - break; \
7.205 - case 8: \
7.206 - __put_user_x(__r1, __p, __e, 8, "ip", "lr"); \
8.1 --- a/patches/linux/2.4.26/130-linux-2.4.26-allow-gcc-3.4-arm-kernel.patch Fri Sep 05 16:15:34 2008 +0000
8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
8.3 @@ -1,23 +0,0 @@
8.4 -Fixes
8.5 -semaphore.c:180:5: missing terminating " character
8.6 -semaphore.c:213:9: missing terminating " character
8.7 -make[1]: *** [semaphore.o] Error 1
8.8 -make[1]: Leaving directory `/home/dank/queue/jobdir.fast/crosstool-dev/build/arm-unknown-linux-gnu/gcc-3.3.4-glibc-2.2.5/linux-2.4.26/arch/arm/kernel'
8.9 -make: *** [_dir_arch/arm/kernel] Error 2
8.10 -
8.11 -when building kernel.org 2.4.26 for arm with gcc-3.3.x
8.12 -(Note: one probably wants to apply ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.26-vrs1.bz2
8.13 -instead of my patches when really building 2.4.26 for arm;
8.14 -my patches only include the bare minimum to get the vanilla kernel to compile.)
8.15 -
8.16 ---- linux-2.4.26/arch/arm/kernel/semaphore.c.old Mon Mar 21 06:50:38 2005
8.17 -+++ linux-2.4.26/arch/arm/kernel/semaphore.c Mon Mar 21 06:50:55 2005
8.18 -@@ -193,7 +193,7 @@
8.19 - bl __down_interruptible \n\
8.20 - mov ip, r0 \n\
8.21 - ldmfd sp!, {r0 - r3, pc}^ \n\
8.22 --
8.23 -+ \n\
8.24 - .align 5 \n\
8.25 - .globl __down_trylock_failed \n\
8.26 - __down_trylock_failed: \n\
9.1 --- a/patches/linux/2.4.26/140-linux-2.4.26-arm-nonofpu.patch Fri Sep 05 16:15:34 2008 +0000
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,40 +0,0 @@
9.4 -Backport of linux-2.6.8-arm-nonofpu.patch.
9.5 -Fixes error when building linux-2.4.26 kernel with gcc-3.4 on arm.
9.6 -
9.7 -/opt/crosstool/arm-unknown-linux-gnu/gcc-3.4.2-glibc-2.2.5/bin/arm-unknown-linux-gnu-gcc -D__KERNEL__ -I/home/dank/wk/crosstool-0.28-rc37/build/arm-unknown-linux-gnu/gcc-3.4.2-glibc-2.2.5/linux-2.4.26/include -Wall -Wstrict-prototypes -Wno-trigraphs -Os -fno-strict-aliasing -fno-common -Uarm -fno-common -pipe -mapcs-32 -D__LINUX_ARM_ARCH__=4 -march=armv4 -mtune=strongarm110 -mshort-load-bytes -msoft-float -Uarm -S -o constants.h.tmp.1 getconstants.c
9.8 -cc1: error: invalid option `short-load-bytes'
9.9 -make[2]: *** [constants.h] Error 1
9.10 -make[2]: Leaving directory `/home/dank/wk/crosstool-0.28-rc37/build/arm-unknown-linux-gnu/gcc-3.4.2-glibc-2.2.5/linux-2.4.26/arch/arm/tools'
9.11 -make[1]: *** [dep] Error 2
9.12 -make[1]: Leaving directory `/home/dank/wk/crosstool-0.28-rc37/build/arm-unknown-linux-gnu/gcc-3.4.2-glibc-2.2.5/linux-2.4.26/arch/arm/tools'
9.13 -make: *** [archdep] Error 2
9.14 -
9.15 -
9.16 ---- linux-2.4.26/Makefile.old Thu Sep 30 23:21:14 2004
9.17 -+++ linux-2.4.26/Makefile Thu Sep 30 23:24:12 2004
9.18 -@@ -21,6 +21,10 @@
9.19 -
9.20 - CROSS_COMPILE =
9.21 -
9.22 -+# From linux-2.6
9.23 -+check_gcc = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
9.24 -+export check_gcc
9.25 -+
9.26 - #
9.27 - # Include the make variables (CC, etc...)
9.28 - #
9.29 ---- linux-2.4.26/arch/arm/Makefile.old Thu Sep 30 23:16:49 2004
9.30 -+++ linux-2.4.26/arch/arm/Makefile Thu Sep 30 23:25:27 2004
9.31 -@@ -50,9 +50,9 @@
9.32 - tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110
9.33 - tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100
9.34 -
9.35 --CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm
9.36 --CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm
9.37 --AFLAGS +=$(apcs-y) $(arch-y) -mno-fpu -msoft-float
9.38 -+CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm
9.39 -+CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm
9.40 -+AFLAGS +=$(apcs-y) $(arch-y) -msoft-float
9.41 -
9.42 - ifeq ($(CONFIG_CPU_26),y)
9.43 - PROCESSOR := armo
10.1 --- a/patches/linux/2.4.26/150-linux-2.4.26-mkdep-xargs.patch Fri Sep 05 16:15:34 2008 +0000
10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
10.3 @@ -1,28 +0,0 @@
10.4 -About ten times, various people have noticed that 'make dep' uses
10.5 -really, really long commandlines. This breaks sh even on linux sometimes.
10.6 -
10.7 -For 2.4, see e.g.
10.8 -http://marc.theaimsgroup.com/?l=linux-kernel&m=96589814004919&w=2
10.9 -http://marc.theaimsgroup.com/?l=linux-kernel&m=96589814004919&q=p3
10.10 -http://www.xraylith.wisc.edu/~khan/software/gnu-win32/cygwin-to-linux-cross-howto.txt
10.11 -http://www.uclinux.org/pub/uClinux/archive/1728.html
10.12 -
10.13 -Fixes error when building linux kernel for some default arm configurations:
10.14 -
10.15 -scripts/mkdep -- `find /home/dank/wk/crosstool-0.28-rc36/build/arm-unknown-linux-gnu/gcc-3.3.4-glibc-2.3.2/linux-2.4.26/include/asm /home/dank/wk/crosstool-0.28-rc36/build/arm-unknown-linux-gnu/gcc-3.3.4-glibc-2.3.2/linux-2.4.26/include/linux /home/dank/wk/crosstool-0.28-rc36/build/arm-unknown-linux-gnu/gcc-3.3.4-glibc-2.3.2/linux-2.4.26/include/scsi /home/dank/wk/crosstool-0.28-rc36/build/arm-unknown-linux-gnu/gcc-3.3.4-glibc-2.3.2/linux-2.4.26/include/net /home/dank/wk/crosstool-0.28-rc36/build/arm-unknown-linux-gnu/gcc-3.3.4-glibc-2.3.2/linux-2.4.26/include/math-emu \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
10.16 -/bin/sh: line 1: scripts/mkdep: Argument list too long
10.17 -make: *** [dep-files] Error 126
10.18 -
10.19 -[ For linux-2.4.26 ]
10.20 -
10.21 ---- linux-2.4.26/Makefile.old 2004-04-14 06:05:41.000000000 -0700
10.22 -+++ linux-2.4.26/Makefile 2004-09-13 21:27:39.000000000 -0700
10.23 -@@ -500,7 +500,7 @@
10.24 - ifdef CONFIG_MODVERSIONS
10.25 - $(MAKE) update-modverfile
10.26 - endif
10.27 -- scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
10.28 -+ find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print | xargs scripts/mkdep | cat > .hdepend
10.29 - scripts/mkdep -- init/*.c > .depend
10.30 -
10.31 - ifdef CONFIG_MODVERSIONS
11.1 --- a/patches/linux/2.4.26/160-linux-2.4.26-wdt977-uaccess.patch Fri Sep 05 16:15:34 2008 +0000
11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
11.3 @@ -1,17 +0,0 @@
11.4 -Fixes drivers/char/char.o(.text+0x178a4): In function `$a':
11.5 -: undefined reference to `get_user'
11.6 -
11.7 -Part of ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.26-vrs1.bz2
11.8 -
11.9 -diff -urN linux-2.4.26/drivers/char/wdt977.c linux-2.4.26-vrs1/drivers/char/wdt977.c
11.10 ---- linux-2.4.26/drivers/char/wdt977.c 2002-11-28 23:53:12.000000000 +0000
11.11 -+++ linux-2.4.26-vrs1/drivers/char/wdt977.c 2004-01-14 21:32:25.000000000 +0000
11.12 -@@ -27,6 +27,7 @@
11.13 - #include <asm/io.h>
11.14 - #include <asm/system.h>
11.15 - #include <asm/mach-types.h>
11.16 -+#include <asm/uaccess.h>
11.17 -
11.18 - #define WATCHDOG_MINOR 130
11.19 -
11.20 -
12.1 --- a/patches/linux/2.4.26/170-linux-2.4-bsd-expr.patch Fri Sep 05 16:15:34 2008 +0000
12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
12.3 @@ -1,25 +0,0 @@
12.4 -# http://in3www.epfl.ch/~schaffne/linux-2.4-bsd-expr.patch
12.5 -The following makes it possible to compile linux 2.4.19 to 2.4.25 on Mac OS X,
12.6 -where "expr" doesn't understand the "length" construct
12.7 -(which it doesn't have to, according to SuSv3
12.8 -(see http://www.opengroup.org/onlinepubs/007904975/utilities/expr.html)
12.9 -See also http://sources.redhat.com/ml/crossgcc/2004-02/msg00131.html
12.10 -
12.11 -Fixes error
12.12 - expr: syntax error
12.13 - KERNELRELEASE "2.4.21" exceeds 64 characters
12.14 - make: *** [include/linux/version.h] Error 1
12.15 -
12.16 -
12.17 -diff -ur linux-2.4.23-old/Makefile linux-2.4.23/Makefile
12.18 ---- linux-2.4.23-old/Makefile 2003-12-09 14:27:56.000000000 +0100
12.19 -+++ linux-2.4.23/Makefile 2003-12-09 14:28:37.000000000 +0100
12.20 -@@ -353,7 +353,7 @@
12.21 - @rm -f .ver1
12.22 -
12.23 - include/linux/version.h: ./Makefile
12.24 -- @expr length "$(KERNELRELEASE)" \<= $(uts_len) > /dev/null || \
12.25 -+ @expr "$(KERNELRELEASE)" : '.*' \<= $(uts_len) > /dev/null || \
12.26 - (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
12.27 - @echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
12.28 - @echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
13.1 --- a/patches/linux/2.6.11.3/100-arch_alpha_kernel_srcons.patch Fri Sep 05 16:15:34 2008 +0000
13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
13.3 @@ -1,134 +0,0 @@
13.4 -Date: Sun, 20 Mar 2005 20:26:02 -0800
13.5 -From: Richard Henderson <rth@twiddle.net>
13.6 -To: Andrew Morton <akpm@osdl.org>
13.7 -Cc: Dan Kegel <dank@kegel.com>, jbglaw@lug-owl.de,
13.8 - linux-kernel@vger.kernel.org, torvalds@osdl.org
13.9 -Subject: Re: 2.6.11.3 build problem in arch/alpha/kernel/srcons.c with gcc-4.0
13.10 -Message-ID: <20050321042602.GA3795@twiddle.net>
13.11 -Mail-Followup-To: Andrew Morton <akpm@osdl.org>, Dan Kegel <dank@kegel.com>,
13.12 - jbglaw@lug-owl.de, linux-kernel@vger.kernel.org, torvalds@osdl.org
13.13 -References: <423E238F.3030805@kegel.com> <20050320190352.65cc1396.akpm@osdl.org>
13.14 -Mime-Version: 1.0
13.15 -Content-Type: text/plain; charset=us-ascii
13.16 -Content-Disposition: inline
13.17 -In-Reply-To: <20050320190352.65cc1396.akpm@osdl.org>
13.18 -User-Agent: Mutt/1.4.1i
13.19 -
13.20 -On Sun, Mar 20, 2005 at 07:03:52PM -0800, Andrew Morton wrote:
13.21 -> Dan Kegel <dank@kegel.com> wrote:
13.22 -> >
13.23 -> > Anyone with an alpha care to suggest a fix for this?
13.24 -> >
13.25 -> > arch/alpha/kernel/srmcons.c: In function 'srmcons_open':
13.26 -> > arch/alpha/kernel/srmcons.c:196: warning: 'srmconsp' may be used uninitialized in this function
13.27 -> > make[1]: *** [arch/alpha/kernel/srmcons.o] Error 1
13.28 -> > make: *** [arch/alpha/kernel] Error 2
13.29 -> >
13.30 -> > I get this when building the 2.6.11.3 kernel with a recent gcc-4.0 snapshot.
13.31 -> >
13.32 ->
13.33 -> It's beyond gcc's ability to figure out that the code is OK. Options would
13.34 -> be to disable -Werror, or to artificially initialise that variable.
13.35 -
13.36 -Fixed thus.
13.37 -
13.38 -Note that even with a _raw_read_trylock implementation, smp still
13.39 -doesn't work. Everything that init spawns dies immediately. I
13.40 -havn't had a chance to find out why yet...
13.41 -
13.42 -[ Note: deleted changes to smp.c, since they didn't apply cleanly
13.43 - to 2.6.11.3 (the function had moved, I guess), and they seemed unrelated.]
13.44 -
13.45 -r~
13.46 -
13.47 -
13.48 -
13.49 -You can import this changeset into BK by piping this whole message to:
13.50 -'| bk receive [path to repository]' or apply the patch as usual.
13.51 -
13.52 -===================================================================
13.53 -
13.54 -
13.55 -ChangeSet@1.2289, 2005-03-20 12:29:41-08:00, rth@kanga.twiddle.home
13.56 - [ALPHA] Elimitate two warnings from gcc4.
13.57 -
13.58 -
13.59 - smp.c | 43 -------------------------------------------
13.60 - srmcons.c | 27 ++++++++++-----------------
13.61 - 2 files changed, 10 insertions(+), 60 deletions(-)
13.62 -
13.63 -
13.64 -diff -Nru a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
13.65 ---- a/arch/alpha/kernel/srmcons.c 2005-03-20 20:23:28 -08:00
13.66 -+++ b/arch/alpha/kernel/srmcons.c 2005-03-20 20:23:28 -08:00
13.67 -@@ -164,29 +164,22 @@
13.68 - unsigned long flags;
13.69 - int retval = 0;
13.70 -
13.71 -- spin_lock_irqsave(&srmconsp_lock, flags);
13.72 --
13.73 -- do {
13.74 -- if (srmconsp != NULL) {
13.75 -- *ps = srmconsp;
13.76 -- break;
13.77 -- }
13.78 -+ if (srmconsp == NULL) {
13.79 -+ spin_lock_irqsave(&srmconsp_lock, flags);
13.80 -
13.81 - srmconsp = kmalloc(sizeof(*srmconsp), GFP_KERNEL);
13.82 -- if (srmconsp == NULL) {
13.83 -+ if (srmconsp == NULL)
13.84 - retval = -ENOMEM;
13.85 -- break;
13.86 -+ else {
13.87 -+ srmconsp->tty = NULL;
13.88 -+ spin_lock_init(&srmconsp->lock);
13.89 -+ init_timer(&srmconsp->timer);
13.90 - }
13.91 -
13.92 -- srmconsp->tty = NULL;
13.93 -- spin_lock_init(&srmconsp->lock);
13.94 -- init_timer(&srmconsp->timer);
13.95 --
13.96 -- *ps = srmconsp;
13.97 -- } while(0);
13.98 --
13.99 -- spin_unlock_irqrestore(&srmconsp_lock, flags);
13.100 -+ spin_unlock_irqrestore(&srmconsp_lock, flags);
13.101 -+ }
13.102 -
13.103 -+ *ps = srmconsp;
13.104 - return retval;
13.105 - }
13.106 -
13.107 -
13.108 -===================================================================
13.109 -
13.110 -
13.111 -This BitKeeper patch contains the following changesets:
13.112 -1.2289
13.113 -## Wrapped with gzip_uu ##
13.114 -
13.115 -
13.116 -M'XL( $!,/D( [56[V_;-A#]+/X5!Q38FFV628KZY<!!TJ98BP9;D"&?BL)@
13.117 -M),H6+%$:2=DQIOWO)>4XSH8D1KK%-F#@>'J\]^[>V6_@6@LU\919H#?PL=%F
13.118 -MXG$E?+,N\[P2OA3&QJ^:QL;'BZ868YLY?O=YS&_;$?4C9$\ON<D6L!)*3SSB
13.119 -M!_<1LVG%Q+OZ\.OUQ=D50M,IO%]P.1=_" /3*3*-6O$JUZ?<+*I&^D9QJ6MA
13.120 -MN)\U=7^?VE.,J7V') YP&/4DPBSN,Y(3PAD1.:8LB=@>3:P:O]%YY3=J_D^4
13.121 -M$ <DH4&0!LRBL"A YT!\2I,4<#C&P9AB('1"TPDC(YQ,, 9+]G1I(?B]($X#
13.122 -M^)G""*-W\/]2>(\R^')V<?GQ["M\J,JZ--P(,.L&UES)4LXU%*JI89YES$>?
13.123 -M@82,8'2Y5Q6-7OA""'.,3AZA:?O><Y4MQKQJ%WR\%$J*:JQ5G352^YEC%&!"
13.124 -ML664!%%/+:^PCW-:I 7)XUSDE*;Q$_(= K9]<FK1E(0]HPPS6^'S2C\"6+=;
13.125 -ML#O=&::T#^*8QGU*;D@>)3BWJA?I3?Z"*G>@#RND49R&PW0_0\O-^RN)C,R\
13.126 -MNCVM2MD9U<CRUL_%EYU:7P]+32@A$644]RQ,*!TL0>B_#4'" X8@&$8D?A5+
13.127 -M7(FU*JT1[@J?S869M:I<67/,M%%=9D!W;MTLN(&?6@VE!EZM^4:#>] (Z<RR
13.128 -M':3?8:36P\<._^5S'?L.+YV3*(88?;*4@"*O+.#M'5QK^P^_75]<',%?R/-T
13.129 -M6\I9U63+6:G^U'PEWOZP2QS"OT!1\;D^.K:0<03$0;HO[W%,EY5LLQ)@-DM4
13.130 -M6@P7>;O<T8DQ&]CF'P\'^Q)D:?;WCTY<\&C(<2<S4]9"/3P? D-I"8'$7IHD
13.131 -MCNT6L9,[6DIH.PI/,_/^=H^FCI7KV737WO;X*2\Y\QW^W?A/JP#==')YJDVG
13.132 -M+=HA'SU8!H1AS!@-^X"F=LJ<AT+R8@]9"['@52QT+BKA'%2W,]-):YML(?+.
13.133 -M[HSY,90&\D9H^:,!GIF.5]4&6J&*1M7 Y08Z+8JNLB!%)S-3-M)%:]M:YZKM
13.134 -I\COL*J?5=SG*3;1=2J%3<?]?PY:?+7573PFE(L5)@+X!A'U=W,@(
13.135 -
13.136 -
13.137 -
14.1 --- a/patches/linux/2.6.11.3/110-kaz-types.patch Fri Sep 05 16:15:34 2008 +0000
14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
14.3 @@ -1,60 +0,0 @@
14.4 -The following fixes an error that occurs when building glibc-2.3.2 (but not glibc-2.2.5) for sh4:
14.5 -
14.6 -In file included from sys/ustat.h:30,
14.7 - from ../sysdeps/unix/sysv/linux/ustat.c:21:
14.8 -../sysdeps/generic/bits/ustat.h:26: error: redefinition of `struct ustat'
14.9 -make[2]: *** [/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/build-glibc/misc/ustat.o] Error 1
14.10 -make[2]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2/misc'
14.11 -make[1]: *** [misc/subdir_lib] Error 2
14.12 -make[1]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2'
14.13 -make: *** [all] Error 2
14.14 -
14.15 ------------ snip ---------------
14.16 -
14.17 -Date: Fri, 06 Jun 2003 08:00:00 +0900
14.18 -From: kaz Kojima <kkojima@rr.iij4u.or.jp>
14.19 -Subject: [linux-sh:02770] Re: Compiling glibc-2.3.2 for sh4 fails with "include/asm/user.h:32:
14.20 - error: redefinition of `struct user_fpu_struct'"
14.21 -To: linux-sh@m17n.org
14.22 -Message-Id: <200306052250.h55Moeb08707@r-rr.iij4u.or.jp>
14.23 -
14.24 -Hi,
14.25 -
14.26 -Dan Kegel <dank@kegel.com> wrote:
14.27 -> When I try to build glibc-2.3.2 for sh4, it fails with the error
14.28 -[snip]
14.29 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:32: error: redefinition of `struct user_fpu_struct'
14.30 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:39: error: redefinition of `struct user'
14.31 -[snip]
14.32 -> The error reminds me of the kind of thing fixed by
14.33 -> http://www.kegel.com/crossgcc/crosstool-0.4/glibc-2.3.2-patches/sh-user.patch
14.34 -
14.35 -It seems that the definitions in asm/user.h and the above patch collide.
14.36 -I'm not sure why you need this patch, but is it needed for the problem
14.37 -about struct ustat that you pointed out in this list, isn't it?
14.38 -I found why I don't hit ustat problem - my local kernel tree includes
14.39 -the following patch, though I can't recall about it.
14.40 -
14.41 -Regards,
14.42 - kaz
14.43 ---
14.44 -diff -u linux-2.5.69-sf-orig/include/linux/types.h /usr/local/sh4-unknown-linux-gnu/include/linux/types.h
14.45 ---- linux-2.5.69-sf-orig/include/linux/types.h Wed Mar 5 12:29:34 2003
14.46 -+++ sh4-unknown-linux-gnu/include/linux/types.h Sat Apr 19 10:05:52 2003
14.47 -@@ -141,6 +141,7 @@
14.48 -
14.49 - #endif /* __KERNEL_STRICT_NAMES */
14.50 -
14.51 -+#ifdef __KERNEL__
14.52 - /*
14.53 - * Below are truly Linux-specific types that should never collide with
14.54 - * any application/library that wants linux/types.h.
14.55 -@@ -152,5 +153,6 @@
14.56 - char f_fname[6];
14.57 - char f_fpack[6];
14.58 - };
14.59 -+#endif
14.60 -
14.61 - #endif /* _LINUX_TYPES_H */
14.62 -
14.63 -
15.1 --- a/patches/linux/2.6.11.3/120-linux-2.6.11-allow-gcc-4.0-asm-i386.patch Fri Sep 05 16:15:34 2008 +0000
15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
15.3 @@ -1,150 +0,0 @@
15.4 -Fixes
15.5 -
15.6 -In file included from include/asm/thread_info.h:16,
15.7 - from include/linux/thread_info.h:21,
15.8 - from include/linux/spinlock.h:12,
15.9 - from include/linux/capability.h:45,
15.10 - from include/linux/sched.h:7,
15.11 - from arch/i386/kernel/asm-offsets.c:7:
15.12 -include/asm/processor.h:87: error: array type has incomplete element type
15.13 -make[1]: *** [arch/i386/kernel/asm-offsets.asm] Error 1
15.14 -
15.15 ---- linux-2.6.11.3/include/asm-i386/processor.h.old Tue Mar 15 06:45:26 2005
15.16 -+++ linux-2.6.11.3/include/asm-i386/processor.h Tue Mar 15 06:46:45 2005
15.17 -@@ -81,6 +81,64 @@
15.18 - #define X86_VENDOR_UNKNOWN 0xff
15.19 -
15.20 - /*
15.21 -+ * Size of io_bitmap.
15.22 -+ */
15.23 -+#define IO_BITMAP_BITS 65536
15.24 -+#define IO_BITMAP_BYTES (IO_BITMAP_BITS/8)
15.25 -+#define IO_BITMAP_LONGS (IO_BITMAP_BYTES/sizeof(long))
15.26 -+#define INVALID_IO_BITMAP_OFFSET 0x8000
15.27 -+#define INVALID_IO_BITMAP_OFFSET_LAZY 0x9000
15.28 -+
15.29 -+struct tss_struct {
15.30 -+ unsigned short back_link,__blh;
15.31 -+ unsigned long esp0;
15.32 -+ unsigned short ss0,__ss0h;
15.33 -+ unsigned long esp1;
15.34 -+ unsigned short ss1,__ss1h; /* ss1 is used to cache MSR_IA32_SYSENTER_CS */
15.35 -+ unsigned long esp2;
15.36 -+ unsigned short ss2,__ss2h;
15.37 -+ unsigned long __cr3;
15.38 -+ unsigned long eip;
15.39 -+ unsigned long eflags;
15.40 -+ unsigned long eax,ecx,edx,ebx;
15.41 -+ unsigned long esp;
15.42 -+ unsigned long ebp;
15.43 -+ unsigned long esi;
15.44 -+ unsigned long edi;
15.45 -+ unsigned short es, __esh;
15.46 -+ unsigned short cs, __csh;
15.47 -+ unsigned short ss, __ssh;
15.48 -+ unsigned short ds, __dsh;
15.49 -+ unsigned short fs, __fsh;
15.50 -+ unsigned short gs, __gsh;
15.51 -+ unsigned short ldt, __ldth;
15.52 -+ unsigned short trace, io_bitmap_base;
15.53 -+ /*
15.54 -+ * The extra 1 is there because the CPU will access an
15.55 -+ * additional byte beyond the end of the IO permission
15.56 -+ * bitmap. The extra byte must be all 1 bits, and must
15.57 -+ * be within the limit.
15.58 -+ */
15.59 -+ unsigned long io_bitmap[IO_BITMAP_LONGS + 1];
15.60 -+ /*
15.61 -+ * Cache the current maximum and the last task that used the bitmap:
15.62 -+ */
15.63 -+ unsigned long io_bitmap_max;
15.64 -+ struct thread_struct *io_bitmap_owner;
15.65 -+ /*
15.66 -+ * pads the TSS to be cacheline-aligned (size is 0x100)
15.67 -+ */
15.68 -+ unsigned long __cacheline_filler[35];
15.69 -+ /*
15.70 -+ * .. and then another 0x100 bytes for emergency kernel stack
15.71 -+ */
15.72 -+ unsigned long stack[64];
15.73 -+} __attribute__((packed));
15.74 -+
15.75 -+#define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap)
15.76 -+#define ARCH_MIN_TASKALIGN 16
15.77 -+
15.78 -+/*
15.79 - * capabilities of CPUs
15.80 - */
15.81 -
15.82 -@@ -308,16 +366,6 @@
15.83 -
15.84 - #define HAVE_ARCH_PICK_MMAP_LAYOUT
15.85 -
15.86 --/*
15.87 -- * Size of io_bitmap.
15.88 -- */
15.89 --#define IO_BITMAP_BITS 65536
15.90 --#define IO_BITMAP_BYTES (IO_BITMAP_BITS/8)
15.91 --#define IO_BITMAP_LONGS (IO_BITMAP_BYTES/sizeof(long))
15.92 --#define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap)
15.93 --#define INVALID_IO_BITMAP_OFFSET 0x8000
15.94 --#define INVALID_IO_BITMAP_OFFSET_LAZY 0x9000
15.95 --
15.96 - struct i387_fsave_struct {
15.97 - long cwd;
15.98 - long swd;
15.99 -@@ -371,54 +419,6 @@
15.100 - } mm_segment_t;
15.101 -
15.102 - struct thread_struct;
15.103 --
15.104 --struct tss_struct {
15.105 -- unsigned short back_link,__blh;
15.106 -- unsigned long esp0;
15.107 -- unsigned short ss0,__ss0h;
15.108 -- unsigned long esp1;
15.109 -- unsigned short ss1,__ss1h; /* ss1 is used to cache MSR_IA32_SYSENTER_CS */
15.110 -- unsigned long esp2;
15.111 -- unsigned short ss2,__ss2h;
15.112 -- unsigned long __cr3;
15.113 -- unsigned long eip;
15.114 -- unsigned long eflags;
15.115 -- unsigned long eax,ecx,edx,ebx;
15.116 -- unsigned long esp;
15.117 -- unsigned long ebp;
15.118 -- unsigned long esi;
15.119 -- unsigned long edi;
15.120 -- unsigned short es, __esh;
15.121 -- unsigned short cs, __csh;
15.122 -- unsigned short ss, __ssh;
15.123 -- unsigned short ds, __dsh;
15.124 -- unsigned short fs, __fsh;
15.125 -- unsigned short gs, __gsh;
15.126 -- unsigned short ldt, __ldth;
15.127 -- unsigned short trace, io_bitmap_base;
15.128 -- /*
15.129 -- * The extra 1 is there because the CPU will access an
15.130 -- * additional byte beyond the end of the IO permission
15.131 -- * bitmap. The extra byte must be all 1 bits, and must
15.132 -- * be within the limit.
15.133 -- */
15.134 -- unsigned long io_bitmap[IO_BITMAP_LONGS + 1];
15.135 -- /*
15.136 -- * Cache the current maximum and the last task that used the bitmap:
15.137 -- */
15.138 -- unsigned long io_bitmap_max;
15.139 -- struct thread_struct *io_bitmap_owner;
15.140 -- /*
15.141 -- * pads the TSS to be cacheline-aligned (size is 0x100)
15.142 -- */
15.143 -- unsigned long __cacheline_filler[35];
15.144 -- /*
15.145 -- * .. and then another 0x100 bytes for emergency kernel stack
15.146 -- */
15.147 -- unsigned long stack[64];
15.148 --} __attribute__((packed));
15.149 --
15.150 --#define ARCH_MIN_TASKALIGN 16
15.151 -
15.152 - struct thread_struct {
15.153 - /* cached TLS descriptors. */
16.1 --- a/patches/linux/2.6.11.3/130-linux-2.6.11-allow-gcc-4.0-asm-m68k.patch Fri Sep 05 16:15:34 2008 +0000
16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
16.3 @@ -1,32 +0,0 @@
16.4 -Fixes
16.5 -
16.6 -In file included from include/asm/setup.h:8,
16.7 - from include/asm/machdep.h:8,
16.8 - from include/asm/irq.h:6,
16.9 - from include/asm/hardirq.h:8,
16.10 - from include/linux/hardirq.h:6,
16.11 - from include/asm-generic/local.h:6,
16.12 - from include/asm/local.h:4,
16.13 - from include/linux/module.h:21,
16.14 - from init/main.c:16:
16.15 -include/asm-m68k/setup.h:365: error: array type has incomplete element type
16.16 -
16.17 -when compiling with gcc-4.0. (Affects ppc, too, for some reason.)
16.18 -
16.19 ---- linux-2.6.11.3/include/asm-m68k/setup.h.old Fri Mar 18 13:48:03 2005
16.20 -+++ linux-2.6.11.3/include/asm-m68k/setup.h Fri Mar 18 13:48:14 2005
16.21 -@@ -362,12 +362,13 @@
16.22 - #ifndef __ASSEMBLY__
16.23 - extern int m68k_num_memory; /* # of memory blocks found (and used) */
16.24 - extern int m68k_realnum_memory; /* real # of memory blocks found */
16.25 --extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
16.26 -
16.27 - struct mem_info {
16.28 - unsigned long addr; /* physical address of memory chunk */
16.29 - unsigned long size; /* length of memory chunk (in bytes) */
16.30 - };
16.31 -+
16.32 -+extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
16.33 - #endif
16.34 -
16.35 - #endif /* __KERNEL__ */
17.1 --- a/patches/linux/2.6.11.3/140-linux-2.6.11-allow-gcc-4.0-asm-ppc64.patch Fri Sep 05 16:15:34 2008 +0000
17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
17.3 @@ -1,30 +0,0 @@
17.4 -Fixes
17.5 -
17.6 -In file included from include/asm/current.h:4,
17.7 - from include/linux/wait.h:27,
17.8 - from include/asm/semaphore.h:15,
17.9 - from include/linux/sched.h:19,
17.10 - from arch/ppc64/kernel/asm-offsets.c:18:
17.11 -include/asm/paca.h:25: error: array type has incomplete element type
17.12 -make[1]: *** [arch/ppc64/kernel/asm-offsets.s] Error 1
17.13 -
17.14 -when building with gcc-4.0
17.15 -
17.16 ---- linux-2.6.11.3/include/asm-ppc64/paca.h.old Fri Mar 18 13:23:40 2005
17.17 -+++ linux-2.6.11.3/include/asm-ppc64/paca.h Fri Mar 18 13:24:04 2005
17.18 -@@ -22,7 +22,6 @@
17.19 - #include <asm/iSeries/ItLpRegSave.h>
17.20 - #include <asm/mmu.h>
17.21 -
17.22 --extern struct paca_struct paca[];
17.23 - register struct paca_struct *local_paca asm("r13");
17.24 - #define get_paca() local_paca
17.25 -
17.26 -@@ -114,5 +113,7 @@
17.27 - struct ItLpRegSave reg_save;
17.28 - #endif
17.29 - };
17.30 -+
17.31 -+extern struct paca_struct paca[];
17.32 -
17.33 - #endif /* _PPC64_PACA_H */
18.1 --- a/patches/linux/2.6.11.3/150-linux-2.6.11-allow-gcc-4.0-asm-x86_64.patch Fri Sep 05 16:15:34 2008 +0000
18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
18.3 @@ -1,28 +0,0 @@
18.4 -Fixes:
18.5 -
18.6 -In file included from include/linux/spinlock.h:16,
18.7 - from include/linux/capability.h:45,
18.8 - from include/linux/sched.h:7,
18.9 - from arch/x86_64/kernel/asm-offsets.c:7:
18.10 -include/asm/processor.h:79: error: array type has incomplete element type
18.11 -make[1]: *** [arch/x86_64/kernel/asm-offsets.asm] Error 1
18.12 -
18.13 ---- linux-2.6.11.3/include/asm-x86_64/processor.h.old Tue Mar 15 07:05:07 2005
18.14 -+++ linux-2.6.11.3/include/asm-x86_64/processor.h Tue Mar 15 07:09:53 2005
18.15 -@@ -179,7 +179,6 @@
18.16 - #define IO_BITMAP_BITS 65536
18.17 - #define IO_BITMAP_BYTES (IO_BITMAP_BITS/8)
18.18 - #define IO_BITMAP_LONGS (IO_BITMAP_BYTES/sizeof(long))
18.19 --#define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap)
18.20 - #define INVALID_IO_BITMAP_OFFSET 0x8000
18.21 -
18.22 - struct i387_fxsave_struct {
18.23 -@@ -222,6 +221,8 @@
18.24 - */
18.25 - unsigned long io_bitmap[IO_BITMAP_LONGS + 1];
18.26 - } __attribute__((packed)) ____cacheline_aligned;
18.27 -+
18.28 -+#define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap)
18.29 -
18.30 - extern struct cpuinfo_x86 boot_cpu_data;
18.31 - DECLARE_PER_CPU(struct tss_struct,init_tss);
19.1 --- a/patches/linux/2.6.11.3/160-linux-2.6.11-allow-gcc-4.0-i2c.patch Fri Sep 05 16:15:34 2008 +0000
19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
19.3 @@ -1,58 +0,0 @@
19.4 -Fixes
19.5 -
19.6 -In file included from fs/compat_ioctl.c:69,
19.7 - from arch/ppc64/kernel/ioctl32.c:24:
19.8 -include/linux/i2c.h:58: error: array type has incomplete element type
19.9 -include/linux/i2c.h:197: error: array type has incomplete element type
19.10 -
19.11 -when compiling with gcc-4.0.
19.12 -
19.13 ---- linux-2.6.11.3/include/linux/i2c.h.old 2005-03-19 10:59:09.000000000 -0800
19.14 -+++ linux-2.6.11.3/include/linux/i2c.h 2005-03-19 11:01:37.000000000 -0800
19.15 -@@ -36,7 +36,22 @@
19.16 -
19.17 - /* --- General options ------------------------------------------------ */
19.18 -
19.19 --struct i2c_msg;
19.20 -+/*
19.21 -+ * I2C Message - used for pure i2c transaction, also from /dev interface
19.22 -+ */
19.23 -+struct i2c_msg {
19.24 -+ __u16 addr; /* slave address */
19.25 -+ __u16 flags;
19.26 -+#define I2C_M_TEN 0x10 /* we have a ten bit chip address */
19.27 -+#define I2C_M_RD 0x01
19.28 -+#define I2C_M_NOSTART 0x4000
19.29 -+#define I2C_M_REV_DIR_ADDR 0x2000
19.30 -+#define I2C_M_IGNORE_NAK 0x1000
19.31 -+#define I2C_M_NO_RD_ACK 0x0800
19.32 -+ __u16 len; /* msg length */
19.33 -+ __u8 *buf; /* pointer to msg data */
19.34 -+};
19.35 -+
19.36 - struct i2c_algorithm;
19.37 - struct i2c_adapter;
19.38 - struct i2c_client;
19.39 -@@ -379,22 +394,6 @@
19.40 - /* Return 1 if adapter supports everything we need, 0 if not. */
19.41 - extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func);
19.42 -
19.43 --/*
19.44 -- * I2C Message - used for pure i2c transaction, also from /dev interface
19.45 -- */
19.46 --struct i2c_msg {
19.47 -- __u16 addr; /* slave address */
19.48 -- __u16 flags;
19.49 --#define I2C_M_TEN 0x10 /* we have a ten bit chip address */
19.50 --#define I2C_M_RD 0x01
19.51 --#define I2C_M_NOSTART 0x4000
19.52 --#define I2C_M_REV_DIR_ADDR 0x2000
19.53 --#define I2C_M_IGNORE_NAK 0x1000
19.54 --#define I2C_M_NO_RD_ACK 0x0800
19.55 -- __u16 len; /* msg length */
19.56 -- __u8 *buf; /* pointer to msg data */
19.57 --};
19.58 --
19.59 - /* To determine what functionality is present */
19.60 -
19.61 - #define I2C_FUNC_I2C 0x00000001
20.1 --- a/patches/linux/2.6.11.3/170-linux-2.6.11-allow-gcc-4.0-ppc-mikpe.patch Fri Sep 05 16:15:34 2008 +0000
20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
20.3 @@ -1,86 +0,0 @@
20.4 -
20.5 -Fixes
20.6 -
20.7 -In file included from arch/ppc/kernel/time.c:68:
20.8 -arch/ppc/kernel/time.c:92: error: static declaration of 'time_offset' follows non-static declaration
20.9 -include/linux/timex.h:236: error: previous declaration of 'time_offset' was here
20.10 -make[1]: *** [arch/ppc/kernel/time.o] Error 1
20.11 -
20.12 -when compiling with gcc-4.0
20.13 -
20.14 -Taken from
20.15 -http://user.it.uu.se/~mikpe/linux/patches/2.6/patch-gcc4-fixes-v2-2.6.11
20.16 -Also removes some obsolete externs that caused problems for Mike
20.17 -Mike's patch has a bit more stuff in it, but this was enough for me
20.18 -
20.19 -
20.20 -diff -rupN linux-2.6.11/arch/ppc/kernel/time.c linux-2.6.11.gcc4-fixes-v2/arch/ppc/kernel/time.c
20.21 ---- linux-2.6.11/arch/ppc/kernel/time.c 2005-03-02 19:24:14.000000000 +0100
20.22 -+++ linux-2.6.11.gcc4-fixes-v2/arch/ppc/kernel/time.c 2005-03-02 19:36:26.000000000 +0100
20.23 -@@ -89,7 +89,7 @@ unsigned long tb_to_ns_scale;
20.24 -
20.25 - extern unsigned long wall_jiffies;
20.26 -
20.27 --static long time_offset;
20.28 -+static long ppc_time_offset;
20.29 -
20.30 - DEFINE_SPINLOCK(rtc_lock);
20.31 -
20.32 -@@ -172,7 +172,7 @@ void timer_interrupt(struct pt_regs * re
20.33 - xtime.tv_sec - last_rtc_update >= 659 &&
20.34 - abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ &&
20.35 - jiffies - wall_jiffies == 1) {
20.36 -- if (ppc_md.set_rtc_time(xtime.tv_sec+1 + time_offset) == 0)
20.37 -+ if (ppc_md.set_rtc_time(xtime.tv_sec+1 + ppc_time_offset) == 0)
20.38 - last_rtc_update = xtime.tv_sec+1;
20.39 - else
20.40 - /* Try again one minute later */
20.41 -@@ -289,7 +289,7 @@ void __init time_init(void)
20.42 - unsigned old_stamp, stamp, elapsed;
20.43 -
20.44 - if (ppc_md.time_init != NULL)
20.45 -- time_offset = ppc_md.time_init();
20.46 -+ ppc_time_offset = ppc_md.time_init();
20.47 -
20.48 - if (__USE_RTC()) {
20.49 - /* 601 processor: dec counts down by 128 every 128ns */
20.50 -@@ -334,10 +334,10 @@ void __init time_init(void)
20.51 - set_dec(tb_ticks_per_jiffy);
20.52 -
20.53 - /* If platform provided a timezone (pmac), we correct the time */
20.54 -- if (time_offset) {
20.55 -- sys_tz.tz_minuteswest = -time_offset / 60;
20.56 -+ if (ppc_time_offset) {
20.57 -+ sys_tz.tz_minuteswest = -ppc_time_offset / 60;
20.58 - sys_tz.tz_dsttime = 0;
20.59 -- xtime.tv_sec -= time_offset;
20.60 -+ xtime.tv_sec -= ppc_time_offset;
20.61 - }
20.62 - set_normalized_timespec(&wall_to_monotonic,
20.63 - -xtime.tv_sec, -xtime.tv_nsec);
20.64 -diff -rupN linux-2.6.11/arch/ppc/syslib/open_pic_defs.h linux-2.6.11.gcc4-fixes-v2/arch/ppc/syslib/open_pic_defs.h
20.65 ---- linux-2.6.11/arch/ppc/syslib/open_pic_defs.h 2005-03-02 19:24:14.000000000 +0100
20.66 -+++ linux-2.6.11.gcc4-fixes-v2/arch/ppc/syslib/open_pic_defs.h 2005-03-02 19:36:26.000000000 +0100
20.67 -@@ -172,9 +172,6 @@ struct OpenPIC {
20.68 - OpenPIC_Processor Processor[OPENPIC_MAX_PROCESSORS];
20.69 - };
20.70 -
20.71 --extern volatile struct OpenPIC __iomem *OpenPIC;
20.72 --
20.73 --
20.74 - /*
20.75 - * Current Task Priority Register
20.76 - */
20.77 -diff -rupN linux-2.6.11/include/asm-ppc/prom.h linux-2.6.11.gcc4-fixes-v2/include/asm-ppc/prom.h
20.78 ---- linux-2.6.11/include/asm-ppc/prom.h 2003-09-28 12:19:57.000000000 +0200
20.79 -+++ linux-2.6.11.gcc4-fixes-v2/include/asm-ppc/prom.h 2005-03-02 19:36:26.000000000 +0100
20.80 -@@ -13,9 +13,6 @@
20.81 - typedef void *phandle;
20.82 - typedef void *ihandle;
20.83 -
20.84 --extern char *prom_display_paths[];
20.85 --extern unsigned int prom_num_displays;
20.86 --
20.87 - struct address_range {
20.88 - unsigned int space;
20.89 - unsigned int address;
21.1 --- a/patches/linux/2.6.5/100-linux-2.6.5-x86_64-unistd.patch Fri Sep 05 16:15:34 2008 +0000
21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
21.3 @@ -1,80 +0,0 @@
21.4 -Retrieved with wget http://www.x86-64.org/lists/discuss/msg04963.html
21.5 -then tabs fixed up by rediffing
21.6 -
21.7 -Message-Id: EFF62C7EE88E71429E38641A1172F4C2077104@net.teracruz.com
21.8 -To: discuss@xxxxxxxxxx
21.9 -Subject: Compile error with glibc 2.3.2 + Linux 2.6.5 ARCH=x86_64
21.10 -From: "David Lee" david.lee@xxxxxxxxxxxx
21.11 -Date: Wed, 21 Apr 2004 15:26:04 -0500</li>
21.12 -
21.13 -I am getting compiler errors when trying to compile glibc 2.3.2 using
21.14 -the kernel headers from linux 2.6.5. The headers from linux 2.6.3 work
21.15 -fine.
21.16 -
21.17 -I've traced the cause of the problem to a change made in
21.18 -./include/asm-x86_64/unistd.h in the 2.6.4 release.
21.19 -
21.20 -+#ifndef __ASSEMBLY__
21.21 -+
21.22 -+#include <linux/linkage.h>
21.23 -+#include <linux/compiler.h>
21.24 -+#include <linux/types.h>
21.25 -+#include <asm/ptrace.h>
21.26 -+
21.27 -+asmlinkage long sys_ptrace(long request, long pid,
21.28 -+ unsigned long addr, long data);
21.29 -+asmlinkage long sys_iopl(unsigned int level, struct pt_regs regs);
21.30 -+asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int
21.31 -turn_on);
21.32 -+struct sigaction;
21.33 -+asmlinkage long sys_rt_sigaction(int sig,
21.34 -+ const struct sigaction __user *act,
21.35 -+ struct sigaction __user *oact,
21.36 -+ size_t sigsetsize);
21.37 -+
21.38 -+#endif /* __ASSEMBLY__ */
21.39 -
21.40 -Within glibc, ./sysdeps/unix/sysv/linux/x86_64/syscall.S ends up
21.41 -including this file, which chokes the assembler with the struct
21.42 -declarations in the above #include's.
21.43 -
21.44 -/home/dlee/vcs/Products/Breeze/Dev/Prj/LinuxRH8/tscale2/tools/x86_64/x86
21.45 -_64-linux/glibcinclude/linux/posix_types.h: Assembler messages:
21.46 -/home/dlee/vcs/Products/Breeze/Dev/Prj/LinuxRH8/tscale2/tools/x86_64/x86
21.47 -_64-linux/glibcinclude/linux/posix_types.h:36: Error: no such
21.48 -instruction: `typedef struct{'
21.49 -
21.50 -There are also errors about conflicting re-declarations further along in
21.51 -the glibc build.
21.52 -
21.53 -../posix/sys/types.h:62: error: conflicting types for `dev_t'
21.54 -/home/dlee/vcs/Products/Breeze/Dev/Prj/LinuxRH8/tscale2/tools/x86_64/x86
21.55 -_64-linux/glibcinclude/linux/types.h:23: error: previous declaration of
21.56 -`dev_t'
21.57 -
21.58 -Changing the '#ifndef __ASSEMBLY__' to '#if ((!defined __ASSEMBLY__) &&
21.59 -(defined __KERNEL__))' clears up the problem. My patch is below.
21.60 -
21.61 -dave
21.62 -
21.63 -
21.64 ---- linux-2.6.5/include/asm-x86_64/unistd.h.old 2004-04-03 19:37:36.000000000 -0800
21.65 -+++ linux-2.6.5/include/asm-x86_64/unistd.h 2004-05-05 11:07:11.000000000 -0700
21.66 -@@ -713,7 +713,7 @@
21.67 -
21.68 - #endif /* __KERNEL_SYSCALLS__ */
21.69 -
21.70 --#ifndef __ASSEMBLY__
21.71 -+#if ((!defined __ASSEMBLY__) && (defined __KERNEL__))
21.72 -
21.73 - #include <linux/linkage.h>
21.74 - #include <linux/compiler.h>
21.75 -@@ -730,7 +730,7 @@
21.76 - struct sigaction __user *oact,
21.77 - size_t sigsetsize);
21.78 -
21.79 --#endif /* __ASSEMBLY__ */
21.80 -+#endif /* ((!defined __ASSEMBLY__) && (defined __KERNEL__) */
21.81 -
21.82 - #endif /* __NO_STUBS */
21.83 -
22.1 --- a/patches/linux/2.6.6/100-kaz-types.patch Fri Sep 05 16:15:34 2008 +0000
22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
22.3 @@ -1,60 +0,0 @@
22.4 -The following fixes an error that occurs when building glibc-2.3.2 (but not glibc-2.2.5) for sh4:
22.5 -
22.6 -In file included from sys/ustat.h:30,
22.7 - from ../sysdeps/unix/sysv/linux/ustat.c:21:
22.8 -../sysdeps/generic/bits/ustat.h:26: error: redefinition of `struct ustat'
22.9 -make[2]: *** [/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/build-glibc/misc/ustat.o] Error 1
22.10 -make[2]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2/misc'
22.11 -make[1]: *** [misc/subdir_lib] Error 2
22.12 -make[1]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2'
22.13 -make: *** [all] Error 2
22.14 -
22.15 ------------ snip ---------------
22.16 -
22.17 -Date: Fri, 06 Jun 2003 08:00:00 +0900
22.18 -From: kaz Kojima <kkojima@rr.iij4u.or.jp>
22.19 -Subject: [linux-sh:02770] Re: Compiling glibc-2.3.2 for sh4 fails with "include/asm/user.h:32:
22.20 - error: redefinition of `struct user_fpu_struct'"
22.21 -To: linux-sh@m17n.org
22.22 -Message-Id: <200306052250.h55Moeb08707@r-rr.iij4u.or.jp>
22.23 -
22.24 -Hi,
22.25 -
22.26 -Dan Kegel <dank@kegel.com> wrote:
22.27 -> When I try to build glibc-2.3.2 for sh4, it fails with the error
22.28 -[snip]
22.29 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:32: error: redefinition of `struct user_fpu_struct'
22.30 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:39: error: redefinition of `struct user'
22.31 -[snip]
22.32 -> The error reminds me of the kind of thing fixed by
22.33 -> http://www.kegel.com/crossgcc/crosstool-0.4/glibc-2.3.2-patches/sh-user.patch
22.34 -
22.35 -It seems that the definitions in asm/user.h and the above patch collide.
22.36 -I'm not sure why you need this patch, but is it needed for the problem
22.37 -about struct ustat that you pointed out in this list, isn't it?
22.38 -I found why I don't hit ustat problem - my local kernel tree includes
22.39 -the following patch, though I can't recall about it.
22.40 -
22.41 -Regards,
22.42 - kaz
22.43 ---
22.44 -diff -u linux-2.5.69-sf-orig/include/linux/types.h /usr/local/sh4-unknown-linux-gnu/include/linux/types.h
22.45 ---- linux-2.5.69-sf-orig/include/linux/types.h Wed Mar 5 12:29:34 2003
22.46 -+++ sh4-unknown-linux-gnu/include/linux/types.h Sat Apr 19 10:05:52 2003
22.47 -@@ -141,6 +141,7 @@
22.48 -
22.49 - #endif /* __KERNEL_STRICT_NAMES */
22.50 -
22.51 -+#ifdef __KERNEL__
22.52 - /*
22.53 - * Below are truly Linux-specific types that should never collide with
22.54 - * any application/library that wants linux/types.h.
22.55 -@@ -152,5 +153,6 @@
22.56 - char f_fname[6];
22.57 - char f_fpack[6];
22.58 - };
22.59 -+#endif
22.60 -
22.61 - #endif /* _LINUX_TYPES_H */
22.62 -
22.63 -
23.1 --- a/patches/linux/2.6.6/110-linux-2.6.5-x86_64-unistd.patch Fri Sep 05 16:15:34 2008 +0000
23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
23.3 @@ -1,80 +0,0 @@
23.4 -Retrieved with wget http://www.x86-64.org/lists/discuss/msg04963.html
23.5 -then tabs fixed up by rediffing
23.6 -
23.7 -Message-Id: EFF62C7EE88E71429E38641A1172F4C2077104@net.teracruz.com
23.8 -To: discuss@xxxxxxxxxx
23.9 -Subject: Compile error with glibc 2.3.2 + Linux 2.6.5 ARCH=x86_64
23.10 -From: "David Lee" david.lee@xxxxxxxxxxxx
23.11 -Date: Wed, 21 Apr 2004 15:26:04 -0500</li>
23.12 -
23.13 -I am getting compiler errors when trying to compile glibc 2.3.2 using
23.14 -the kernel headers from linux 2.6.5. The headers from linux 2.6.3 work
23.15 -fine.
23.16 -
23.17 -I've traced the cause of the problem to a change made in
23.18 -./include/asm-x86_64/unistd.h in the 2.6.4 release.
23.19 -
23.20 -+#ifndef __ASSEMBLY__
23.21 -+
23.22 -+#include <linux/linkage.h>
23.23 -+#include <linux/compiler.h>
23.24 -+#include <linux/types.h>
23.25 -+#include <asm/ptrace.h>
23.26 -+
23.27 -+asmlinkage long sys_ptrace(long request, long pid,
23.28 -+ unsigned long addr, long data);
23.29 -+asmlinkage long sys_iopl(unsigned int level, struct pt_regs regs);
23.30 -+asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int
23.31 -turn_on);
23.32 -+struct sigaction;
23.33 -+asmlinkage long sys_rt_sigaction(int sig,
23.34 -+ const struct sigaction __user *act,
23.35 -+ struct sigaction __user *oact,
23.36 -+ size_t sigsetsize);
23.37 -+
23.38 -+#endif /* __ASSEMBLY__ */
23.39 -
23.40 -Within glibc, ./sysdeps/unix/sysv/linux/x86_64/syscall.S ends up
23.41 -including this file, which chokes the assembler with the struct
23.42 -declarations in the above #include's.
23.43 -
23.44 -/home/dlee/vcs/Products/Breeze/Dev/Prj/LinuxRH8/tscale2/tools/x86_64/x86
23.45 -_64-linux/glibcinclude/linux/posix_types.h: Assembler messages:
23.46 -/home/dlee/vcs/Products/Breeze/Dev/Prj/LinuxRH8/tscale2/tools/x86_64/x86
23.47 -_64-linux/glibcinclude/linux/posix_types.h:36: Error: no such
23.48 -instruction: `typedef struct{'
23.49 -
23.50 -There are also errors about conflicting re-declarations further along in
23.51 -the glibc build.
23.52 -
23.53 -../posix/sys/types.h:62: error: conflicting types for `dev_t'
23.54 -/home/dlee/vcs/Products/Breeze/Dev/Prj/LinuxRH8/tscale2/tools/x86_64/x86
23.55 -_64-linux/glibcinclude/linux/types.h:23: error: previous declaration of
23.56 -`dev_t'
23.57 -
23.58 -Changing the '#ifndef __ASSEMBLY__' to '#if ((!defined __ASSEMBLY__) &&
23.59 -(defined __KERNEL__))' clears up the problem. My patch is below.
23.60 -
23.61 -dave
23.62 -
23.63 -
23.64 ---- linux-2.6.5/include/asm-x86_64/unistd.h.old 2004-04-03 19:37:36.000000000 -0800
23.65 -+++ linux-2.6.5/include/asm-x86_64/unistd.h 2004-05-05 11:07:11.000000000 -0700
23.66 -@@ -713,7 +713,7 @@
23.67 -
23.68 - #endif /* __KERNEL_SYSCALLS__ */
23.69 -
23.70 --#ifndef __ASSEMBLY__
23.71 -+#if ((!defined __ASSEMBLY__) && (defined __KERNEL__))
23.72 -
23.73 - #include <linux/linkage.h>
23.74 - #include <linux/compiler.h>
23.75 -@@ -730,7 +730,7 @@
23.76 - struct sigaction __user *oact,
23.77 - size_t sigsetsize);
23.78 -
23.79 --#endif /* __ASSEMBLY__ */
23.80 -+#endif /* ((!defined __ASSEMBLY__) && (defined __KERNEL__) */
23.81 -
23.82 - #endif /* __NO_STUBS */
23.83 -
24.1 --- a/patches/linux/2.6.6/120-linux-2.6.8-noshared-kconfig.patch Fri Sep 05 16:15:34 2008 +0000
24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
24.3 @@ -1,28 +0,0 @@
24.4 -Lets you run 'make oldconfig' and 'make menuconfig' on systems
24.5 -where shared libraries aren't easy. (There's no harm in using the
24.6 -static version of libkconfig.)
24.7 -Idea mentioned by Bertrand Marquis, but this patch is a bit simpler than his.
24.8 -
24.9 -
24.10 ---- linux-2.6.8.1/scripts/kconfig/Makefile.old 2004-09-09 20:30:25.000000000 -0700
24.11 -+++ linux-2.6.8.1/scripts/kconfig/Makefile 2004-09-09 20:47:51.000000000 -0700
24.12 -@@ -68,8 +68,8 @@
24.13 - libkconfig-objs := zconf.tab.o
24.14 -
24.15 - host-progs := conf mconf qconf gconf
24.16 --conf-objs := conf.o libkconfig.so
24.17 --mconf-objs := mconf.o libkconfig.so
24.18 -+conf-objs := conf.o $(libkconfig-objs)
24.19 -+mconf-objs := mconf.o $(libkconfig-objs)
24.20 -
24.21 - ifeq ($(MAKECMDGOALS),xconfig)
24.22 - qconf-target := 1
24.23 -@@ -88,7 +88,7 @@
24.24 - gconf-objs := gconf.o kconfig_load.o
24.25 - endif
24.26 -
24.27 --clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \
24.28 -+clean-files := $(libkconfig-objs) lkc_defs.h qconf.moc .tmp_qtcheck \
24.29 - .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c
24.30 -
24.31 - # generated files seem to need this to find local include files
25.1 --- a/patches/linux/2.6.7/100-kaz-types.patch Fri Sep 05 16:15:34 2008 +0000
25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
25.3 @@ -1,60 +0,0 @@
25.4 -The following fixes an error that occurs when building glibc-2.3.2 (but not glibc-2.2.5) for sh4:
25.5 -
25.6 -In file included from sys/ustat.h:30,
25.7 - from ../sysdeps/unix/sysv/linux/ustat.c:21:
25.8 -../sysdeps/generic/bits/ustat.h:26: error: redefinition of `struct ustat'
25.9 -make[2]: *** [/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/build-glibc/misc/ustat.o] Error 1
25.10 -make[2]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2/misc'
25.11 -make[1]: *** [misc/subdir_lib] Error 2
25.12 -make[1]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2'
25.13 -make: *** [all] Error 2
25.14 -
25.15 ------------ snip ---------------
25.16 -
25.17 -Date: Fri, 06 Jun 2003 08:00:00 +0900
25.18 -From: kaz Kojima <kkojima@rr.iij4u.or.jp>
25.19 -Subject: [linux-sh:02770] Re: Compiling glibc-2.3.2 for sh4 fails with "include/asm/user.h:32:
25.20 - error: redefinition of `struct user_fpu_struct'"
25.21 -To: linux-sh@m17n.org
25.22 -Message-Id: <200306052250.h55Moeb08707@r-rr.iij4u.or.jp>
25.23 -
25.24 -Hi,
25.25 -
25.26 -Dan Kegel <dank@kegel.com> wrote:
25.27 -> When I try to build glibc-2.3.2 for sh4, it fails with the error
25.28 -[snip]
25.29 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:32: error: redefinition of `struct user_fpu_struct'
25.30 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:39: error: redefinition of `struct user'
25.31 -[snip]
25.32 -> The error reminds me of the kind of thing fixed by
25.33 -> http://www.kegel.com/crossgcc/crosstool-0.4/glibc-2.3.2-patches/sh-user.patch
25.34 -
25.35 -It seems that the definitions in asm/user.h and the above patch collide.
25.36 -I'm not sure why you need this patch, but is it needed for the problem
25.37 -about struct ustat that you pointed out in this list, isn't it?
25.38 -I found why I don't hit ustat problem - my local kernel tree includes
25.39 -the following patch, though I can't recall about it.
25.40 -
25.41 -Regards,
25.42 - kaz
25.43 ---
25.44 -diff -u linux-2.5.69-sf-orig/include/linux/types.h /usr/local/sh4-unknown-linux-gnu/include/linux/types.h
25.45 ---- linux-2.5.69-sf-orig/include/linux/types.h Wed Mar 5 12:29:34 2003
25.46 -+++ sh4-unknown-linux-gnu/include/linux/types.h Sat Apr 19 10:05:52 2003
25.47 -@@ -141,6 +141,7 @@
25.48 -
25.49 - #endif /* __KERNEL_STRICT_NAMES */
25.50 -
25.51 -+#ifdef __KERNEL__
25.52 - /*
25.53 - * Below are truly Linux-specific types that should never collide with
25.54 - * any application/library that wants linux/types.h.
25.55 -@@ -152,5 +153,6 @@
25.56 - char f_fname[6];
25.57 - char f_fpack[6];
25.58 - };
25.59 -+#endif
25.60 -
25.61 - #endif /* _LINUX_TYPES_H */
25.62 -
25.63 -
26.1 --- a/patches/linux/2.6.7/110-linux-2.6.7-build_on_case_insensitive_fs-1.patch Fri Sep 05 16:15:34 2008 +0000
26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
26.3 @@ -1,679 +0,0 @@
26.4 -Submitted By: Martin Schaffner <schaffner@gmx.li>
26.5 -Date: 2004-06-19
26.6 -Initial Package Version: 2.6.7
26.7 -Upstream Status: Not submitted
26.8 -Origin: Martin Schaffner
26.9 -Description: Enables build on case-insensitive file systems
26.10 -URL: http://mirror.vtx.ch/lfs/patches/downloads/linux/linux-2.6.7-build_on_case_insensitive_fs-1.patch
26.11 -
26.12 -diff -ur linux-2.6.7/Makefile linux-2.6.7-mod/Makefile
26.13 ---- linux-2.6.7/Makefile Fri Jun 18 22:51:03 2004
26.14 -+++ linux-2.6.7-mod/Makefile Sat Jun 19 12:43:10 2004
26.15 -@@ -549,7 +549,7 @@
26.16 - $(NM) $@ | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
26.17 - endef
26.18 -
26.19 --LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.s
26.20 -+LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.asm
26.21 -
26.22 - # Generate section listing all symbols and add it into vmlinux
26.23 - # It's a three stage process:
26.24 -@@ -575,23 +575,23 @@
26.25 - .tmp_kallsyms%.S: .tmp_vmlinux%
26.26 - $(call cmd,kallsyms)
26.27 -
26.28 --.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
26.29 -+.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
26.30 - +$(call if_changed_rule,vmlinux__)
26.31 -
26.32 --.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
26.33 -+.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
26.34 - $(call if_changed_rule,vmlinux__)
26.35 -
26.36 - endif
26.37 -
26.38 - # Finally the vmlinux rule
26.39 -
26.40 --vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
26.41 -+vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
26.42 - $(call if_changed_rule,vmlinux)
26.43 -
26.44 - # The actual objects are generated when descending,
26.45 - # make sure no implicit rule kicks in
26.46 -
26.47 --$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.s: $(vmlinux-dirs) ;
26.48 -+$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.asm: $(vmlinux-dirs) ;
26.49 -
26.50 - # Handle descending into subdirectories listed in $(vmlinux-dirs)
26.51 -
26.52 -@@ -640,7 +640,7 @@
26.53 - # Single targets
26.54 - # ---------------------------------------------------------------------------
26.55 -
26.56 --%.s: %.c scripts FORCE
26.57 -+%.asm: %.c scripts FORCE
26.58 - $(Q)$(MAKE) $(build)=$(@D) $@
26.59 - %.i: %.c scripts FORCE
26.60 - $(Q)$(MAKE) $(build)=$(@D) $@
26.61 -@@ -650,7 +650,7 @@
26.62 - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D)
26.63 - %.lst: %.c scripts FORCE
26.64 - $(Q)$(MAKE) $(build)=$(@D) $@
26.65 --%.s: %.S scripts FORCE
26.66 -+%.asm: %.S scripts FORCE
26.67 - $(Q)$(MAKE) $(build)=$(@D) $@
26.68 - %.o: %.S scripts FORCE
26.69 - $(Q)$(MAKE) $(build)=$(@D) $@
26.70 -diff -ur linux-2.6.7/arch/alpha/Makefile linux-2.6.7-mod/arch/alpha/Makefile
26.71 ---- linux-2.6.7/arch/alpha/Makefile Fri Jun 18 22:51:03 2004
26.72 -+++ linux-2.6.7-mod/arch/alpha/Makefile Sat Jun 19 12:46:32 2004
26.73 -@@ -114,10 +114,10 @@
26.74 -
26.75 - prepare: include/asm-$(ARCH)/asm_offsets.h
26.76 -
26.77 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.78 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.79 - include/config/MARKER
26.80 -
26.81 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
26.82 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.83 - $(call filechk,gen-asm-offsets)
26.84 -
26.85 - archclean:
26.86 -diff -ur linux-2.6.7/arch/alpha/kernel/Makefile linux-2.6.7-mod/arch/alpha/kernel/Makefile
26.87 ---- linux-2.6.7/arch/alpha/kernel/Makefile Mon May 10 04:32:29 2004
26.88 -+++ linux-2.6.7-mod/arch/alpha/kernel/Makefile Sat Jun 19 12:46:48 2004
26.89 -@@ -2,7 +2,7 @@
26.90 - # Makefile for the linux kernel.
26.91 - #
26.92 -
26.93 --extra-y := head.o vmlinux.lds.s
26.94 -+extra-y := head.o vmlinux.lds.asm
26.95 - EXTRA_AFLAGS := $(CFLAGS)
26.96 - EXTRA_CFLAGS := -Werror -Wno-sign-compare
26.97 -
26.98 -diff -ur linux-2.6.7/arch/arm/Makefile linux-2.6.7-mod/arch/arm/Makefile
26.99 ---- linux-2.6.7/arch/arm/Makefile Fri Jun 18 22:51:04 2004
26.100 -+++ linux-2.6.7-mod/arch/arm/Makefile Sat Jun 19 12:47:07 2004
26.101 -@@ -175,10 +175,10 @@
26.102 - i:; $(Q)$(MAKE) $(build)=$(boot) install
26.103 - zi:; $(Q)$(MAKE) $(build)=$(boot) zinstall
26.104 -
26.105 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.106 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.107 - include/asm-arm/.arch
26.108 -
26.109 --include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s
26.110 -+include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.111 - $(call filechk,gen-asm-offsets)
26.112 -
26.113 - define archhelp
26.114 -diff -ur linux-2.6.7/arch/arm/kernel/Makefile linux-2.6.7-mod/arch/arm/kernel/Makefile
26.115 ---- linux-2.6.7/arch/arm/kernel/Makefile Mon May 10 04:33:19 2004
26.116 -+++ linux-2.6.7-mod/arch/arm/kernel/Makefile Sat Jun 19 12:47:25 2004
26.117 -@@ -27,7 +27,7 @@
26.118 - head-y := head.o
26.119 - obj-$(CONFIG_DEBUG_LL) += debug.o
26.120 -
26.121 --extra-y := $(head-y) init_task.o vmlinux.lds.s
26.122 -+extra-y := $(head-y) init_task.o vmlinux.lds.asm
26.123 -
26.124 - # Spell out some dependencies that aren't automatically figured out
26.125 - $(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h
26.126 -diff -ur linux-2.6.7/arch/arm26/Makefile linux-2.6.7-mod/arch/arm26/Makefile
26.127 ---- linux-2.6.7/arch/arm26/Makefile Mon May 10 04:32:28 2004
26.128 -+++ linux-2.6.7-mod/arch/arm26/Makefile Sat Jun 19 12:48:24 2004
26.129 -@@ -101,10 +101,10 @@
26.130 - fi; \
26.131 - )
26.132 -
26.133 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.134 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.135 - include/config/MARKER
26.136 -
26.137 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
26.138 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.139 - $(call filechk,gen-asm-offsets)
26.140 -
26.141 - define archhelp
26.142 -diff -ur linux-2.6.7/arch/arm26/kernel/Makefile linux-2.6.7-mod/arch/arm26/kernel/Makefile
26.143 ---- linux-2.6.7/arch/arm26/kernel/Makefile Mon May 10 04:32:29 2004
26.144 -+++ linux-2.6.7-mod/arch/arm26/kernel/Makefile Sat Jun 19 12:48:30 2004
26.145 -@@ -14,5 +14,5 @@
26.146 - obj-$(CONFIG_FIQ) += fiq.o
26.147 - obj-$(CONFIG_MODULES) += armksyms.o
26.148 -
26.149 --extra-y := init_task.o vmlinux.lds.s
26.150 -+extra-y := init_task.o vmlinux.lds.asm
26.151 -
26.152 -diff -ur linux-2.6.7/arch/cris/Makefile linux-2.6.7-mod/arch/cris/Makefile
26.153 ---- linux-2.6.7/arch/cris/Makefile Fri Jun 18 22:51:07 2004
26.154 -+++ linux-2.6.7-mod/arch/cris/Makefile Sat Jun 19 12:48:47 2004
26.155 -@@ -107,8 +107,8 @@
26.156 - @ln -sf $(SARCH) include/asm-$(ARCH)/arch
26.157 - @touch $@
26.158 -
26.159 --arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.160 -+arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.161 - include/config/MARKER
26.162 -
26.163 --include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
26.164 -+include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm
26.165 - $(call filechk,gen-asm-offsets)
26.166 -diff -ur linux-2.6.7/arch/cris/kernel/Makefile linux-2.6.7-mod/arch/cris/kernel/Makefile
26.167 ---- linux-2.6.7/arch/cris/kernel/Makefile Fri Jun 18 22:51:09 2004
26.168 -+++ linux-2.6.7-mod/arch/cris/kernel/Makefile Sat Jun 19 12:48:53 2004
26.169 -@@ -3,7 +3,7 @@
26.170 - # Makefile for the linux kernel.
26.171 - #
26.172 -
26.173 --extra-y := vmlinux.lds.s
26.174 -+extra-y := vmlinux.lds.asm
26.175 -
26.176 - obj-y := process.o traps.o irq.o ptrace.o setup.o \
26.177 - time.o sys_cris.o semaphore.o
26.178 -diff -ur linux-2.6.7/arch/h8300/Makefile linux-2.6.7-mod/arch/h8300/Makefile
26.179 ---- linux-2.6.7/arch/h8300/Makefile Fri Jun 18 22:51:09 2004
26.180 -+++ linux-2.6.7-mod/arch/h8300/Makefile Sat Jun 19 12:49:12 2004
26.181 -@@ -64,7 +64,7 @@
26.182 -
26.183 - prepare: include/asm-$(ARCH)/asm-offsets.h
26.184 -
26.185 --include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
26.186 -+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
26.187 - include/asm include/linux/version.h
26.188 - $(call filechk,gen-asm-offsets)
26.189 -
26.190 -diff -ur linux-2.6.7/arch/h8300/kernel/Makefile linux-2.6.7-mod/arch/h8300/kernel/Makefile
26.191 ---- linux-2.6.7/arch/h8300/kernel/Makefile Fri Jun 18 22:51:09 2004
26.192 -+++ linux-2.6.7-mod/arch/h8300/kernel/Makefile Sat Jun 19 12:49:32 2004
26.193 -@@ -2,7 +2,7 @@
26.194 - # Makefile for the linux kernel.
26.195 - #
26.196 -
26.197 --extra-y := vmlinux.lds.s
26.198 -+extra-y := vmlinux.lds.asm
26.199 -
26.200 - obj-y := process.o traps.o ptrace.o ints.o \
26.201 - sys_h8300.o time.o semaphore.o signal.o \
26.202 -diff -ur linux-2.6.7/arch/i386/Makefile linux-2.6.7-mod/arch/i386/Makefile
26.203 ---- linux-2.6.7/arch/i386/Makefile Fri Jun 18 22:51:10 2004
26.204 -+++ linux-2.6.7-mod/arch/i386/Makefile Sat Jun 19 12:49:43 2004
26.205 -@@ -141,10 +141,10 @@
26.206 - prepare: include/asm-$(ARCH)/asm_offsets.h
26.207 - CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
26.208 -
26.209 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.210 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.211 - include/config/MARKER
26.212 -
26.213 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
26.214 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.215 - $(call filechk,gen-asm-offsets)
26.216 -
26.217 - archclean:
26.218 -diff -ur linux-2.6.7/arch/i386/kernel/Makefile linux-2.6.7-mod/arch/i386/kernel/Makefile
26.219 ---- linux-2.6.7/arch/i386/kernel/Makefile Mon May 10 04:32:02 2004
26.220 -+++ linux-2.6.7-mod/arch/i386/kernel/Makefile Sat Jun 19 12:49:54 2004
26.221 -@@ -2,7 +2,7 @@
26.222 - # Makefile for the linux kernel.
26.223 - #
26.224 -
26.225 --extra-y := head.o init_task.o vmlinux.lds.s
26.226 -+extra-y := head.o init_task.o vmlinux.lds.asm
26.227 -
26.228 - obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
26.229 - ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
26.230 -diff -ur linux-2.6.7/arch/ia64/Makefile linux-2.6.7-mod/arch/ia64/Makefile
26.231 ---- linux-2.6.7/arch/ia64/Makefile Mon May 10 04:31:59 2004
26.232 -+++ linux-2.6.7-mod/arch/ia64/Makefile Sat Jun 19 12:50:12 2004
26.233 -@@ -88,12 +88,12 @@
26.234 -
26.235 - prepare: include/asm-ia64/offsets.h
26.236 -
26.237 --arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
26.238 -+arch/ia64/kernel/asm-offsets.asm: include/asm include/linux/version.h include/config/MARKER
26.239 -
26.240 --include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
26.241 -+include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.asm
26.242 - $(call filechk,gen-asm-offsets)
26.243 -
26.244 --arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
26.245 -+arch/ia64/kernel/asm-offsets.asm: include/asm-ia64/.offsets.h.stamp
26.246 -
26.247 - include/asm-ia64/.offsets.h.stamp:
26.248 - mkdir -p include/asm-ia64
26.249 -diff -ur linux-2.6.7/arch/ia64/kernel/Makefile linux-2.6.7-mod/arch/ia64/kernel/Makefile
26.250 ---- linux-2.6.7/arch/ia64/kernel/Makefile Fri Jun 18 22:51:13 2004
26.251 -+++ linux-2.6.7-mod/arch/ia64/kernel/Makefile Sat Jun 19 12:52:14 2004
26.252 -@@ -2,7 +2,7 @@
26.253 - # Makefile for the linux kernel.
26.254 - #
26.255 -
26.256 --extra-y := head.o init_task.o vmlinux.lds.s
26.257 -+extra-y := head.o init_task.o vmlinux.lds.asm
26.258 -
26.259 - obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \
26.260 - irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \
26.261 -@@ -21,7 +21,7 @@
26.262 - # The gate DSO image is built using a special linker script.
26.263 - targets += gate.so gate-syms.o
26.264 -
26.265 --extra-y += gate.so gate-syms.o gate.lds.s gate.o
26.266 -+extra-y += gate.so gate-syms.o gate.lds.asm gate.o
26.267 -
26.268 - # fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
26.269 - CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31
26.270 -@@ -32,14 +32,14 @@
26.271 - cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
26.272 -
26.273 - GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1
26.274 --$(obj)/gate.so: $(obj)/gate.lds.s $(obj)/gate.o FORCE
26.275 -+$(obj)/gate.so: $(obj)/gate.lds.asm $(obj)/gate.o FORCE
26.276 - $(call if_changed,gate)
26.277 -
26.278 - $(obj)/built-in.o: $(obj)/gate-syms.o
26.279 - $(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
26.280 -
26.281 - GATECFLAGS_gate-syms.o = -r
26.282 --$(obj)/gate-syms.o: $(src)/gate.lds.s $(obj)/gate.o FORCE
26.283 -+$(obj)/gate-syms.o: $(src)/gate.lds.asm $(obj)/gate.o FORCE
26.284 - $(call if_changed,gate)
26.285 -
26.286 - # gate-data.o contains the gate DSO image as data in section .data.gate.
26.287 -diff -ur linux-2.6.7/arch/m68k/Makefile linux-2.6.7-mod/arch/m68k/Makefile
26.288 ---- linux-2.6.7/arch/m68k/Makefile Fri Jun 18 22:51:14 2004
26.289 -+++ linux-2.6.7-mod/arch/m68k/Makefile Sat Jun 19 12:52:30 2004
26.290 -@@ -114,10 +114,10 @@
26.291 - prepare: include/asm-$(ARCH)/offsets.h
26.292 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h
26.293 -
26.294 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.295 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.296 - include/config/MARKER
26.297 -
26.298 --include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
26.299 -+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.300 - $(call filechk,gen-asm-offsets)
26.301 -
26.302 - archclean:
26.303 -diff -ur linux-2.6.7/arch/m68k/kernel/Makefile linux-2.6.7-mod/arch/m68k/kernel/Makefile
26.304 ---- linux-2.6.7/arch/m68k/kernel/Makefile Mon May 10 04:33:10 2004
26.305 -+++ linux-2.6.7-mod/arch/m68k/kernel/Makefile Sat Jun 19 12:52:35 2004
26.306 -@@ -7,7 +7,7 @@
26.307 - else
26.308 - extra-y := sun3-head.o
26.309 - endif
26.310 --extra-y += vmlinux.lds.s
26.311 -+extra-y += vmlinux.lds.asm
26.312 -
26.313 - obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \
26.314 - sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
26.315 -diff -ur linux-2.6.7/arch/m68knommu/Makefile linux-2.6.7-mod/arch/m68knommu/Makefile
26.316 ---- linux-2.6.7/arch/m68knommu/Makefile Mon May 10 04:32:54 2004
26.317 -+++ linux-2.6.7-mod/arch/m68knommu/Makefile Sat Jun 19 12:52:57 2004
26.318 -@@ -89,7 +89,7 @@
26.319 - head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
26.320 -
26.321 - CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
26.322 -- arch/$(ARCH)/kernel/asm-offsets.s
26.323 -+ arch/$(ARCH)/kernel/asm-offsets.asm
26.324 -
26.325 - core-y += arch/m68knommu/kernel/ \
26.326 - arch/m68knommu/mm/ \
26.327 -@@ -102,7 +102,7 @@
26.328 - archclean:
26.329 - $(call descend arch/$(ARCH)/boot, subdirclean)
26.330 -
26.331 --include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
26.332 -+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
26.333 - include/asm include/linux/version.h \
26.334 - include/config/MARKER
26.335 - $(call filechk,gen-asm-offsets)
26.336 -diff -ur linux-2.6.7/arch/m68knommu/kernel/Makefile linux-2.6.7-mod/arch/m68knommu/kernel/Makefile
26.337 ---- linux-2.6.7/arch/m68knommu/kernel/Makefile Mon May 10 04:32:26 2004
26.338 -+++ linux-2.6.7-mod/arch/m68knommu/kernel/Makefile Sat Jun 19 12:53:20 2004
26.339 -@@ -2,7 +2,7 @@
26.340 - # Makefile for arch/m68knommu/kernel.
26.341 - #
26.342 -
26.343 --extra-y := vmlinux.lds.s
26.344 -+extra-y := vmlinux.lds.asm
26.345 -
26.346 - obj-y += dma.o entry.o init_task.o m68k_ksyms.o process.o ptrace.o semaphore.o \
26.347 - setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
26.348 -diff -ur linux-2.6.7/arch/mips/Makefile linux-2.6.7-mod/arch/mips/Makefile
26.349 ---- linux-2.6.7/arch/mips/Makefile Fri Jun 18 22:51:19 2004
26.350 -+++ linux-2.6.7-mod/arch/mips/Makefile Sat Jun 19 12:53:35 2004
26.351 -@@ -752,12 +752,12 @@
26.352 - prepare: include/asm-$(ARCH)/offset.h \
26.353 - include/asm-$(ARCH)/reg.h
26.354 -
26.355 --arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \
26.356 -+arch/$(ARCH)/kernel/offset.asm: include/asm include/linux/version.h \
26.357 - include/config/MARKER
26.358 -
26.359 --include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
26.360 -+include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.asm
26.361 - $(call filechk,gen-asm-offset.h)
26.362 --include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.s
26.363 -+include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.asm
26.364 - $(call filechk,gen-asm-reg.h)
26.365 -
26.366 - CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \
26.367 -diff -ur linux-2.6.7/arch/mips/kernel/Makefile linux-2.6.7-mod/arch/mips/kernel/Makefile
26.368 ---- linux-2.6.7/arch/mips/kernel/Makefile Mon May 10 04:32:28 2004
26.369 -+++ linux-2.6.7-mod/arch/mips/kernel/Makefile Sat Jun 19 12:53:41 2004
26.370 -@@ -2,7 +2,7 @@
26.371 - # Makefile for the Linux/MIPS kernel.
26.372 - #
26.373 -
26.374 --extra-y := head.o init_task.o vmlinux.lds.s
26.375 -+extra-y := head.o init_task.o vmlinux.lds.asm
26.376 -
26.377 - obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
26.378 - ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
26.379 -diff -ur linux-2.6.7/arch/parisc/Makefile linux-2.6.7-mod/arch/parisc/Makefile
26.380 ---- linux-2.6.7/arch/parisc/Makefile Fri Jun 18 22:51:21 2004
26.381 -+++ linux-2.6.7-mod/arch/parisc/Makefile Sat Jun 19 12:53:47 2004
26.382 -@@ -88,10 +88,10 @@
26.383 -
26.384 - prepare: include/asm-parisc/offsets.h
26.385 -
26.386 --arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.387 -+arch/parisc/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.388 - include/config/MARKER
26.389 -
26.390 --include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s
26.391 -+include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.asm
26.392 - $(call filechk,gen-asm-offsets)
26.393 -
26.394 - CLEAN_FILES += lifimage include/asm-parisc/offsets.h
26.395 -diff -ur linux-2.6.7/arch/parisc/kernel/Makefile linux-2.6.7-mod/arch/parisc/kernel/Makefile
26.396 ---- linux-2.6.7/arch/parisc/kernel/Makefile Fri Jun 18 22:51:21 2004
26.397 -+++ linux-2.6.7-mod/arch/parisc/kernel/Makefile Sat Jun 19 12:53:53 2004
26.398 -@@ -4,7 +4,7 @@
26.399 -
26.400 - head-y := head.o
26.401 - head-$(CONFIG_PARISC64) := head64.o
26.402 --extra-y := init_task.o $(head-y) vmlinux.lds.s
26.403 -+extra-y := init_task.o $(head-y) vmlinux.lds.asm
26.404 -
26.405 - AFLAGS_entry.o := -traditional
26.406 - AFLAGS_pacache.o := -traditional
26.407 -diff -ur linux-2.6.7/arch/ppc/Makefile linux-2.6.7-mod/arch/ppc/Makefile
26.408 ---- linux-2.6.7/arch/ppc/Makefile Fri Jun 18 22:51:22 2004
26.409 -+++ linux-2.6.7-mod/arch/ppc/Makefile Sat Jun 19 12:54:09 2004
26.410 -@@ -78,10 +78,10 @@
26.411 -
26.412 - prepare: include/asm-$(ARCH)/offsets.h checkbin
26.413 -
26.414 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.415 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.416 - include/config/MARKER
26.417 -
26.418 --include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
26.419 -+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.420 - $(call filechk,gen-asm-offsets)
26.421 -
26.422 - ifdef CONFIG_6xx
26.423 -@@ -104,4 +104,4 @@
26.424 - endif
26.425 -
26.426 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h \
26.427 -- arch/$(ARCH)/kernel/asm-offsets.s
26.428 -+ arch/$(ARCH)/kernel/asm-offsets.asm
26.429 -diff -ur linux-2.6.7/arch/ppc/kernel/Makefile linux-2.6.7-mod/arch/ppc/kernel/Makefile
26.430 ---- linux-2.6.7/arch/ppc/kernel/Makefile Fri Jun 18 22:51:24 2004
26.431 -+++ linux-2.6.7-mod/arch/ppc/kernel/Makefile Sat Jun 19 12:43:10 2004
26.432 -@@ -15,7 +15,7 @@
26.433 - extra-$(CONFIG_8xx) := head_8xx.o
26.434 - extra-$(CONFIG_6xx) += idle_6xx.o
26.435 - extra-$(CONFIG_POWER4) += idle_power4.o
26.436 --extra-y += vmlinux.lds.s
26.437 -+extra-y += vmlinux.lds.asm
26.438 -
26.439 - obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
26.440 - process.o signal.o ptrace.o align.o \
26.441 -diff -ur linux-2.6.7/arch/ppc64/Makefile linux-2.6.7-mod/arch/ppc64/Makefile
26.442 ---- linux-2.6.7/arch/ppc64/Makefile Fri Jun 18 22:51:26 2004
26.443 -+++ linux-2.6.7-mod/arch/ppc64/Makefile Sat Jun 19 12:54:32 2004
26.444 -@@ -67,10 +67,10 @@
26.445 -
26.446 - prepare: include/asm-ppc64/offsets.h
26.447 -
26.448 --arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.449 -+arch/ppc64/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.450 - include/config/MARKER
26.451 -
26.452 --include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
26.453 -+include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.asm
26.454 - $(call filechk,gen-asm-offsets)
26.455 -
26.456 - define archhelp
26.457 -diff -ur linux-2.6.7/arch/ppc64/kernel/Makefile linux-2.6.7-mod/arch/ppc64/kernel/Makefile
26.458 ---- linux-2.6.7/arch/ppc64/kernel/Makefile Mon May 10 04:33:20 2004
26.459 -+++ linux-2.6.7-mod/arch/ppc64/kernel/Makefile Sat Jun 19 12:54:39 2004
26.460 -@@ -3,7 +3,7 @@
26.461 - #
26.462 -
26.463 - EXTRA_CFLAGS += -mno-minimal-toc
26.464 --extra-y := head.o vmlinux.lds.s
26.465 -+extra-y := head.o vmlinux.lds.asm
26.466 -
26.467 - obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \
26.468 - time.o process.o signal.o syscalls.o misc.o ptrace.o \
26.469 -diff -ur linux-2.6.7/arch/s390/Makefile linux-2.6.7-mod/arch/s390/Makefile
26.470 ---- linux-2.6.7/arch/s390/Makefile Mon May 10 04:32:02 2004
26.471 -+++ linux-2.6.7-mod/arch/s390/Makefile Sat Jun 19 12:54:46 2004
26.472 -@@ -68,10 +68,10 @@
26.473 -
26.474 - prepare: include/asm-$(ARCH)/offsets.h
26.475 -
26.476 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.477 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.478 - include/config/MARKER
26.479 -
26.480 --include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
26.481 -+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.482 - $(call filechk,gen-asm-offsets)
26.483 -
26.484 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h
26.485 -diff -ur linux-2.6.7/arch/s390/kernel/Makefile linux-2.6.7-mod/arch/s390/kernel/Makefile
26.486 ---- linux-2.6.7/arch/s390/kernel/Makefile Mon May 10 04:33:20 2004
26.487 -+++ linux-2.6.7-mod/arch/s390/kernel/Makefile Sat Jun 19 12:54:52 2004
26.488 -@@ -10,7 +10,7 @@
26.489 -
26.490 - extra-$(CONFIG_ARCH_S390_31) += head.o
26.491 - extra-$(CONFIG_ARCH_S390X) += head64.o
26.492 --extra-y += init_task.o vmlinux.lds.s
26.493 -+extra-y += init_task.o vmlinux.lds.asm
26.494 -
26.495 - obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
26.496 - obj-$(CONFIG_SMP) += smp.o
26.497 -diff -ur linux-2.6.7/arch/sh/kernel/Makefile linux-2.6.7-mod/arch/sh/kernel/Makefile
26.498 ---- linux-2.6.7/arch/sh/kernel/Makefile Mon May 10 04:32:39 2004
26.499 -+++ linux-2.6.7-mod/arch/sh/kernel/Makefile Sat Jun 19 12:55:33 2004
26.500 -@@ -2,7 +2,7 @@
26.501 - # Makefile for the Linux/SuperH kernel.
26.502 - #
26.503 -
26.504 --extra-y := head.o init_task.o vmlinux.lds.s
26.505 -+extra-y := head.o init_task.o vmlinux.lds.asm
26.506 -
26.507 - obj-y := process.o signal.o entry.o traps.o irq.o \
26.508 - ptrace.o setup.o time.o sys_sh.o semaphore.o \
26.509 -diff -ur linux-2.6.7/arch/sparc/Makefile linux-2.6.7-mod/arch/sparc/Makefile
26.510 ---- linux-2.6.7/arch/sparc/Makefile Fri Jun 18 22:51:29 2004
26.511 -+++ linux-2.6.7-mod/arch/sparc/Makefile Sat Jun 19 12:55:48 2004
26.512 -@@ -61,14 +61,14 @@
26.513 -
26.514 - prepare: include/asm-$(ARCH)/asm_offsets.h
26.515 -
26.516 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.517 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.518 - include/config/MARKER
26.519 -
26.520 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
26.521 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.522 - $(call filechk,gen-asm-offsets)
26.523 -
26.524 - CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h \
26.525 -- arch/$(ARCH)/kernel/asm-offsets.s \
26.526 -+ arch/$(ARCH)/kernel/asm-offsets.asm \
26.527 - arch/$(ARCH)/boot/System.map
26.528 -
26.529 - # Don't use tabs in echo arguments.
26.530 -diff -ur linux-2.6.7/arch/sparc/kernel/Makefile linux-2.6.7-mod/arch/sparc/kernel/Makefile
26.531 ---- linux-2.6.7/arch/sparc/kernel/Makefile Mon May 10 04:33:13 2004
26.532 -+++ linux-2.6.7-mod/arch/sparc/kernel/Makefile Sat Jun 19 12:55:52 2004
26.533 -@@ -2,7 +2,7 @@
26.534 - # Makefile for the linux kernel.
26.535 - #
26.536 -
26.537 --extra-y := head.o init_task.o vmlinux.lds.s
26.538 -+extra-y := head.o init_task.o vmlinux.lds.asm
26.539 -
26.540 - EXTRA_AFLAGS := -ansi
26.541 -
26.542 -diff -ur linux-2.6.7/arch/sparc64/kernel/Makefile linux-2.6.7-mod/arch/sparc64/kernel/Makefile
26.543 ---- linux-2.6.7/arch/sparc64/kernel/Makefile Mon May 10 04:32:02 2004
26.544 -+++ linux-2.6.7-mod/arch/sparc64/kernel/Makefile Sat Jun 19 12:56:24 2004
26.545 -@@ -5,7 +5,7 @@
26.546 - EXTRA_AFLAGS := -ansi
26.547 - EXTRA_CFLAGS := -Werror
26.548 -
26.549 --extra-y := head.o init_task.o vmlinux.lds.s
26.550 -+extra-y := head.o init_task.o vmlinux.lds.asm
26.551 -
26.552 - obj-y := process.o setup.o cpu.o idprom.o \
26.553 - traps.o devices.o auxio.o \
26.554 -diff -ur linux-2.6.7/arch/um/Makefile linux-2.6.7-mod/arch/um/Makefile
26.555 ---- linux-2.6.7/arch/um/Makefile Mon May 10 04:32:52 2004
26.556 -+++ linux-2.6.7-mod/arch/um/Makefile Sat Jun 19 12:57:07 2004
26.557 -@@ -77,7 +77,7 @@
26.558 - # CONFIG_MODE_SKAS + CONFIG_STATIC_LINK case.
26.559 -
26.560 - LINK_TT = -static
26.561 --LD_SCRIPT_TT := uml.lds.s
26.562 -+LD_SCRIPT_TT := uml.lds.asm
26.563 -
26.564 - ifeq ($(CONFIG_STATIC_LINK),y)
26.565 - LINK-y += $(LINK_TT)
26.566 -@@ -103,11 +103,11 @@
26.567 - -DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
26.568 - -DKERNEL_STACK_SIZE=$(STACK_SIZE)
26.569 -
26.570 --AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
26.571 -+AFLAGS_$(LD_SCRIPT-y:.asm=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
26.572 -
26.573 - LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
26.574 -
26.575 --$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
26.576 -+$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.asm=.S) scripts FORCE
26.577 - $(call if_changed_dep,as_s_S)
26.578 -
26.579 - linux: vmlinux $(LD_SCRIPT-y)
26.580 -@@ -122,8 +122,8 @@
26.581 - # To get a definition of F_SETSIG
26.582 - USER_CFLAGS += -D_GNU_SOURCE
26.583 -
26.584 --CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
26.585 -- $(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
26.586 -+CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.asm \
26.587 -+ $(ARCH_DIR)/dyn_link.ld.asm $(GEN_HEADERS)
26.588 -
26.589 - $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
26.590 - $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
26.591 -diff -ur linux-2.6.7/arch/um/kernel/Makefile linux-2.6.7-mod/arch/um/kernel/Makefile
26.592 ---- linux-2.6.7/arch/um/kernel/Makefile Mon May 10 04:32:53 2004
26.593 -+++ linux-2.6.7-mod/arch/um/kernel/Makefile Sat Jun 19 12:57:15 2004
26.594 -@@ -3,7 +3,7 @@
26.595 - # Licensed under the GPL
26.596 - #
26.597 -
26.598 --extra-y := vmlinux.lds.s
26.599 -+extra-y := vmlinux.lds.asm
26.600 -
26.601 - obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
26.602 - helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
26.603 -diff -ur linux-2.6.7/arch/v850/Makefile linux-2.6.7-mod/arch/v850/Makefile
26.604 ---- linux-2.6.7/arch/v850/Makefile Mon May 10 04:33:21 2004
26.605 -+++ linux-2.6.7-mod/arch/v850/Makefile Sat Jun 19 12:57:59 2004
26.606 -@@ -52,12 +52,12 @@
26.607 - prepare: include/asm-$(ARCH)/asm-consts.h
26.608 -
26.609 - # Generate constants from C code for use by asm files
26.610 --arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \
26.611 -+arch/$(ARCH)/kernel/asm-consts.asm: include/asm include/linux/version.h \
26.612 - include/config/MARKER
26.613 -
26.614 --include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s
26.615 -+include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.asm
26.616 - $(call filechk,gen-asm-offsets)
26.617 -
26.618 - CLEAN_FILES += include/asm-$(ARCH)/asm-consts.h \
26.619 -- arch/$(ARCH)/kernel/asm-consts.s \
26.620 -+ arch/$(ARCH)/kernel/asm-consts.asm \
26.621 - root_fs_image.o
26.622 -diff -ur linux-2.6.7/arch/v850/kernel/Makefile linux-2.6.7-mod/arch/v850/kernel/Makefile
26.623 ---- linux-2.6.7/arch/v850/kernel/Makefile Mon May 10 04:33:21 2004
26.624 -+++ linux-2.6.7-mod/arch/v850/kernel/Makefile Sat Jun 19 12:58:04 2004
26.625 -@@ -9,7 +9,7 @@
26.626 - # for more details.
26.627 - #
26.628 -
26.629 --extra-y := head.o init_task.o vmlinux.lds.s
26.630 -+extra-y := head.o init_task.o vmlinux.lds.asm
26.631 -
26.632 - obj-y += intv.o entry.o process.o syscalls.o time.o semaphore.o setup.o \
26.633 - signal.o irq.o mach.o ptrace.o bug.o
26.634 -diff -ur linux-2.6.7/arch/x86_64/Makefile linux-2.6.7-mod/arch/x86_64/Makefile
26.635 ---- linux-2.6.7/arch/x86_64/Makefile Mon May 10 04:33:19 2004
26.636 -+++ linux-2.6.7-mod/arch/x86_64/Makefile Sat Jun 19 12:58:10 2004
26.637 -@@ -93,10 +93,10 @@
26.638 -
26.639 - prepare: include/asm-$(ARCH)/offset.h
26.640 -
26.641 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
26.642 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
26.643 - include/config/MARKER
26.644 -
26.645 --include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s
26.646 -+include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.asm
26.647 - $(call filechk,gen-asm-offsets)
26.648 -
26.649 - CLEAN_FILES += include/asm-$(ARCH)/offset.h
26.650 -diff -ur linux-2.6.7/arch/x86_64/kernel/Makefile linux-2.6.7-mod/arch/x86_64/kernel/Makefile
26.651 ---- linux-2.6.7/arch/x86_64/kernel/Makefile Fri Jun 18 22:51:32 2004
26.652 -+++ linux-2.6.7-mod/arch/x86_64/kernel/Makefile Sat Jun 19 12:58:17 2004
26.653 -@@ -2,7 +2,7 @@
26.654 - # Makefile for the linux kernel.
26.655 - #
26.656 -
26.657 --extra-y := head.o head64.o init_task.o vmlinux.lds.s
26.658 -+extra-y := head.o head64.o init_task.o vmlinux.lds.asm
26.659 - EXTRA_AFLAGS := -traditional
26.660 - obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
26.661 - ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \
26.662 -diff -ur linux-2.6.7/scripts/Makefile.build linux-2.6.7-mod/scripts/Makefile.build
26.663 ---- linux-2.6.7/scripts/Makefile.build Mon May 10 04:33:13 2004
26.664 -+++ linux-2.6.7-mod/scripts/Makefile.build Sat Jun 19 12:43:10 2004
26.665 -@@ -110,7 +110,7 @@
26.666 - quiet_cmd_cc_s_c = CC $(quiet_modtag) $@
26.667 - cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
26.668 -
26.669 --%.s: %.c FORCE
26.670 -+%.asm: %.c FORCE
26.671 - $(call if_changed_dep,cc_s_c)
26.672 -
26.673 - quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
26.674 -@@ -197,7 +197,7 @@
26.675 - quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
26.676 - cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
26.677 -
26.678 --%.s: %.S FORCE
26.679 -+%.asm: %.S FORCE
26.680 - $(call if_changed_dep,as_s_S)
26.681 -
26.682 - quiet_cmd_as_o_S = AS $(quiet_modtag) $@
27.1 --- a/patches/linux/2.6.7/120-linux-2.6.8-noshared-kconfig.patch Fri Sep 05 16:15:34 2008 +0000
27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
27.3 @@ -1,28 +0,0 @@
27.4 -Lets you run 'make oldconfig' and 'make menuconfig' on systems
27.5 -where shared libraries aren't easy. (There's no harm in using the
27.6 -static version of libkconfig.)
27.7 -Idea mentioned by Bertrand Marquis, but this patch is a bit simpler than his.
27.8 -
27.9 -
27.10 ---- linux-2.6.8.1/scripts/kconfig/Makefile.old 2004-09-09 20:30:25.000000000 -0700
27.11 -+++ linux-2.6.8.1/scripts/kconfig/Makefile 2004-09-09 20:47:51.000000000 -0700
27.12 -@@ -68,8 +68,8 @@
27.13 - libkconfig-objs := zconf.tab.o
27.14 -
27.15 - host-progs := conf mconf qconf gconf
27.16 --conf-objs := conf.o libkconfig.so
27.17 --mconf-objs := mconf.o libkconfig.so
27.18 -+conf-objs := conf.o $(libkconfig-objs)
27.19 -+mconf-objs := mconf.o $(libkconfig-objs)
27.20 -
27.21 - ifeq ($(MAKECMDGOALS),xconfig)
27.22 - qconf-target := 1
27.23 -@@ -88,7 +88,7 @@
27.24 - gconf-objs := gconf.o kconfig_load.o
27.25 - endif
27.26 -
27.27 --clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \
27.28 -+clean-files := $(libkconfig-objs) lkc_defs.h qconf.moc .tmp_qtcheck \
27.29 - .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c
27.30 -
27.31 - # generated files seem to need this to find local include files
28.1 --- a/patches/linux/2.6.8/100-kaz-types.patch Fri Sep 05 16:15:34 2008 +0000
28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
28.3 @@ -1,60 +0,0 @@
28.4 -The following fixes an error that occurs when building glibc-2.3.2 (but not glibc-2.2.5) for sh4:
28.5 -
28.6 -In file included from sys/ustat.h:30,
28.7 - from ../sysdeps/unix/sysv/linux/ustat.c:21:
28.8 -../sysdeps/generic/bits/ustat.h:26: error: redefinition of `struct ustat'
28.9 -make[2]: *** [/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/build-glibc/misc/ustat.o] Error 1
28.10 -make[2]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2/misc'
28.11 -make[1]: *** [misc/subdir_lib] Error 2
28.12 -make[1]: Leaving directory `/home3/dank/crosstool-0.7/build/sh4-unknown-linux-gnu/gcc-3.3-glibc-2.3.2/glibc-2.3.2'
28.13 -make: *** [all] Error 2
28.14 -
28.15 ------------ snip ---------------
28.16 -
28.17 -Date: Fri, 06 Jun 2003 08:00:00 +0900
28.18 -From: kaz Kojima <kkojima@rr.iij4u.or.jp>
28.19 -Subject: [linux-sh:02770] Re: Compiling glibc-2.3.2 for sh4 fails with "include/asm/user.h:32:
28.20 - error: redefinition of `struct user_fpu_struct'"
28.21 -To: linux-sh@m17n.org
28.22 -Message-Id: <200306052250.h55Moeb08707@r-rr.iij4u.or.jp>
28.23 -
28.24 -Hi,
28.25 -
28.26 -Dan Kegel <dank@kegel.com> wrote:
28.27 -> When I try to build glibc-2.3.2 for sh4, it fails with the error
28.28 -[snip]
28.29 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:32: error: redefinition of `struct user_fpu_struct'
28.30 -> /home3/dank/crosstool-0.3/result/sh4-linux/gcc-3.3-glibc-2.3.2/sh4-linux/include/asm/user.h:39: error: redefinition of `struct user'
28.31 -[snip]
28.32 -> The error reminds me of the kind of thing fixed by
28.33 -> http://www.kegel.com/crossgcc/crosstool-0.4/glibc-2.3.2-patches/sh-user.patch
28.34 -
28.35 -It seems that the definitions in asm/user.h and the above patch collide.
28.36 -I'm not sure why you need this patch, but is it needed for the problem
28.37 -about struct ustat that you pointed out in this list, isn't it?
28.38 -I found why I don't hit ustat problem - my local kernel tree includes
28.39 -the following patch, though I can't recall about it.
28.40 -
28.41 -Regards,
28.42 - kaz
28.43 ---
28.44 -diff -u linux-2.5.69-sf-orig/include/linux/types.h /usr/local/sh4-unknown-linux-gnu/include/linux/types.h
28.45 ---- linux-2.5.69-sf-orig/include/linux/types.h Wed Mar 5 12:29:34 2003
28.46 -+++ sh4-unknown-linux-gnu/include/linux/types.h Sat Apr 19 10:05:52 2003
28.47 -@@ -141,6 +141,7 @@
28.48 -
28.49 - #endif /* __KERNEL_STRICT_NAMES */
28.50 -
28.51 -+#ifdef __KERNEL__
28.52 - /*
28.53 - * Below are truly Linux-specific types that should never collide with
28.54 - * any application/library that wants linux/types.h.
28.55 -@@ -152,5 +153,6 @@
28.56 - char f_fname[6];
28.57 - char f_fpack[6];
28.58 - };
28.59 -+#endif
28.60 -
28.61 - #endif /* _LINUX_TYPES_H */
28.62 -
28.63 -
29.1 --- a/patches/linux/2.6.8/110-linux-2.6.8-allow-gcc-4.0-asm-i386.patch Fri Sep 05 16:15:34 2008 +0000
29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
29.3 @@ -1,138 +0,0 @@
29.4 -Fixes
29.5 -
29.6 -In file included from include/asm/thread_info.h:16,
29.7 - from include/linux/thread_info.h:21,
29.8 - from include/linux/spinlock.h:12,
29.9 - from include/linux/capability.h:45,
29.10 - from include/linux/sched.h:7,
29.11 - from arch/i386/kernel/asm-offsets.c:7:
29.12 -include/asm/processor.h:87: error: array type has incomplete element type
29.13 -make[1]: *** [arch/i386/kernel/asm-offsets.asm] Error 1
29.14 -
29.15 ---- linux-2.6.8/include/asm-i386/processor.h.old Tue Mar 15 00:14:42 2005
29.16 -+++ linux-2.6.8/include/asm-i386/processor.h Tue Mar 15 00:18:45 2005
29.17 -@@ -79,6 +79,58 @@
29.18 - #define X86_VENDOR_UNKNOWN 0xff
29.19 -
29.20 - /*
29.21 -+ * Size of io_bitmap.
29.22 -+ */
29.23 -+#define IO_BITMAP_BITS 65536
29.24 -+#define IO_BITMAP_BYTES (IO_BITMAP_BITS/8)
29.25 -+#define IO_BITMAP_LONGS (IO_BITMAP_BYTES/sizeof(long))
29.26 -+#define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap)
29.27 -+#define INVALID_IO_BITMAP_OFFSET 0x8000
29.28 -+
29.29 -+struct tss_struct {
29.30 -+ unsigned short back_link,__blh;
29.31 -+ unsigned long esp0;
29.32 -+ unsigned short ss0,__ss0h;
29.33 -+ unsigned long esp1;
29.34 -+ unsigned short ss1,__ss1h; /* ss1 is used to cache MSR_IA32_SYSENTER_CS */
29.35 -+ unsigned long esp2;
29.36 -+ unsigned short ss2,__ss2h;
29.37 -+ unsigned long __cr3;
29.38 -+ unsigned long eip;
29.39 -+ unsigned long eflags;
29.40 -+ unsigned long eax,ecx,edx,ebx;
29.41 -+ unsigned long esp;
29.42 -+ unsigned long ebp;
29.43 -+ unsigned long esi;
29.44 -+ unsigned long edi;
29.45 -+ unsigned short es, __esh;
29.46 -+ unsigned short cs, __csh;
29.47 -+ unsigned short ss, __ssh;
29.48 -+ unsigned short ds, __dsh;
29.49 -+ unsigned short fs, __fsh;
29.50 -+ unsigned short gs, __gsh;
29.51 -+ unsigned short ldt, __ldth;
29.52 -+ unsigned short trace, io_bitmap_base;
29.53 -+ /*
29.54 -+ * The extra 1 is there because the CPU will access an
29.55 -+ * additional byte beyond the end of the IO permission
29.56 -+ * bitmap. The extra byte must be all 1 bits, and must
29.57 -+ * be within the limit.
29.58 -+ */
29.59 -+ unsigned long io_bitmap[IO_BITMAP_LONGS + 1];
29.60 -+ /*
29.61 -+ * pads the TSS to be cacheline-aligned (size is 0x100)
29.62 -+ */
29.63 -+ unsigned long __cacheline_filler[37];
29.64 -+ /*
29.65 -+ * .. and then another 0x100 bytes for emergency kernel stack
29.66 -+ */
29.67 -+ unsigned long stack[64];
29.68 -+} __attribute__((packed));
29.69 -+
29.70 -+#define ARCH_MIN_TASKALIGN 16
29.71 -+
29.72 -+/*
29.73 - * capabilities of CPUs
29.74 - */
29.75 -
29.76 -@@ -296,15 +348,6 @@
29.77 - */
29.78 - #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
29.79 -
29.80 --/*
29.81 -- * Size of io_bitmap.
29.82 -- */
29.83 --#define IO_BITMAP_BITS 65536
29.84 --#define IO_BITMAP_BYTES (IO_BITMAP_BITS/8)
29.85 --#define IO_BITMAP_LONGS (IO_BITMAP_BYTES/sizeof(long))
29.86 --#define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap)
29.87 --#define INVALID_IO_BITMAP_OFFSET 0x8000
29.88 --
29.89 - struct i387_fsave_struct {
29.90 - long cwd;
29.91 - long swd;
29.92 -@@ -356,49 +399,6 @@
29.93 - typedef struct {
29.94 - unsigned long seg;
29.95 - } mm_segment_t;
29.96 --
29.97 --struct tss_struct {
29.98 -- unsigned short back_link,__blh;
29.99 -- unsigned long esp0;
29.100 -- unsigned short ss0,__ss0h;
29.101 -- unsigned long esp1;
29.102 -- unsigned short ss1,__ss1h; /* ss1 is used to cache MSR_IA32_SYSENTER_CS */
29.103 -- unsigned long esp2;
29.104 -- unsigned short ss2,__ss2h;
29.105 -- unsigned long __cr3;
29.106 -- unsigned long eip;
29.107 -- unsigned long eflags;
29.108 -- unsigned long eax,ecx,edx,ebx;
29.109 -- unsigned long esp;
29.110 -- unsigned long ebp;
29.111 -- unsigned long esi;
29.112 -- unsigned long edi;
29.113 -- unsigned short es, __esh;
29.114 -- unsigned short cs, __csh;
29.115 -- unsigned short ss, __ssh;
29.116 -- unsigned short ds, __dsh;
29.117 -- unsigned short fs, __fsh;
29.118 -- unsigned short gs, __gsh;
29.119 -- unsigned short ldt, __ldth;
29.120 -- unsigned short trace, io_bitmap_base;
29.121 -- /*
29.122 -- * The extra 1 is there because the CPU will access an
29.123 -- * additional byte beyond the end of the IO permission
29.124 -- * bitmap. The extra byte must be all 1 bits, and must
29.125 -- * be within the limit.
29.126 -- */
29.127 -- unsigned long io_bitmap[IO_BITMAP_LONGS + 1];
29.128 -- /*
29.129 -- * pads the TSS to be cacheline-aligned (size is 0x100)
29.130 -- */
29.131 -- unsigned long __cacheline_filler[37];
29.132 -- /*
29.133 -- * .. and then another 0x100 bytes for emergency kernel stack
29.134 -- */
29.135 -- unsigned long stack[64];
29.136 --} __attribute__((packed));
29.137 --
29.138 --#define ARCH_MIN_TASKALIGN 16
29.139 -
29.140 - struct thread_struct {
29.141 - /* cached TLS descriptors. */
30.1 --- a/patches/linux/2.6.8/120-linux-2.6.8-arm-nonofpu.patch Fri Sep 05 16:15:34 2008 +0000
30.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
30.3 @@ -1,50 +0,0 @@
30.4 -http://www.spinics.net/lists/arm/msg08012.html
30.5 -
30.6 -To: Dimitry Andric <dimitry@xxxxxxxxxx>
30.7 -Subject: Re: Kernel Compile Error: use of old and new-style options to set FPU type
30.8 -From: Marc Britten <maillists@xxxxxxxxxxxxxxxxx>
30.9 -Date: Wed, 16 Jun 2004 03:03:15 -0400
30.10 -Cc: linux-arm@xxxxxxxxxxxxxxxxxxxxxx
30.11 -In-reply-to: <1525495613.20040615202902@andric.com>
30.12 -
30.13 -Dimitry Andric wrote:
30.14 -
30.15 ->>Assembler messages:
30.16 ->>Error: use of old and new-style options to set FPU type
30.17 -> Try removing -Wa,-mno-fpu from CFLAGS (and possibly AFLAGS, but I'm
30.18 -> not sure, depends on what your compiler generates by default) in
30.19 -> arch/arm/Makefile.
30.20 -
30.21 -Just to let people know, this was successful.
30.22 -
30.23 -Thanks,
30.24 -
30.25 -Marc Britten
30.26 -
30.27 ---------
30.28 -
30.29 -Fixes error
30.30 -
30.31 -...
30.32 -make -f scripts/Makefile.build obj=scripts/mod
30.33 - /opt/crosstool/arm-unknown-linux-gnu/gcc-3.4.1-glibc-2.3.3/bin/arm-unknown-linux-gnu-gcc -Wp,-MD,scripts/mod/.empty.o.d -nostdinc -iwithprefix include -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fno-omit-frame-pointer -mapcs -mno-sched-prolog -mlittle-endian -mapcs-32 -malignment-traps -msoft-float -Wa,-mno-fpu -Uarm -Os -Wdeclaration-after-statement -DKBUILD_BASENAME=empty -DKBUILD_MODNAME=empty -c -o scripts/mod/empty.o scripts/mod/empty.c
30.34 -Assembler messages:
30.35 -Error: use of old and new-style options to set FPU type
30.36 -make[2]: *** [scripts/mod/empty.o] Error 1
30.37 -make[1]: *** [scripts/mod] Error 2
30.38 -make: *** [scripts] Error 2
30.39 -
30.40 -
30.41 ---- linux-2.6.8/arch/arm/Makefile.old 2004-09-01 21:27:07.000000000 -0700
30.42 -+++ linux-2.6.8/arch/arm/Makefile 2004-09-01 21:27:31.000000000 -0700
30.43 -@@ -55,8 +55,8 @@
30.44 - tune-$(CONFIG_CPU_V6) :=-mtune=strongarm
30.45 -
30.46 - # Need -Uarm for gcc < 3.x
30.47 --CFLAGS +=-mapcs-32 $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Wa,-mno-fpu -Uarm
30.48 --AFLAGS +=-mapcs-32 $(arch-y) $(tune-y) -msoft-float -Wa,-mno-fpu
30.49 -+CFLAGS +=-mapcs-32 $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm
30.50 -+AFLAGS +=-mapcs-32 $(arch-y) $(tune-y) -msoft-float
30.51 -
30.52 - CHECK := $(CHECK) -D__arm__=1
30.53 -
31.1 --- a/patches/linux/2.6.8/130-linux-2.6.8-build_on_case_insensitive_fs.patch Fri Sep 05 16:15:34 2008 +0000
31.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
31.3 @@ -1,725 +0,0 @@
31.4 -Submitted By: Martin Schaffner <schaffner@gmx.li>
31.5 -Date: 2004-06-19
31.6 -Initial Package Version: 2.6.7
31.7 -Upstream Status: Not submitted
31.8 -Origin: Martin Schaffner
31.9 -Description: Enables build on case-insensitive file systems
31.10 -URL: xxxhttp://mirror.vtx.ch/lfs/patches/downloads/linux/linux-2.6.7-build_on_case_insensitive_fs-1.patch
31.11 ---- Rediffed against 2.6.8 by dank@kegel.com
31.12 ---- plus a few missing hunks added to fix sparc32 build
31.13 -
31.14 ---- linux-2.6.8/Makefile.orig 2004-08-13 22:37:25.000000000 -0700
31.15 -+++ linux-2.6.8/Makefile 2004-09-01 21:39:39.000000000 -0700
31.16 -@@ -540,7 +540,7 @@
31.17 -
31.18 - do_system_map = $(NM) $(1) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > $(2)
31.19 -
31.20 --LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.s
31.21 -+LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.asm
31.22 -
31.23 - # Generate section listing all symbols and add it into vmlinux
31.24 - # It's a three stage process:
31.25 -@@ -584,13 +584,13 @@
31.26 - .tmp_kallsyms%.S: .tmp_vmlinux%
31.27 - $(call cmd,kallsyms)
31.28 -
31.29 --.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
31.30 -+.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
31.31 - $(call if_changed_rule,vmlinux__)
31.32 -
31.33 --.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
31.34 -+.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
31.35 - $(call if_changed_rule,vmlinux__)
31.36 -
31.37 --.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
31.38 -+.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
31.39 - $(call if_changed_rule,vmlinux__)
31.40 -
31.41 - endif
31.42 -@@ -603,13 +603,13 @@
31.43 - $(rule_verify_kallsyms)
31.44 - endef
31.45 -
31.46 --vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
31.47 -+vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
31.48 - $(call if_changed_rule,vmlinux)
31.49 -
31.50 - # The actual objects are generated when descending,
31.51 - # make sure no implicit rule kicks in
31.52 -
31.53 --$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.s: $(vmlinux-dirs) ;
31.54 -+$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.asm: $(vmlinux-dirs) ;
31.55 -
31.56 - # Handle descending into subdirectories listed in $(vmlinux-dirs)
31.57 - # Preset locale variables to speed up the build process. Limit locale
31.58 -@@ -672,7 +672,7 @@
31.59 - # Single targets
31.60 - # ---------------------------------------------------------------------------
31.61 -
31.62 --%.s: %.c scripts FORCE
31.63 -+%.asm: %.c scripts FORCE
31.64 - $(Q)$(MAKE) $(build)=$(@D) $@
31.65 - %.i: %.c scripts FORCE
31.66 - $(Q)$(MAKE) $(build)=$(@D) $@
31.67 -@@ -682,7 +682,7 @@
31.68 - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D)
31.69 - %.lst: %.c scripts FORCE
31.70 - $(Q)$(MAKE) $(build)=$(@D) $@
31.71 --%.s: %.S scripts FORCE
31.72 -+%.asm: %.S scripts FORCE
31.73 - $(Q)$(MAKE) $(build)=$(@D) $@
31.74 - %.o: %.S scripts FORCE
31.75 - $(Q)$(MAKE) $(build)=$(@D) $@
31.76 -diff -ur linux-2.6.7/arch/alpha/Makefile linux-2.6.7-mod/arch/alpha/Makefile
31.77 ---- linux-2.6.7/arch/alpha/Makefile Fri Jun 18 22:51:03 2004
31.78 -+++ linux-2.6.7-mod/arch/alpha/Makefile Sat Jun 19 12:46:32 2004
31.79 -@@ -114,10 +114,10 @@
31.80 -
31.81 - prepare: include/asm-$(ARCH)/asm_offsets.h
31.82 -
31.83 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.84 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.85 - include/config/MARKER
31.86 -
31.87 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
31.88 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.89 - $(call filechk,gen-asm-offsets)
31.90 -
31.91 - archclean:
31.92 -diff -ur linux-2.6.7/arch/alpha/kernel/Makefile linux-2.6.7-mod/arch/alpha/kernel/Makefile
31.93 ---- linux-2.6.7/arch/alpha/kernel/Makefile Mon May 10 04:32:29 2004
31.94 -+++ linux-2.6.7-mod/arch/alpha/kernel/Makefile Sat Jun 19 12:46:48 2004
31.95 -@@ -2,7 +2,7 @@
31.96 - # Makefile for the linux kernel.
31.97 - #
31.98 -
31.99 --extra-y := head.o vmlinux.lds.s
31.100 -+extra-y := head.o vmlinux.lds.asm
31.101 - EXTRA_AFLAGS := $(CFLAGS)
31.102 - EXTRA_CFLAGS := -Werror -Wno-sign-compare
31.103 -
31.104 ---- linux-2.6.8/arch/arm/Makefile.orig 2004-08-13 22:36:56.000000000 -0700
31.105 -+++ linux-2.6.8/arch/arm/Makefile 2004-09-01 21:40:21.000000000 -0700
31.106 -@@ -176,10 +176,10 @@
31.107 - bp:; $(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage
31.108 - i zi:; $(Q)$(MAKE) $(build)=$(boot) $@
31.109 -
31.110 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.111 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.112 - include/asm-arm/.arch
31.113 -
31.114 --include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s
31.115 -+include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.116 - $(call filechk,gen-asm-offsets)
31.117 -
31.118 - define archhelp
31.119 -diff -ur linux-2.6.7/arch/arm/kernel/Makefile linux-2.6.7-mod/arch/arm/kernel/Makefile
31.120 ---- linux-2.6.7/arch/arm/kernel/Makefile Mon May 10 04:33:19 2004
31.121 -+++ linux-2.6.7-mod/arch/arm/kernel/Makefile Sat Jun 19 12:47:25 2004
31.122 -@@ -27,7 +27,7 @@
31.123 - head-y := head.o
31.124 - obj-$(CONFIG_DEBUG_LL) += debug.o
31.125 -
31.126 --extra-y := $(head-y) init_task.o vmlinux.lds.s
31.127 -+extra-y := $(head-y) init_task.o vmlinux.lds.asm
31.128 -
31.129 - # Spell out some dependencies that aren't automatically figured out
31.130 - $(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h
31.131 -diff -ur linux-2.6.7/arch/arm26/Makefile linux-2.6.7-mod/arch/arm26/Makefile
31.132 ---- linux-2.6.7/arch/arm26/Makefile Mon May 10 04:32:28 2004
31.133 -+++ linux-2.6.7-mod/arch/arm26/Makefile Sat Jun 19 12:48:24 2004
31.134 -@@ -101,10 +101,10 @@
31.135 - fi; \
31.136 - )
31.137 -
31.138 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.139 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.140 - include/config/MARKER
31.141 -
31.142 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
31.143 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.144 - $(call filechk,gen-asm-offsets)
31.145 -
31.146 - define archhelp
31.147 -diff -ur linux-2.6.7/arch/arm26/kernel/Makefile linux-2.6.7-mod/arch/arm26/kernel/Makefile
31.148 ---- linux-2.6.7/arch/arm26/kernel/Makefile Mon May 10 04:32:29 2004
31.149 -+++ linux-2.6.7-mod/arch/arm26/kernel/Makefile Sat Jun 19 12:48:30 2004
31.150 -@@ -14,5 +14,5 @@
31.151 - obj-$(CONFIG_FIQ) += fiq.o
31.152 - obj-$(CONFIG_MODULES) += armksyms.o
31.153 -
31.154 --extra-y := init_task.o vmlinux.lds.s
31.155 -+extra-y := init_task.o vmlinux.lds.asm
31.156 -
31.157 -diff -ur linux-2.6.7/arch/cris/Makefile linux-2.6.7-mod/arch/cris/Makefile
31.158 ---- linux-2.6.7/arch/cris/Makefile Fri Jun 18 22:51:07 2004
31.159 -+++ linux-2.6.7-mod/arch/cris/Makefile Sat Jun 19 12:48:47 2004
31.160 -@@ -107,8 +107,8 @@
31.161 - @ln -sf $(SARCH) include/asm-$(ARCH)/arch
31.162 - @touch $@
31.163 -
31.164 --arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.165 -+arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.166 - include/config/MARKER
31.167 -
31.168 --include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
31.169 -+include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm
31.170 - $(call filechk,gen-asm-offsets)
31.171 -diff -ur linux-2.6.7/arch/cris/kernel/Makefile linux-2.6.7-mod/arch/cris/kernel/Makefile
31.172 ---- linux-2.6.7/arch/cris/kernel/Makefile Fri Jun 18 22:51:09 2004
31.173 -+++ linux-2.6.7-mod/arch/cris/kernel/Makefile Sat Jun 19 12:48:53 2004
31.174 -@@ -3,7 +3,7 @@
31.175 - # Makefile for the linux kernel.
31.176 - #
31.177 -
31.178 --extra-y := vmlinux.lds.s
31.179 -+extra-y := vmlinux.lds.asm
31.180 -
31.181 - obj-y := process.o traps.o irq.o ptrace.o setup.o \
31.182 - time.o sys_cris.o semaphore.o
31.183 -diff -ur linux-2.6.7/arch/h8300/Makefile linux-2.6.7-mod/arch/h8300/Makefile
31.184 ---- linux-2.6.7/arch/h8300/Makefile Fri Jun 18 22:51:09 2004
31.185 -+++ linux-2.6.7-mod/arch/h8300/Makefile Sat Jun 19 12:49:12 2004
31.186 -@@ -64,7 +64,7 @@
31.187 -
31.188 - prepare: include/asm-$(ARCH)/asm-offsets.h
31.189 -
31.190 --include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
31.191 -+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
31.192 - include/asm include/linux/version.h
31.193 - $(call filechk,gen-asm-offsets)
31.194 -
31.195 -diff -ur linux-2.6.7/arch/h8300/kernel/Makefile linux-2.6.7-mod/arch/h8300/kernel/Makefile
31.196 ---- linux-2.6.7/arch/h8300/kernel/Makefile Fri Jun 18 22:51:09 2004
31.197 -+++ linux-2.6.7-mod/arch/h8300/kernel/Makefile Sat Jun 19 12:49:32 2004
31.198 -@@ -2,7 +2,7 @@
31.199 - # Makefile for the linux kernel.
31.200 - #
31.201 -
31.202 --extra-y := vmlinux.lds.s
31.203 -+extra-y := vmlinux.lds.asm
31.204 -
31.205 - obj-y := process.o traps.o ptrace.o ints.o \
31.206 - sys_h8300.o time.o semaphore.o signal.o \
31.207 -diff -ur linux-2.6.7/arch/i386/Makefile linux-2.6.7-mod/arch/i386/Makefile
31.208 ---- linux-2.6.7/arch/i386/Makefile Fri Jun 18 22:51:10 2004
31.209 -+++ linux-2.6.7-mod/arch/i386/Makefile Sat Jun 19 12:49:43 2004
31.210 -@@ -141,10 +141,10 @@
31.211 - prepare: include/asm-$(ARCH)/asm_offsets.h
31.212 - CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
31.213 -
31.214 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.215 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.216 - include/config/MARKER
31.217 -
31.218 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
31.219 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.220 - $(call filechk,gen-asm-offsets)
31.221 -
31.222 - archclean:
31.223 -diff -ur linux-2.6.7/arch/i386/kernel/Makefile linux-2.6.7-mod/arch/i386/kernel/Makefile
31.224 ---- linux-2.6.7/arch/i386/kernel/Makefile Mon May 10 04:32:02 2004
31.225 -+++ linux-2.6.7-mod/arch/i386/kernel/Makefile Sat Jun 19 12:49:54 2004
31.226 -@@ -2,7 +2,7 @@
31.227 - # Makefile for the linux kernel.
31.228 - #
31.229 -
31.230 --extra-y := head.o init_task.o vmlinux.lds.s
31.231 -+extra-y := head.o init_task.o vmlinux.lds.asm
31.232 -
31.233 - obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
31.234 - ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
31.235 -diff -ur linux-2.6.7/arch/ia64/Makefile linux-2.6.7-mod/arch/ia64/Makefile
31.236 ---- linux-2.6.7/arch/ia64/Makefile Mon May 10 04:31:59 2004
31.237 -+++ linux-2.6.7-mod/arch/ia64/Makefile Sat Jun 19 12:50:12 2004
31.238 -@@ -88,12 +88,12 @@
31.239 -
31.240 - prepare: include/asm-ia64/offsets.h
31.241 -
31.242 --arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
31.243 -+arch/ia64/kernel/asm-offsets.asm: include/asm include/linux/version.h include/config/MARKER
31.244 -
31.245 --include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
31.246 -+include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.asm
31.247 - $(call filechk,gen-asm-offsets)
31.248 -
31.249 --arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
31.250 -+arch/ia64/kernel/asm-offsets.asm: include/asm-ia64/.offsets.h.stamp
31.251 -
31.252 - include/asm-ia64/.offsets.h.stamp:
31.253 - mkdir -p include/asm-ia64
31.254 -diff -ur linux-2.6.7/arch/ia64/kernel/Makefile linux-2.6.7-mod/arch/ia64/kernel/Makefile
31.255 ---- linux-2.6.7/arch/ia64/kernel/Makefile Fri Jun 18 22:51:13 2004
31.256 -+++ linux-2.6.7-mod/arch/ia64/kernel/Makefile Sat Jun 19 12:52:14 2004
31.257 -@@ -2,7 +2,7 @@
31.258 - # Makefile for the linux kernel.
31.259 - #
31.260 -
31.261 --extra-y := head.o init_task.o vmlinux.lds.s
31.262 -+extra-y := head.o init_task.o vmlinux.lds.asm
31.263 -
31.264 - obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \
31.265 - irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \
31.266 -@@ -21,7 +21,7 @@
31.267 - # The gate DSO image is built using a special linker script.
31.268 - targets += gate.so gate-syms.o
31.269 -
31.270 --extra-y += gate.so gate-syms.o gate.lds.s gate.o
31.271 -+extra-y += gate.so gate-syms.o gate.lds.asm gate.o
31.272 -
31.273 - # fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
31.274 - CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31
31.275 -@@ -32,14 +32,14 @@
31.276 - cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
31.277 -
31.278 - GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1
31.279 --$(obj)/gate.so: $(obj)/gate.lds.s $(obj)/gate.o FORCE
31.280 -+$(obj)/gate.so: $(obj)/gate.lds.asm $(obj)/gate.o FORCE
31.281 - $(call if_changed,gate)
31.282 -
31.283 - $(obj)/built-in.o: $(obj)/gate-syms.o
31.284 - $(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
31.285 -
31.286 - GATECFLAGS_gate-syms.o = -r
31.287 --$(obj)/gate-syms.o: $(src)/gate.lds.s $(obj)/gate.o FORCE
31.288 -+$(obj)/gate-syms.o: $(src)/gate.lds.asm $(obj)/gate.o FORCE
31.289 - $(call if_changed,gate)
31.290 -
31.291 - # gate-data.o contains the gate DSO image as data in section .data.gate.
31.292 -diff -ur linux-2.6.7/arch/m68k/Makefile linux-2.6.7-mod/arch/m68k/Makefile
31.293 ---- linux-2.6.7/arch/m68k/Makefile Fri Jun 18 22:51:14 2004
31.294 -+++ linux-2.6.7-mod/arch/m68k/Makefile Sat Jun 19 12:52:30 2004
31.295 -@@ -114,10 +114,10 @@
31.296 - prepare: include/asm-$(ARCH)/offsets.h
31.297 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h
31.298 -
31.299 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.300 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.301 - include/config/MARKER
31.302 -
31.303 --include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
31.304 -+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.305 - $(call filechk,gen-asm-offsets)
31.306 -
31.307 - archclean:
31.308 -diff -ur linux-2.6.7/arch/m68k/kernel/Makefile linux-2.6.7-mod/arch/m68k/kernel/Makefile
31.309 ---- linux-2.6.7/arch/m68k/kernel/Makefile Mon May 10 04:33:10 2004
31.310 -+++ linux-2.6.7-mod/arch/m68k/kernel/Makefile Sat Jun 19 12:52:35 2004
31.311 -@@ -7,7 +7,7 @@
31.312 - else
31.313 - extra-y := sun3-head.o
31.314 - endif
31.315 --extra-y += vmlinux.lds.s
31.316 -+extra-y += vmlinux.lds.asm
31.317 -
31.318 - obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \
31.319 - sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
31.320 -diff -ur linux-2.6.7/arch/m68knommu/Makefile linux-2.6.7-mod/arch/m68knommu/Makefile
31.321 ---- linux-2.6.7/arch/m68knommu/Makefile Mon May 10 04:32:54 2004
31.322 -+++ linux-2.6.7-mod/arch/m68knommu/Makefile Sat Jun 19 12:52:57 2004
31.323 -@@ -89,7 +89,7 @@
31.324 - head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
31.325 -
31.326 - CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
31.327 -- arch/$(ARCH)/kernel/asm-offsets.s
31.328 -+ arch/$(ARCH)/kernel/asm-offsets.asm
31.329 -
31.330 - core-y += arch/m68knommu/kernel/ \
31.331 - arch/m68knommu/mm/ \
31.332 -@@ -102,7 +102,7 @@
31.333 - archclean:
31.334 - $(call descend arch/$(ARCH)/boot, subdirclean)
31.335 -
31.336 --include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
31.337 -+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
31.338 - include/asm include/linux/version.h \
31.339 - include/config/MARKER
31.340 - $(call filechk,gen-asm-offsets)
31.341 -diff -ur linux-2.6.7/arch/m68knommu/kernel/Makefile linux-2.6.7-mod/arch/m68knommu/kernel/Makefile
31.342 ---- linux-2.6.7/arch/m68knommu/kernel/Makefile Mon May 10 04:32:26 2004
31.343 -+++ linux-2.6.7-mod/arch/m68knommu/kernel/Makefile Sat Jun 19 12:53:20 2004
31.344 -@@ -2,7 +2,7 @@
31.345 - # Makefile for arch/m68knommu/kernel.
31.346 - #
31.347 -
31.348 --extra-y := vmlinux.lds.s
31.349 -+extra-y := vmlinux.lds.asm
31.350 -
31.351 - obj-y += dma.o entry.o init_task.o m68k_ksyms.o process.o ptrace.o semaphore.o \
31.352 - setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
31.353 -diff -ur linux-2.6.7/arch/mips/Makefile linux-2.6.7-mod/arch/mips/Makefile
31.354 ---- linux-2.6.7/arch/mips/Makefile Fri Jun 18 22:51:19 2004
31.355 -+++ linux-2.6.7-mod/arch/mips/Makefile Sat Jun 19 12:53:35 2004
31.356 -@@ -752,12 +752,12 @@
31.357 - prepare: include/asm-$(ARCH)/offset.h \
31.358 - include/asm-$(ARCH)/reg.h
31.359 -
31.360 --arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \
31.361 -+arch/$(ARCH)/kernel/offset.asm: include/asm include/linux/version.h \
31.362 - include/config/MARKER
31.363 -
31.364 --include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
31.365 -+include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.asm
31.366 - $(call filechk,gen-asm-offset.h)
31.367 --include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.s
31.368 -+include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.asm
31.369 - $(call filechk,gen-asm-reg.h)
31.370 -
31.371 - CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \
31.372 -diff -ur linux-2.6.7/arch/mips/kernel/Makefile linux-2.6.7-mod/arch/mips/kernel/Makefile
31.373 ---- linux-2.6.7/arch/mips/kernel/Makefile Mon May 10 04:32:28 2004
31.374 -+++ linux-2.6.7-mod/arch/mips/kernel/Makefile Sat Jun 19 12:53:41 2004
31.375 -@@ -2,7 +2,7 @@
31.376 - # Makefile for the Linux/MIPS kernel.
31.377 - #
31.378 -
31.379 --extra-y := head.o init_task.o vmlinux.lds.s
31.380 -+extra-y := head.o init_task.o vmlinux.lds.asm
31.381 -
31.382 - obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
31.383 - ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
31.384 -diff -ur linux-2.6.7/arch/parisc/Makefile linux-2.6.7-mod/arch/parisc/Makefile
31.385 ---- linux-2.6.7/arch/parisc/Makefile Fri Jun 18 22:51:21 2004
31.386 -+++ linux-2.6.7-mod/arch/parisc/Makefile Sat Jun 19 12:53:47 2004
31.387 -@@ -88,10 +88,10 @@
31.388 -
31.389 - prepare: include/asm-parisc/offsets.h
31.390 -
31.391 --arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.392 -+arch/parisc/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.393 - include/config/MARKER
31.394 -
31.395 --include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s
31.396 -+include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.asm
31.397 - $(call filechk,gen-asm-offsets)
31.398 -
31.399 - CLEAN_FILES += lifimage include/asm-parisc/offsets.h
31.400 -diff -ur linux-2.6.7/arch/parisc/kernel/Makefile linux-2.6.7-mod/arch/parisc/kernel/Makefile
31.401 ---- linux-2.6.7/arch/parisc/kernel/Makefile Fri Jun 18 22:51:21 2004
31.402 -+++ linux-2.6.7-mod/arch/parisc/kernel/Makefile Sat Jun 19 12:53:53 2004
31.403 -@@ -4,7 +4,7 @@
31.404 -
31.405 - head-y := head.o
31.406 - head-$(CONFIG_PARISC64) := head64.o
31.407 --extra-y := init_task.o $(head-y) vmlinux.lds.s
31.408 -+extra-y := init_task.o $(head-y) vmlinux.lds.asm
31.409 -
31.410 - AFLAGS_entry.o := -traditional
31.411 - AFLAGS_pacache.o := -traditional
31.412 -diff -ur linux-2.6.7/arch/ppc/Makefile linux-2.6.7-mod/arch/ppc/Makefile
31.413 ---- linux-2.6.7/arch/ppc/Makefile Fri Jun 18 22:51:22 2004
31.414 -+++ linux-2.6.7-mod/arch/ppc/Makefile Sat Jun 19 12:54:09 2004
31.415 -@@ -78,10 +78,10 @@
31.416 -
31.417 - prepare: include/asm-$(ARCH)/offsets.h checkbin
31.418 -
31.419 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.420 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.421 - include/config/MARKER
31.422 -
31.423 --include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
31.424 -+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.425 - $(call filechk,gen-asm-offsets)
31.426 -
31.427 - ifdef CONFIG_6xx
31.428 -@@ -104,4 +104,4 @@
31.429 - endif
31.430 -
31.431 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h \
31.432 -- arch/$(ARCH)/kernel/asm-offsets.s
31.433 -+ arch/$(ARCH)/kernel/asm-offsets.asm
31.434 -diff -ur linux-2.6.7/arch/ppc/kernel/Makefile linux-2.6.7-mod/arch/ppc/kernel/Makefile
31.435 ---- linux-2.6.7/arch/ppc/kernel/Makefile Fri Jun 18 22:51:24 2004
31.436 -+++ linux-2.6.7-mod/arch/ppc/kernel/Makefile Sat Jun 19 12:43:10 2004
31.437 -@@ -15,7 +15,7 @@
31.438 - extra-$(CONFIG_8xx) := head_8xx.o
31.439 - extra-$(CONFIG_6xx) += idle_6xx.o
31.440 - extra-$(CONFIG_POWER4) += idle_power4.o
31.441 --extra-y += vmlinux.lds.s
31.442 -+extra-y += vmlinux.lds.asm
31.443 -
31.444 - obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
31.445 - process.o signal.o ptrace.o align.o \
31.446 -diff -ur linux-2.6.7/arch/ppc64/Makefile linux-2.6.7-mod/arch/ppc64/Makefile
31.447 ---- linux-2.6.7/arch/ppc64/Makefile Fri Jun 18 22:51:26 2004
31.448 -+++ linux-2.6.7-mod/arch/ppc64/Makefile Sat Jun 19 12:54:32 2004
31.449 -@@ -67,10 +67,10 @@
31.450 -
31.451 - prepare: include/asm-ppc64/offsets.h
31.452 -
31.453 --arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.454 -+arch/ppc64/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.455 - include/config/MARKER
31.456 -
31.457 --include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
31.458 -+include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.asm
31.459 - $(call filechk,gen-asm-offsets)
31.460 -
31.461 - define archhelp
31.462 -diff -ur linux-2.6.7/arch/ppc64/kernel/Makefile linux-2.6.7-mod/arch/ppc64/kernel/Makefile
31.463 ---- linux-2.6.7/arch/ppc64/kernel/Makefile Mon May 10 04:33:20 2004
31.464 -+++ linux-2.6.7-mod/arch/ppc64/kernel/Makefile Sat Jun 19 12:54:39 2004
31.465 -@@ -3,7 +3,7 @@
31.466 - #
31.467 -
31.468 - EXTRA_CFLAGS += -mno-minimal-toc
31.469 --extra-y := head.o vmlinux.lds.s
31.470 -+extra-y := head.o vmlinux.lds.asm
31.471 -
31.472 - obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \
31.473 - time.o process.o signal.o syscalls.o misc.o ptrace.o \
31.474 -diff -ur linux-2.6.7/arch/s390/Makefile linux-2.6.7-mod/arch/s390/Makefile
31.475 ---- linux-2.6.7/arch/s390/Makefile Mon May 10 04:32:02 2004
31.476 -+++ linux-2.6.7-mod/arch/s390/Makefile Sat Jun 19 12:54:46 2004
31.477 -@@ -68,10 +68,10 @@
31.478 -
31.479 - prepare: include/asm-$(ARCH)/offsets.h
31.480 -
31.481 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.482 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.483 - include/config/MARKER
31.484 -
31.485 --include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
31.486 -+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.487 - $(call filechk,gen-asm-offsets)
31.488 -
31.489 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h
31.490 -diff -ur linux-2.6.7/arch/s390/kernel/Makefile linux-2.6.7-mod/arch/s390/kernel/Makefile
31.491 ---- linux-2.6.7/arch/s390/kernel/Makefile Mon May 10 04:33:20 2004
31.492 -+++ linux-2.6.7-mod/arch/s390/kernel/Makefile Sat Jun 19 12:54:52 2004
31.493 -@@ -10,7 +10,7 @@
31.494 -
31.495 - extra-$(CONFIG_ARCH_S390_31) += head.o
31.496 - extra-$(CONFIG_ARCH_S390X) += head64.o
31.497 --extra-y += init_task.o vmlinux.lds.s
31.498 -+extra-y += init_task.o vmlinux.lds.asm
31.499 -
31.500 - obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
31.501 - obj-$(CONFIG_SMP) += smp.o
31.502 -diff -ur linux-2.6.7/arch/sh/kernel/Makefile linux-2.6.7-mod/arch/sh/kernel/Makefile
31.503 ---- linux-2.6.7/arch/sh/kernel/Makefile Mon May 10 04:32:39 2004
31.504 -+++ linux-2.6.7-mod/arch/sh/kernel/Makefile Sat Jun 19 12:55:33 2004
31.505 -@@ -2,7 +2,7 @@
31.506 - # Makefile for the Linux/SuperH kernel.
31.507 - #
31.508 -
31.509 --extra-y := head.o init_task.o vmlinux.lds.s
31.510 -+extra-y := head.o init_task.o vmlinux.lds.asm
31.511 -
31.512 - obj-y := process.o signal.o entry.o traps.o irq.o \
31.513 - ptrace.o setup.o time.o sys_sh.o semaphore.o \
31.514 -diff -ur linux-2.6.7/arch/sparc/Makefile linux-2.6.7-mod/arch/sparc/Makefile
31.515 ---- linux-2.6.7/arch/sparc/Makefile Fri Jun 18 22:51:29 2004
31.516 -+++ linux-2.6.7-mod/arch/sparc/Makefile Sat Jun 19 12:55:48 2004
31.517 -@@ -61,14 +61,14 @@
31.518 -
31.519 - prepare: include/asm-$(ARCH)/asm_offsets.h
31.520 -
31.521 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.522 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.523 - include/config/MARKER
31.524 -
31.525 --include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
31.526 -+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.527 - $(call filechk,gen-asm-offsets)
31.528 -
31.529 - CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h \
31.530 -- arch/$(ARCH)/kernel/asm-offsets.s \
31.531 -+ arch/$(ARCH)/kernel/asm-offsets.asm \
31.532 - arch/$(ARCH)/boot/System.map
31.533 -
31.534 - # Don't use tabs in echo arguments.
31.535 -diff -ur linux-2.6.7/arch/sparc/kernel/Makefile linux-2.6.7-mod/arch/sparc/kernel/Makefile
31.536 ---- linux-2.6.7/arch/sparc/kernel/Makefile Mon May 10 04:33:13 2004
31.537 -+++ linux-2.6.7-mod/arch/sparc/kernel/Makefile Sat Jun 19 12:55:52 2004
31.538 -@@ -2,7 +2,7 @@
31.539 - # Makefile for the linux kernel.
31.540 - #
31.541 -
31.542 --extra-y := head.o init_task.o vmlinux.lds.s
31.543 -+extra-y := head.o init_task.o vmlinux.lds.asm
31.544 -
31.545 - EXTRA_AFLAGS := -ansi
31.546 -
31.547 -diff -ur linux-2.6.7/arch/sparc64/kernel/Makefile linux-2.6.7-mod/arch/sparc64/kernel/Makefile
31.548 ---- linux-2.6.7/arch/sparc64/kernel/Makefile Mon May 10 04:32:02 2004
31.549 -+++ linux-2.6.7-mod/arch/sparc64/kernel/Makefile Sat Jun 19 12:56:24 2004
31.550 -@@ -5,7 +5,7 @@
31.551 - EXTRA_AFLAGS := -ansi
31.552 - EXTRA_CFLAGS := -Werror
31.553 -
31.554 --extra-y := head.o init_task.o vmlinux.lds.s
31.555 -+extra-y := head.o init_task.o vmlinux.lds.asm
31.556 -
31.557 - obj-y := process.o setup.o cpu.o idprom.o \
31.558 - traps.o devices.o auxio.o \
31.559 -diff -ur linux-2.6.7/arch/um/Makefile linux-2.6.7-mod/arch/um/Makefile
31.560 ---- linux-2.6.7/arch/um/Makefile Mon May 10 04:32:52 2004
31.561 -+++ linux-2.6.7-mod/arch/um/Makefile Sat Jun 19 12:57:07 2004
31.562 -@@ -77,7 +77,7 @@
31.563 - # CONFIG_MODE_SKAS + CONFIG_STATIC_LINK case.
31.564 -
31.565 - LINK_TT = -static
31.566 --LD_SCRIPT_TT := uml.lds.s
31.567 -+LD_SCRIPT_TT := uml.lds.asm
31.568 -
31.569 - ifeq ($(CONFIG_STATIC_LINK),y)
31.570 - LINK-y += $(LINK_TT)
31.571 -@@ -103,11 +103,11 @@
31.572 - -DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
31.573 - -DKERNEL_STACK_SIZE=$(STACK_SIZE)
31.574 -
31.575 --AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
31.576 -+AFLAGS_$(LD_SCRIPT-y:.asm=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
31.577 -
31.578 - LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
31.579 -
31.580 --$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
31.581 -+$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.asm=.S) scripts FORCE
31.582 - $(call if_changed_dep,as_s_S)
31.583 -
31.584 - linux: vmlinux $(LD_SCRIPT-y)
31.585 -@@ -122,8 +122,8 @@
31.586 - # To get a definition of F_SETSIG
31.587 - USER_CFLAGS += -D_GNU_SOURCE
31.588 -
31.589 --CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
31.590 -- $(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
31.591 -+CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.asm \
31.592 -+ $(ARCH_DIR)/dyn_link.ld.asm $(GEN_HEADERS)
31.593 -
31.594 - $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
31.595 - $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
31.596 -diff -ur linux-2.6.7/arch/um/kernel/Makefile linux-2.6.7-mod/arch/um/kernel/Makefile
31.597 ---- linux-2.6.7/arch/um/kernel/Makefile Mon May 10 04:32:53 2004
31.598 -+++ linux-2.6.7-mod/arch/um/kernel/Makefile Sat Jun 19 12:57:15 2004
31.599 -@@ -3,7 +3,7 @@
31.600 - # Licensed under the GPL
31.601 - #
31.602 -
31.603 --extra-y := vmlinux.lds.s
31.604 -+extra-y := vmlinux.lds.asm
31.605 -
31.606 - obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
31.607 - helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
31.608 -diff -ur linux-2.6.7/arch/v850/Makefile linux-2.6.7-mod/arch/v850/Makefile
31.609 ---- linux-2.6.7/arch/v850/Makefile Mon May 10 04:33:21 2004
31.610 -+++ linux-2.6.7-mod/arch/v850/Makefile Sat Jun 19 12:57:59 2004
31.611 -@@ -52,12 +52,12 @@
31.612 - prepare: include/asm-$(ARCH)/asm-consts.h
31.613 -
31.614 - # Generate constants from C code for use by asm files
31.615 --arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \
31.616 -+arch/$(ARCH)/kernel/asm-consts.asm: include/asm include/linux/version.h \
31.617 - include/config/MARKER
31.618 -
31.619 --include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s
31.620 -+include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.asm
31.621 - $(call filechk,gen-asm-offsets)
31.622 -
31.623 - CLEAN_FILES += include/asm-$(ARCH)/asm-consts.h \
31.624 -- arch/$(ARCH)/kernel/asm-consts.s \
31.625 -+ arch/$(ARCH)/kernel/asm-consts.asm \
31.626 - root_fs_image.o
31.627 -diff -ur linux-2.6.7/arch/v850/kernel/Makefile linux-2.6.7-mod/arch/v850/kernel/Makefile
31.628 ---- linux-2.6.7/arch/v850/kernel/Makefile Mon May 10 04:33:21 2004
31.629 -+++ linux-2.6.7-mod/arch/v850/kernel/Makefile Sat Jun 19 12:58:04 2004
31.630 -@@ -9,7 +9,7 @@
31.631 - # for more details.
31.632 - #
31.633 -
31.634 --extra-y := head.o init_task.o vmlinux.lds.s
31.635 -+extra-y := head.o init_task.o vmlinux.lds.asm
31.636 -
31.637 - obj-y += intv.o entry.o process.o syscalls.o time.o semaphore.o setup.o \
31.638 - signal.o irq.o mach.o ptrace.o bug.o
31.639 -diff -ur linux-2.6.7/arch/x86_64/Makefile linux-2.6.7-mod/arch/x86_64/Makefile
31.640 ---- linux-2.6.7/arch/x86_64/Makefile Mon May 10 04:33:19 2004
31.641 -+++ linux-2.6.7-mod/arch/x86_64/Makefile Sat Jun 19 12:58:10 2004
31.642 -@@ -93,10 +93,10 @@
31.643 -
31.644 - prepare: include/asm-$(ARCH)/offset.h
31.645 -
31.646 --arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
31.647 -+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
31.648 - include/config/MARKER
31.649 -
31.650 --include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s
31.651 -+include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.asm
31.652 - $(call filechk,gen-asm-offsets)
31.653 -
31.654 - CLEAN_FILES += include/asm-$(ARCH)/offset.h
31.655 -diff -ur linux-2.6.7/arch/x86_64/kernel/Makefile linux-2.6.7-mod/arch/x86_64/kernel/Makefile
31.656 ---- linux-2.6.7/arch/x86_64/kernel/Makefile Fri Jun 18 22:51:32 2004
31.657 -+++ linux-2.6.7-mod/arch/x86_64/kernel/Makefile Sat Jun 19 12:58:17 2004
31.658 -@@ -2,7 +2,7 @@
31.659 - # Makefile for the linux kernel.
31.660 - #
31.661 -
31.662 --extra-y := head.o head64.o init_task.o vmlinux.lds.s
31.663 -+extra-y := head.o head64.o init_task.o vmlinux.lds.asm
31.664 - EXTRA_AFLAGS := -traditional
31.665 - obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
31.666 - ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \
31.667 -diff -ur linux-2.6.7/scripts/Makefile.build linux-2.6.7-mod/scripts/Makefile.build
31.668 ---- linux-2.6.7/scripts/Makefile.build Mon May 10 04:33:13 2004
31.669 -+++ linux-2.6.7-mod/scripts/Makefile.build Sat Jun 19 12:43:10 2004
31.670 -@@ -110,7 +110,7 @@
31.671 - quiet_cmd_cc_s_c = CC $(quiet_modtag) $@
31.672 - cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
31.673 -
31.674 --%.s: %.c FORCE
31.675 -+%.asm: %.c FORCE
31.676 - $(call if_changed_dep,cc_s_c)
31.677 -
31.678 - quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
31.679 -@@ -197,7 +197,7 @@
31.680 - quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
31.681 - cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
31.682 -
31.683 --%.s: %.S FORCE
31.684 -+%.asm: %.S FORCE
31.685 - $(call if_changed_dep,as_s_S)
31.686 -
31.687 - quiet_cmd_as_o_S = AS $(quiet_modtag) $@
31.688 ---- linux-2.6.8/arch/sparc/boot/Makefile.old 2004-09-21 21:46:18.000000000 -0700
31.689 -+++ linux-2.6.8/arch/sparc/boot/Makefile 2004-09-21 21:52:35.000000000 -0700
31.690 -@@ -19,7 +19,7 @@
31.691 -
31.692 - BTOBJS := $(HEAD_Y) $(INIT_Y)
31.693 - BTLIBS := $(CORE_Y) $(LIBS_Y) $(DRIVERS_Y) $(NET_Y)
31.694 --LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.s $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
31.695 -+LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.asm $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
31.696 -
31.697 - # Actual linking
31.698 - $(obj)/image: $(obj)/btfix.o FORCE
31.699 ---- linux-2.6.8/arch/sh64/Makefile.old 2004-09-21 21:46:18.000000000 -0700
31.700 -+++ linux-2.6.8/arch/sh64/Makefile 2004-09-21 21:54:31.000000000 -0700
31.701 -@@ -71,7 +71,7 @@
31.702 -
31.703 - prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
31.704 -
31.705 --include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
31.706 -+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
31.707 - include/asm include/linux/version.h
31.708 - $(call filechk,gen-asm-offsets)
31.709 -
31.710 ---- linux-2.6.8/arch/sh64/boot/compressed/Makefile.old 2004-09-21 21:46:18.000000000 -0700
31.711 -+++ linux-2.6.8/arch/sh64/boot/compressed/Makefile 2004-09-21 21:54:41.000000000 -0700
31.712 -@@ -25,7 +25,7 @@
31.713 - ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[$(CONFIG_MEMORY_START)+0x400000+0x10000])
31.714 -
31.715 - LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \
31.716 -- -T $(obj)/../../kernel/vmlinux.lds.s \
31.717 -+ -T $(obj)/../../kernel/vmlinux.lds.asm \
31.718 - --no-warn-mismatch
31.719 -
31.720 - $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
31.721 -@@ -41,6 +41,6 @@
31.722 - LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T
31.723 - OBJCOPYFLAGS += -R .empty_zero_page
31.724 -
31.725 --$(obj)/piggy.o: $(obj)/vmlinux.lds.s $(obj)/vmlinux.bin.gz FORCE
31.726 -+$(obj)/piggy.o: $(obj)/vmlinux.lds.asm $(obj)/vmlinux.bin.gz FORCE
31.727 - $(call if_changed,ld)
31.728 -
32.1 --- a/patches/linux/2.6.8/140-linux-2.6.8-m68k-kludge.patch Fri Sep 05 16:15:34 2008 +0000
32.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
32.3 @@ -1,285 +0,0 @@
32.4 -[ This patch not accepted into kernel for now - it touches the core too much -
32.5 - but it's ok for crosstool since we just want to check whether toolchain is ok,
32.6 - I think. I had to rediff the sched.h changes with -U5 to get them to
32.7 - apply properly -- patch got confused with just three lines of context?! -dank ]
32.8 -
32.9 -Date: Sun, 5 Sep 2004 12:41:08 +0200 (CEST)
32.10 -From: Geert Uytterhoeven <geert@linux-m68k.org>
32.11 -Sender: geert@linux-m68k.org
32.12 -To: Dan Kegel <dank@kegel.com>
32.13 -cc: Roman Zippel <zippel@linux-m68k.org>,
32.14 - Matthias Urlichs <smurf@smurf.noris.de>,
32.15 - Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
32.16 - Linux/m68k <linux-m68k@lists.linux-m68k.org>
32.17 -Subject: Re: Getting kernel.org kernel to build for m68k?
32.18 -In-Reply-To: <Pine.GSO.4.58.0409011029390.15681@waterleaf.sonytel.be>
32.19 -Message-ID: <Pine.LNX.4.58.0409051224020.30282@anakin>
32.20 -
32.21 -On Wed, 1 Sep 2004, Geert Uytterhoeven wrote:
32.22 -> On Tue, 31 Aug 2004, Dan Kegel wrote:
32.23 -> > I noticed today that Linus's m68k kernel can't be built (at least with gcc-3.4.1).
32.24 -> >
32.25 -> > The first problem I ran into,
32.26 -> > CC arch/m68k/kernel/asm-offsets.s
32.27 -> > In file included from include/linux/spinlock.h:12,
32.28 -> > from include/linux/capability.h:45,
32.29 -> > from include/linux/sched.h:7,
32.30 -> > from arch/m68k/kernel/asm-offsets.c:12:
32.31 -> > include/linux/thread_info.h:30: error: parse error before '{' token
32.32 -> > is solved already in the m68k tree.
32.33 -> > (In particular,
32.34 -> > the #ifndef __HAVE_THREAD_FUNCTIONS ... #endif in
32.35 -> > http://linux-m68k-cvs.apia.dhs.org/c/cvsweb/linux/include/linux/thread_info.h?rev=1.5;content-type=text%2Fplain
32.36 -> > probably solves it.)
32.37 -> > There are other problems after that.
32.38 ->
32.39 -> Roman Zippel changed the threading stuff on m68k. Since it would affect other
32.40 -> architectures, I never submitted it on my own.
32.41 ->
32.42 -> In short, we never really compile this code, since the m68k tree doesn't use it
32.43 -> anymore. And yes, it even fails with older compiler versions, like 2.95.2.
32.44 -
32.45 -The second part doesn't seem to be true: the code is used. And it does compile
32.46 -after applying the fixes below, even with gcc 3.4.1.
32.47 -
32.48 -> > Any chance you could spend a bit of time sending Linus enough
32.49 -> > patches for his kernel to build for m68k, if not run?
32.50 ->
32.51 -> I'll make sure a plain kernel.org kernel can build an m68k kernel.
32.52 -
32.53 -The patch below makes the plain kernel.org 2.6.8.1 compile for m68k,
32.54 -using gcc 2.95.2 or 3.3.3 (3.4.1 needs a few more changes in random
32.55 -places). The resulting kernel (I booted the gcc 2.95.2 case) works fine on my
32.56 -Amiga.
32.57 -
32.58 -It's more or less the patch created by Matthias Urlichs last year, so
32.59 -the credits are his:
32.60 -
32.61 -| This change implements a reasonable compromise between the task_info->flags
32.62 -| variable in other ports, which is too much work in the syscall path on m68k,
32.63 -| and moving the whole structure to thread_struct, which is way too intrusive
32.64 -| on other ports.
32.65 -
32.66 -The patch does affect generic code a bit, but the collateral damage is
32.67 -kept to a minimum.
32.68 -
32.69 -We can still keep Roman's thread info abstractions[*] in Linux/m68k CVS, but
32.70 -I'd really like the plain kernel.org kernel to be in a working state as well.
32.71 -That way more people may do cross-compile tests for m68k.
32.72 -
32.73 -Hence if no one objects, I'll submit the patch to Andrew and Linus.
32.74 -
32.75 -All comments are welcome!
32.76 -
32.77 ---- linux-2.6.8.1/arch/m68k/kernel/asm-offsets.c 2004-04-28 15:48:59.000000000 +0200
32.78 -+++ linux-m68k-2.6.8.1/arch/m68k/kernel/asm-offsets.c 2004-09-05 12:04:00.000000000 +0200
32.79 -@@ -31,6 +31,7 @@ int main(void)
32.80 - DEFINE(TASK_SIGPENDING, offsetof(struct task_struct, thread.work.sigpending));
32.81 - DEFINE(TASK_NOTIFY_RESUME, offsetof(struct task_struct, thread.work.notify_resume));
32.82 - DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
32.83 -+ DEFINE(TASK_TINFO, offsetof(struct task_struct, thread_info));
32.84 - DEFINE(TASK_MM, offsetof(struct task_struct, mm));
32.85 - DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
32.86 -
32.87 -@@ -45,6 +46,9 @@ int main(void)
32.88 - DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
32.89 - DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
32.90 -
32.91 -+ /* offsets into the thread_info struct */
32.92 -+ DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count));
32.93 -+
32.94 - /* offsets into the pt_regs */
32.95 - DEFINE(PT_D0, offsetof(struct pt_regs, d0));
32.96 - DEFINE(PT_ORIG_D0, offsetof(struct pt_regs, orig_d0));
32.97 ---- linux-2.6.8.1/arch/m68k/kernel/entry.S 2004-05-24 11:13:22.000000000 +0200
32.98 -+++ linux-m68k-2.6.8.1/arch/m68k/kernel/entry.S 2004-09-02 20:13:12.000000000 +0200
32.99 -@@ -134,13 +134,13 @@ ENTRY(system_call)
32.100 -
32.101 - syscall_exit_work:
32.102 - btst #5,%sp@(PT_SR) | check if returning to kernel
32.103 -- bnes 1b | if so, skip resched, signals
32.104 -+ bnes 1b | if so, skip everything
32.105 - tstw %d0
32.106 -- jeq do_signal_return
32.107 -+ jeq do_signal_return | jump if only sig_pending or notify_resume
32.108 - tstb %d0
32.109 -- jne do_delayed_trace
32.110 -+ jne do_delayed_trace | jump if delayed_trace
32.111 -
32.112 -- pea resume_userspace
32.113 -+ pea resume_userspace | need_resched is set
32.114 - jmp schedule
32.115 -
32.116 - ret_from_exception:
32.117 -@@ -223,10 +223,14 @@ ENTRY(nmi_handler)
32.118 - */
32.119 - inthandler:
32.120 - SAVE_ALL_INT
32.121 -- GET_CURRENT(%d0)
32.122 -- addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+2)
32.123 -- | put exception # in d0
32.124 -- bfextu %sp@(PT_VECTOR){#4,#10},%d0
32.125 -+ /* GET_CURRENT(%d0) */
32.126 -+ movel %sp,%d0
32.127 -+ andw #-THREAD_SIZE,%d0
32.128 -+ movel %d0,%a1
32.129 -+ addqb #1,%a1@(TINFO_PREEMPT+2)
32.130 -+ movel %a1@,%curptr
32.131 -+
32.132 -+ bfextu %sp@(PT_VECTOR){#4,#10},%d0 | put exception # in d0
32.133 -
32.134 - movel %sp,%sp@-
32.135 - movel %d0,%sp@- | put vector # on stack
32.136 -@@ -243,7 +247,8 @@ inthandler:
32.137 - 3: addql #8,%sp | pop parameters off stack
32.138 -
32.139 - ret_from_interrupt:
32.140 -- subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+2)
32.141 -+ movel %curptr@(TASK_TINFO),%a1
32.142 -+ subqb #1,%a1@(TINFO_PREEMPT+2)
32.143 - jeq 1f
32.144 - 2:
32.145 - RESTORE_ALL
32.146 ---- linux-2.6.8.1/include/asm-m68k/processor.h 2004-04-28 15:49:03.000000000 +0200
32.147 -+++ linux-m68k-2.6.8.1/include/asm-m68k/processor.h 2004-09-02 20:29:32.000000000 +0200
32.148 -@@ -84,7 +84,6 @@ struct thread_struct {
32.149 - ksp: sizeof(init_stack) + (unsigned long) init_stack, \
32.150 - sr: PS_S, \
32.151 - fs: __KERNEL_DS, \
32.152 -- info: INIT_THREAD_INFO(init_task) \
32.153 - }
32.154 -
32.155 - /*
32.156 ---- linux-2.6.8.1/include/asm-m68k/thread_info.h 2004-05-24 11:13:53.000000000 +0200
32.157 -+++ linux-m68k-2.6.8.1/include/asm-m68k/thread_info.h 2004-09-05 12:19:47.000000000 +0200
32.158 -@@ -6,7 +6,7 @@
32.159 - #include <asm/page.h>
32.160 -
32.161 - struct thread_info {
32.162 -- struct task_struct *task; /* main task structure */
32.163 -+ struct task_struct *task; /* main task structure, must be first! */
32.164 - struct exec_domain *exec_domain; /* execution domain */
32.165 - __s32 preempt_count; /* 0 => preemptable, <0 => BUG */
32.166 - __u32 cpu; /* should always be 0 on m68k */
32.167 -@@ -21,7 +21,8 @@ struct thread_info {
32.168 - { \
32.169 - .task = &tsk, \
32.170 - .exec_domain = &default_exec_domain, \
32.171 -- .restart_block = { \
32.172 -+ .preempt_count = 1, \
32.173 -+ .restart_block = { \
32.174 - .fn = do_no_restart_syscall, \
32.175 - }, \
32.176 - }
32.177 -@@ -35,10 +36,11 @@ struct thread_info {
32.178 - #define free_thread_info(ti) free_pages((unsigned long)(ti),1)
32.179 - #endif /* PAGE_SHIFT == 13 */
32.180 -
32.181 --//#define init_thread_info (init_task.thread.info)
32.182 -+#define init_thread_info (init_thread_union.thread_info)
32.183 - #define init_stack (init_thread_union.stack)
32.184 -
32.185 --#define current_thread_info() (current->thread_info)
32.186 -+register __u32 current_thread_info_reg asm("sp");
32.187 -+#define current_thread_info() ((struct thread_info *)(current_thread_info_reg & ~0x1fff))
32.188 -
32.189 -
32.190 - #define __HAVE_THREAD_FUNCTIONS
32.191 -@@ -91,8 +93,12 @@ extern int thread_flag_fixme(void);
32.192 - })
32.193 -
32.194 - #define __get_set_tsk_thread_flag(tsk, flag, val) ({ \
32.195 -- int __res = __get_tsk_thread_flag(tsk, flag); \
32.196 -+ int __res; \
32.197 -+ unsigned long __flags; \
32.198 -+ local_irq_save(__flags); \
32.199 -+ __res = __get_tsk_thread_flag(tsk, flag); \
32.200 - __set_tsk_thread_flag(tsk, flag, val); \
32.201 -+ local_irq_restore(__flags); \
32.202 - __res; \
32.203 - })
32.204 -
32.205 -@@ -105,7 +111,4 @@ extern int thread_flag_fixme(void);
32.206 - #define clear_thread_flag(flag) clear_tsk_thread_flag(current, flag)
32.207 - #define test_thread_flag(flag) test_tsk_thread_flag(current, flag)
32.208 -
32.209 --#define set_need_resched() set_thread_flag(TIF_NEED_RESCHED)
32.210 --#define clear_need_resched() clear_thread_flag(TIF_NEED_RESCHED)
32.211 --
32.212 - #endif /* _ASM_M68K_THREAD_INFO_H */
32.213 ---- linux-2.6.8/include/linux/sched.h.old 2004-09-13 21:48:58.000000000 -0700
32.214 -+++ linux-2.6.8/include/linux/sched.h 2004-09-13 21:50:26.000000000 -0700
32.215 -@@ -975,10 +975,11 @@
32.216 - task_unlock(task);
32.217 -
32.218 - return mm;
32.219 - }
32.220 -
32.221 -+#ifndef __HAVE_THREAD_FUNCTIONS
32.222 -
32.223 - /* set thread flags in other task's structures
32.224 - * - see asm/thread_info.h for TIF_xxxx flags available
32.225 - */
32.226 - static inline void set_tsk_thread_flag(struct task_struct *tsk, int flag)
32.227 -@@ -1004,10 +1005,12 @@
32.228 - static inline int test_tsk_thread_flag(struct task_struct *tsk, int flag)
32.229 - {
32.230 - return test_ti_thread_flag(tsk->thread_info,flag);
32.231 - }
32.232 -
32.233 -+#endif /* __HAVE_THREAD_FUNCTIONS */
32.234 -+
32.235 - static inline void set_tsk_need_resched(struct task_struct *tsk)
32.236 - {
32.237 - set_tsk_thread_flag(tsk,TIF_NEED_RESCHED);
32.238 - }
32.239 -
32.240 ---- linux-2.6.8.1/include/linux/thread_info.h 2004-04-27 20:42:22.000000000 +0200
32.241 -+++ linux-m68k-2.6.8.1/include/linux/thread_info.h 2004-09-04 21:24:36.000000000 +0200
32.242 -@@ -21,6 +21,7 @@ extern long do_no_restart_syscall(struct
32.243 - #include <asm/thread_info.h>
32.244 -
32.245 - #ifdef __KERNEL__
32.246 -+#ifndef __HAVE_THREAD_FUNCTIONS
32.247 -
32.248 - /*
32.249 - * flag set/clear/test wrappers
32.250 -@@ -77,16 +78,11 @@ static inline int test_ti_thread_flag(st
32.251 - return test_bit(flag,&ti->flags);
32.252 - }
32.253 -
32.254 --static inline void set_need_resched(void)
32.255 --{
32.256 -- set_thread_flag(TIF_NEED_RESCHED);
32.257 --}
32.258 -+#endif /* __HAVE_THREAD_FUNCTIONS */
32.259 -
32.260 --static inline void clear_need_resched(void)
32.261 --{
32.262 -- clear_thread_flag(TIF_NEED_RESCHED);
32.263 --}
32.264 -+#define set_need_resched() set_thread_flag(TIF_NEED_RESCHED)
32.265 -+#define clear_need_resched(void) clear_thread_flag(TIF_NEED_RESCHED)
32.266 -
32.267 --#endif
32.268 -+#endif /* __KERNEL__ */
32.269 -
32.270 - #endif /* _LINUX_THREAD_INFO_H */
32.271 -
32.272 -Gr{oetje,eeting}s,
32.273 -
32.274 - Geert
32.275 -
32.276 -[*] For reference:
32.277 -
32.278 - http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-2.6.x-merging/POSTPONED/156-thread_info.diff
32.279 -
32.280 ---
32.281 -Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
32.282 -
32.283 -In personal conversations with technical people, I call myself a hacker. But
32.284 -when I'm talking to journalists I just say "programmer" or something like that.
32.285 - -- Linus Torvalds
32.286 -
32.287 -
32.288 -
33.1 --- a/patches/linux/2.6.8/150-linux-2.6.8-noshared-kconfig.patch Fri Sep 05 16:15:34 2008 +0000
33.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
33.3 @@ -1,28 +0,0 @@
33.4 -Lets you run 'make oldconfig' and 'make menuconfig' on systems
33.5 -where shared libraries aren't easy. (There's no harm in using the
33.6 -static version of libkconfig.)
33.7 -Idea mentioned by Bertrand Marquis, but this patch is a bit simpler than his.
33.8 -
33.9 -
33.10 ---- linux-2.6.8.1/scripts/kconfig/Makefile.old 2004-09-09 20:30:25.000000000 -0700
33.11 -+++ linux-2.6.8.1/scripts/kconfig/Makefile 2004-09-09 20:47:51.000000000 -0700
33.12 -@@ -68,8 +68,8 @@
33.13 - libkconfig-objs := zconf.tab.o
33.14 -
33.15 - host-progs := conf mconf qconf gconf
33.16 --conf-objs := conf.o libkconfig.so
33.17 --mconf-objs := mconf.o libkconfig.so
33.18 -+conf-objs := conf.o $(libkconfig-objs)
33.19 -+mconf-objs := mconf.o $(libkconfig-objs)
33.20 -
33.21 - ifeq ($(MAKECMDGOALS),xconfig)
33.22 - qconf-target := 1
33.23 -@@ -88,7 +88,7 @@
33.24 - gconf-objs := gconf.o kconfig_load.o
33.25 - endif
33.26 -
33.27 --clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \
33.28 -+clean-files := $(libkconfig-objs) lkc_defs.h qconf.moc .tmp_qtcheck \
33.29 - .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c
33.30 -
33.31 - # generated files seem to need this to find local include files
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34.2 +++ b/scripts/build/kernel/linux.sh Wed Sep 10 21:40:23 2008 +0000
34.3 @@ -0,0 +1,84 @@
34.4 +# This file declares functions to install the kernel headers for linux
34.5 +# Copyright 2007 Yann E. MORIN
34.6 +# Licensed under the GPL v2. See COPYING in the root of this package
34.7 +
34.8 +do_print_filename() {
34.9 + [ "${CT_KERNEL}" = "linux" ] || return 0
34.10 + echo "linux-${CT_KERNEL_VERSION}"
34.11 +}
34.12 +
34.13 +# Download the kernel
34.14 +do_kernel_get() {
34.15 + if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
34.16 + CT_GetFile "${CT_KERNEL_FILE}" {ftp,http}://ftp.kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
34.17 + fi
34.18 + return 0
34.19 +}
34.20 +
34.21 +# Extract kernel
34.22 +do_kernel_extract() {
34.23 + if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
34.24 + CT_ExtractAndPatch "${CT_KERNEL_FILE}"
34.25 + fi
34.26 + return 0
34.27 +}
34.28 +
34.29 +# Wrapper to the actual headers install method
34.30 +do_kernel_headers() {
34.31 + CT_DoStep INFO "Installing kernel headers"
34.32 +
34.33 + if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" = "y" ]; then
34.34 + do_kernel_preinstalled
34.35 + else
34.36 + do_kernel_install
34.37 + fi
34.38 +
34.39 + CT_EndStep
34.40 +}
34.41 +
34.42 +# Install kernel headers using headers_install from kernel sources.
34.43 +do_kernel_install() {
34.44 + CT_DoLog DEBUG "Using kernel's headers_install"
34.45 +
34.46 + mkdir -p "${CT_BUILD_DIR}/build-kernel-headers"
34.47 + cd "${CT_BUILD_DIR}/build-kernel-headers"
34.48 +
34.49 + # Only starting with 2.6.18 does headers_install is usable. We only
34.50 + # have 2.6 version available, so only test for sublevel.
34.51 + k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/${CT_KERNEL_FILE}/Makefile")
34.52 + [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
34.53 +
34.54 + V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
34.55 +
34.56 + CT_DoLog EXTRA "Installing kernel headers"
34.57 + CT_DoExecLog ALL \
34.58 + make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
34.59 + O=$(pwd) \
34.60 + ARCH=${CT_KERNEL_ARCH} \
34.61 + INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
34.62 + ${V_OPT} \
34.63 + headers_install
34.64 +
34.65 + if [ "${CT_KERNEL_LINUX_HEADERS_INSTALL_CHECK}" = "y" ]; then
34.66 + CT_DoLog EXTRA "Checking installed headers"
34.67 + CT_DoExecLog ALL \
34.68 + make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
34.69 + O=$(pwd) \
34.70 + ARCH=${CT_KERNEL_ARCH} \
34.71 + INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
34.72 + ${V_OPT} \
34.73 + headers_check
34.74 + find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \;
34.75 + fi
34.76 +}
34.77 +
34.78 +# Use preinstalled headers (most probably by using make headers_install in a
34.79 +# modified (read: customised) kernel tree, or using pre-2.6.18 headers, such
34.80 +# as 2.4). In this case, simply copy the headers in place
34.81 +do_kernel_preinstalled() {
34.82 + CT_DoLog EXTRA "Copying preinstalled kernel headers"
34.83 +
34.84 + mkdir -p "${CT_SYSROOT_DIR}/usr"
34.85 + cd "${CT_KERNEL_LINUX_HEADERS_CUSTOM_DIR}"
34.86 + cp -rv include "${CT_SYSROOT_DIR}/usr" 2>&1 |CT_DoLog ALL
34.87 +}
35.1 --- a/scripts/build/kernel_linux-libc-headers.sh Fri Sep 05 16:15:34 2008 +0000
35.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
35.3 @@ -1,1 +0,0 @@
35.4 -kernel_linux.sh
35.5 \ No newline at end of file
36.1 --- a/scripts/build/kernel_linux.sh Fri Sep 05 16:15:34 2008 +0000
36.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
36.3 @@ -1,208 +0,0 @@
36.4 -# This file declares functions to install the kernel headers for linux
36.5 -# Copyright 2007 Yann E. MORIN
36.6 -# Licensed under the GPL v2. See COPYING in the root of this package
36.7 -
36.8 -do_print_filename() {
36.9 - [ "${CT_KERNEL}" = "linux" ] || return 0
36.10 - case "${CT_KERNEL_LINUX_HEADERS_SANITISED}" in
36.11 - y) echo "linux-libc-headers-${CT_KERNEL_VERSION}";;
36.12 - *) echo "linux-${CT_KERNEL_VERSION}";;
36.13 - esac
36.14 -}
36.15 -
36.16 -# Download the kernel
36.17 -do_kernel_get() {
36.18 - if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
36.19 - CT_GetFile "${CT_KERNEL_FILE}" \
36.20 - {ftp,http}://ftp.kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2} \
36.21 - http://ep09.pld-linux.org/~mmazur/linux-libc-headers
36.22 - fi
36.23 - return 0
36.24 -}
36.25 -
36.26 -# Extract kernel
36.27 -do_kernel_extract() {
36.28 - if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
36.29 - CT_ExtractAndPatch "${CT_KERNEL_FILE}"
36.30 - fi
36.31 - return 0
36.32 -}
36.33 -
36.34 -# Check kernel configuration
36.35 -do_kernel_check_config() {
36.36 - # Only the copied or sanitised headers need a config file.
36.37 - # Pre-existing headers as well as headers_install don't.
36.38 - if [ "${CT_KERNEL_LINUX_NEEDS_CONFIG}" = "y" \
36.39 - -a \( -z "${CT_KERNEL_LINUX_CONFIG_FILE}" \
36.40 - -o ! -r "${CT_KERNEL_LINUX_CONFIG_FILE}" \
36.41 - \) \
36.42 - ]; then
36.43 - CT_DoLog WARN "You did not provide a kernel configuration file!"
36.44 - CT_DoLog WARN "I will try to generate one for you, but beware!"
36.45 -
36.46 - CT_DoStep INFO "Building a default configuration file for linux kernel"
36.47 -
36.48 - mkdir -p "${CT_BUILD_DIR}/build-kernel-defconfig"
36.49 - cd "${CT_BUILD_DIR}/build-kernel-defconfig"
36.50 - make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" O=$(pwd) \
36.51 - ARCH=${CT_KERNEL_ARCH} defconfig 2>&1 |CT_DoLog ALL
36.52 -
36.53 - CT_KERNEL_LINUX_CONFIG_FILE="$(pwd)/.config"
36.54 -
36.55 - CT_EndStep
36.56 - fi
36.57 -}
36.58 -
36.59 -# Wrapper to the actual headers install method
36.60 -do_kernel_headers() {
36.61 - CT_DoStep INFO "Installing kernel headers"
36.62 -
36.63 - # Special case when using pre-installed headers
36.64 - if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" = "y" ]; then
36.65 - do_kernel_preinstalled
36.66 - else
36.67 - # We need to enter this directory to find the kernel version strings
36.68 - cd "${CT_SRC_DIR}/${CT_KERNEL_FILE}"
36.69 - if [ "${CT_KERNEL_LINUX_HEADERS_SANITISED}" != "y" ]; then
36.70 - k_version=$(awk '/^VERSION =/ { print $3 }' Makefile)
36.71 - k_patchlevel=$(awk '/^PATCHLEVEL =/ { print $3 }' Makefile)
36.72 - k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' Makefile)
36.73 - k_extraversion=$(awk '/^EXTRAVERSION =/ { print $3 }' Makefile)
36.74 - else
36.75 - k_version=$(echo "${CT_KERNEL_VERSION}." |cut -d . -f 1)
36.76 - k_patchlevel=$(echo "${CT_KERNEL_VERSION}." |cut -d . -f 2)
36.77 - k_sublevel=$(echo "${CT_KERNEL_VERSION}." |cut -d . -f 3)
36.78 - k_extraversion=$(echo "${CT_KERNEL_VERSION}." |cut -d . -f 4)
36.79 - fi
36.80 -
36.81 - case "${k_version}.${k_patchlevel}" in
36.82 - 2.2|2.4|2.6) ;;
36.83 - *) CT_Abort "Unsupported kernel version 'linux-${k_version}.${k_patchlevel}'.";;
36.84 - esac
36.85 -
36.86 - # Kernel version that support verbosity will use this, others will ignore it:
36.87 - V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
36.88 -
36.89 - if [ "${CT_KERNEL_LINUX_HEADERS_INSTALL}" = "y" ]; then
36.90 - do_kernel_install
36.91 - elif [ "${CT_KERNEL_LINUX_HEADERS_SANITISED}" = "y" ]; then
36.92 - do_kernel_sanitised
36.93 - else [ "${CT_KERNEL_LINUX_HEADERS_COPY}" = "y" ];
36.94 - do_kernel_copy
36.95 - fi
36.96 - fi
36.97 -
36.98 - CT_EndStep
36.99 -}
36.100 -
36.101 -# Install kernel headers using headers_install from kernel sources.
36.102 -do_kernel_install() {
36.103 - CT_DoLog DEBUG "Using kernel's headers_install"
36.104 -
36.105 - mkdir -p "${CT_BUILD_DIR}/build-kernel-headers"
36.106 - cd "${CT_BUILD_DIR}/build-kernel-headers"
36.107 -
36.108 - case "${k_version}.${k_patchlevel}" in
36.109 - 2.6) [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers.";;
36.110 - *) CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers.";;
36.111 - esac
36.112 -
36.113 - CT_DoLog EXTRA "Installing kernel headers"
36.114 - CT_DoExecLog ALL \
36.115 - make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
36.116 - O=$(pwd) \
36.117 - ARCH=${CT_KERNEL_ARCH} \
36.118 - INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
36.119 - ${V_OPT} \
36.120 - headers_install
36.121 -
36.122 - if [ "${CT_KERNEL_LINUX_HEADERS_INSTALL_CHECK}" = "y" ]; then
36.123 - CT_DoLog EXTRA "Checking installed headers"
36.124 - CT_DoExecLog ALL \
36.125 - make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
36.126 - O=$(pwd) \
36.127 - ARCH=${CT_KERNEL_ARCH} \
36.128 - INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
36.129 - ${V_OPT} \
36.130 - headers_check
36.131 - find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \;
36.132 - fi
36.133 -}
36.134 -
36.135 -# Install kernel headers from oldish Mazur's sanitised headers.
36.136 -do_kernel_sanitised() {
36.137 - CT_DoLog EXTRA "Copying sanitised headers"
36.138 - cd "${CT_SRC_DIR}/${CT_KERNEL_FILE}"
36.139 - cp -rv include/linux "${CT_HEADERS_DIR}" 2>&1 |CT_DoLog ALL
36.140 - cp -rv "include/asm-${CT_KERNEL_ARCH}" "${CT_HEADERS_DIR}/asm" 2>&1 |CT_DoLog ALL
36.141 -}
36.142 -
36.143 -# Install kernel headers by plain copy.
36.144 -do_kernel_copy() {
36.145 - CT_DoLog DEBUG "Copying plain kernel headers"
36.146 - CT_DoLog WARN "You are using plain kernel headers. You really shouldn't do that."
36.147 - CT_DoLog WARN "You'd be better off by using installed headers (or sanitised headers)."
36.148 -
36.149 - # 2.2 and 2.4 don't support building out-of-tree. 2.6 does.
36.150 - CT_DoLog EXTRA "Preparing kernel headers"
36.151 - case "${k_version}.${k_patchlevel}" in
36.152 - 2.2|2.4) cd "${CT_SRC_DIR}/${CT_KERNEL_FILE}"
36.153 - cp "${CT_KERNEL_LINUX_CONFIG_FILE}" .config
36.154 - CT_DoYes "" |make ARCH=${CT_KERNEL_ARCH} oldconfig
36.155 - # 2.4 doesn't follow V=# for verbosity... :-(
36.156 - make ARCH=${CT_KERNEL_ARCH} symlinks include/linux/version.h
36.157 - ;;
36.158 - 2.6) mkdir -p "${CT_BUILD_DIR}/build-kernel-headers"
36.159 - cd "${CT_BUILD_DIR}/build-kernel-headers"
36.160 - cp "${CT_KERNEL_LINUX_CONFIG_FILE}" .config
36.161 - CT_DoYes "" |make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
36.162 - O=$(pwd) ${V_OPT} ARCH=${CT_KERNEL_ARCH} \
36.163 - oldconfig
36.164 - case "${CT_KERNEL_ARCH}" in
36.165 - sh*) # sh does secret stuff in 'make prepare' that can't be
36.166 - # triggered separately, but happily, it doesn't use
36.167 - # target gcc, so we can use it.
36.168 - # Update: this fails on 2.6.11, as it installs
36.169 - # elfconfig.h, which requires target compiler :-(
36.170 - make ${PARALLELMFLAGS} \
36.171 - ARCH=${CT_KERNEL_ARCH} ${V_OPT} \
36.172 - prepare include/linux/version.h
36.173 - ;;
36.174 - arm*|cris*) make ${PARALLELMFLAGS} \
36.175 - ARCH=${CT_KERNEL_ARCH} ${V_OPT} \
36.176 - include/asm include/linux/version.h \
36.177 - include/asm-${CT_KERNEL_ARCH}/.arch
36.178 - ;;
36.179 - mips*) # for linux-2.6, 'make prepare' for mips doesn't
36.180 - # actually create any symlinks. Hope generic is ok.
36.181 - # Note that glibc ignores all -I flags passed in CFLAGS,
36.182 - # so you have to use -isystem.
36.183 - make ${PARALLELMFLAGS} \
36.184 - ARCH=${CT_KERNEL_ARCH} ${V_OPT} \
36.185 - include/asm include/linux/version.h
36.186 - TARGET_CFLAGS="${TARGET_CFLAGS} -isystem ${LINUX_HEADER_DIR}/include/asm-mips/mach-generic"
36.187 - ;;
36.188 - *) make ${PARALLELMFLAGS} \
36.189 - ARCH=${CT_KERNEL_ARCH} ${V_OPT} \
36.190 - include/asm include/linux/version.h
36.191 - ;;
36.192 - esac
36.193 - ;;
36.194 - esac 2>&1 |CT_DoLog ALL
36.195 -
36.196 - CT_DoLog EXTRA "Copying kernel headers"
36.197 - cp -rv include/asm-generic "${CT_HEADERS_DIR}/asm-generic" 2>&1 |CT_DoLog ALL
36.198 - cp -rv include/linux "${CT_HEADERS_DIR}" 2>&1 |CT_DoLog ALL
36.199 - cp -rv include/asm-${CT_KERNEL_ARCH} "${CT_HEADERS_DIR}/asm" 2>&1 |CT_DoLog ALL
36.200 -}
36.201 -
36.202 -# Use preinstalled headers (most probably by using make headers_install in a
36.203 -# modified (read: customised) kernel tree). In this case, simply copy
36.204 -# the headers in place
36.205 -do_kernel_preinstalled() {
36.206 - CT_DoLog EXTRA "Copying preinstalled kernel headers"
36.207 -
36.208 - mkdir -p "${CT_SYSROOT_DIR}/usr"
36.209 - cd "${CT_KERNEL_LINUX_HEADERS_CUSTOM_DIR}"
36.210 - cp -rv include "${CT_SYSROOT_DIR}/usr" 2>&1 |CT_DoLog ALL
36.211 -}
37.1 --- a/scripts/crosstool.sh Fri Sep 05 16:15:34 2008 +0000
37.2 +++ b/scripts/crosstool.sh Wed Sep 10 21:40:23 2008 +0000
37.3 @@ -352,7 +352,7 @@
37.4
37.5 # Include sub-scripts instead of calling them: that way, we do not have to
37.6 # export any variable, nor re-parse the configuration and functions files.
37.7 -. "${CT_LIB_DIR}/scripts/build/kernel_${CT_KERNEL}.sh"
37.8 +. "${CT_LIB_DIR}/scripts/build/kernel/${CT_KERNEL}.sh"
37.9 . "${CT_LIB_DIR}/scripts/build/gmp.sh"
37.10 . "${CT_LIB_DIR}/scripts/build/mpfr.sh"
37.11 . "${CT_LIB_DIR}/scripts/build/binutils.sh"
38.1 --- a/steps.mk Fri Sep 05 16:15:34 2008 +0000
38.2 +++ b/steps.mk Wed Sep 10 21:40:23 2008 +0000
38.3 @@ -2,7 +2,6 @@
38.4 # Copyright 2006 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
38.5
38.6 CT_STEPS := libc_check_config \
38.7 - kernel_check_config \
38.8 kernel_headers \
38.9 gmp \
38.10 mpfr \