1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/linux/2.6.8/linux-2.6.8-build_on_case_insensitive_fs.patch Sat Feb 24 11:00:05 2007 +0000
1.3 @@ -0,0 +1,725 @@
1.4 +Submitted By: Martin Schaffner <schaffner@gmx.li>
1.5 +Date: 2004-06-19
1.6 +Initial Package Version: 2.6.7
1.7 +Upstream Status: Not submitted
1.8 +Origin: Martin Schaffner
1.9 +Description: Enables build on case-insensitive file systems
1.10 +URL: xxxhttp://mirror.vtx.ch/lfs/patches/downloads/linux/linux-2.6.7-build_on_case_insensitive_fs-1.patch
1.11 +--- Rediffed against 2.6.8 by dank@kegel.com
1.12 +--- plus a few missing hunks added to fix sparc32 build
1.13 +
1.14 +--- linux-2.6.8/Makefile.orig 2004-08-13 22:37:25.000000000 -0700
1.15 ++++ linux-2.6.8/Makefile 2004-09-01 21:39:39.000000000 -0700
1.16 +@@ -540,7 +540,7 @@
1.17 +
1.18 + do_system_map = $(NM) $(1) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > $(2)
1.19 +
1.20 +-LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.s
1.21 ++LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.asm
1.22 +
1.23 + # Generate section listing all symbols and add it into vmlinux
1.24 + # It's a three stage process:
1.25 +@@ -584,13 +584,13 @@
1.26 + .tmp_kallsyms%.S: .tmp_vmlinux%
1.27 + $(call cmd,kallsyms)
1.28 +
1.29 +-.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
1.30 ++.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
1.31 + $(call if_changed_rule,vmlinux__)
1.32 +
1.33 +-.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
1.34 ++.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
1.35 + $(call if_changed_rule,vmlinux__)
1.36 +
1.37 +-.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
1.38 ++.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
1.39 + $(call if_changed_rule,vmlinux__)
1.40 +
1.41 + endif
1.42 +@@ -603,13 +603,13 @@
1.43 + $(rule_verify_kallsyms)
1.44 + endef
1.45 +
1.46 +-vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
1.47 ++vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
1.48 + $(call if_changed_rule,vmlinux)
1.49 +
1.50 + # The actual objects are generated when descending,
1.51 + # make sure no implicit rule kicks in
1.52 +
1.53 +-$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.s: $(vmlinux-dirs) ;
1.54 ++$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.asm: $(vmlinux-dirs) ;
1.55 +
1.56 + # Handle descending into subdirectories listed in $(vmlinux-dirs)
1.57 + # Preset locale variables to speed up the build process. Limit locale
1.58 +@@ -672,7 +672,7 @@
1.59 + # Single targets
1.60 + # ---------------------------------------------------------------------------
1.61 +
1.62 +-%.s: %.c scripts FORCE
1.63 ++%.asm: %.c scripts FORCE
1.64 + $(Q)$(MAKE) $(build)=$(@D) $@
1.65 + %.i: %.c scripts FORCE
1.66 + $(Q)$(MAKE) $(build)=$(@D) $@
1.67 +@@ -682,7 +682,7 @@
1.68 + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D)
1.69 + %.lst: %.c scripts FORCE
1.70 + $(Q)$(MAKE) $(build)=$(@D) $@
1.71 +-%.s: %.S scripts FORCE
1.72 ++%.asm: %.S scripts FORCE
1.73 + $(Q)$(MAKE) $(build)=$(@D) $@
1.74 + %.o: %.S scripts FORCE
1.75 + $(Q)$(MAKE) $(build)=$(@D) $@
1.76 +diff -ur linux-2.6.7/arch/alpha/Makefile linux-2.6.7-mod/arch/alpha/Makefile
1.77 +--- linux-2.6.7/arch/alpha/Makefile Fri Jun 18 22:51:03 2004
1.78 ++++ linux-2.6.7-mod/arch/alpha/Makefile Sat Jun 19 12:46:32 2004
1.79 +@@ -114,10 +114,10 @@
1.80 +
1.81 + prepare: include/asm-$(ARCH)/asm_offsets.h
1.82 +
1.83 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.84 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.85 + include/config/MARKER
1.86 +
1.87 +-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
1.88 ++include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.89 + $(call filechk,gen-asm-offsets)
1.90 +
1.91 + archclean:
1.92 +diff -ur linux-2.6.7/arch/alpha/kernel/Makefile linux-2.6.7-mod/arch/alpha/kernel/Makefile
1.93 +--- linux-2.6.7/arch/alpha/kernel/Makefile Mon May 10 04:32:29 2004
1.94 ++++ linux-2.6.7-mod/arch/alpha/kernel/Makefile Sat Jun 19 12:46:48 2004
1.95 +@@ -2,7 +2,7 @@
1.96 + # Makefile for the linux kernel.
1.97 + #
1.98 +
1.99 +-extra-y := head.o vmlinux.lds.s
1.100 ++extra-y := head.o vmlinux.lds.asm
1.101 + EXTRA_AFLAGS := $(CFLAGS)
1.102 + EXTRA_CFLAGS := -Werror -Wno-sign-compare
1.103 +
1.104 +--- linux-2.6.8/arch/arm/Makefile.orig 2004-08-13 22:36:56.000000000 -0700
1.105 ++++ linux-2.6.8/arch/arm/Makefile 2004-09-01 21:40:21.000000000 -0700
1.106 +@@ -176,10 +176,10 @@
1.107 + bp:; $(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage
1.108 + i zi:; $(Q)$(MAKE) $(build)=$(boot) $@
1.109 +
1.110 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.111 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.112 + include/asm-arm/.arch
1.113 +
1.114 +-include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s
1.115 ++include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.116 + $(call filechk,gen-asm-offsets)
1.117 +
1.118 + define archhelp
1.119 +diff -ur linux-2.6.7/arch/arm/kernel/Makefile linux-2.6.7-mod/arch/arm/kernel/Makefile
1.120 +--- linux-2.6.7/arch/arm/kernel/Makefile Mon May 10 04:33:19 2004
1.121 ++++ linux-2.6.7-mod/arch/arm/kernel/Makefile Sat Jun 19 12:47:25 2004
1.122 +@@ -27,7 +27,7 @@
1.123 + head-y := head.o
1.124 + obj-$(CONFIG_DEBUG_LL) += debug.o
1.125 +
1.126 +-extra-y := $(head-y) init_task.o vmlinux.lds.s
1.127 ++extra-y := $(head-y) init_task.o vmlinux.lds.asm
1.128 +
1.129 + # Spell out some dependencies that aren't automatically figured out
1.130 + $(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h
1.131 +diff -ur linux-2.6.7/arch/arm26/Makefile linux-2.6.7-mod/arch/arm26/Makefile
1.132 +--- linux-2.6.7/arch/arm26/Makefile Mon May 10 04:32:28 2004
1.133 ++++ linux-2.6.7-mod/arch/arm26/Makefile Sat Jun 19 12:48:24 2004
1.134 +@@ -101,10 +101,10 @@
1.135 + fi; \
1.136 + )
1.137 +
1.138 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.139 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.140 + include/config/MARKER
1.141 +
1.142 +-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
1.143 ++include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.144 + $(call filechk,gen-asm-offsets)
1.145 +
1.146 + define archhelp
1.147 +diff -ur linux-2.6.7/arch/arm26/kernel/Makefile linux-2.6.7-mod/arch/arm26/kernel/Makefile
1.148 +--- linux-2.6.7/arch/arm26/kernel/Makefile Mon May 10 04:32:29 2004
1.149 ++++ linux-2.6.7-mod/arch/arm26/kernel/Makefile Sat Jun 19 12:48:30 2004
1.150 +@@ -14,5 +14,5 @@
1.151 + obj-$(CONFIG_FIQ) += fiq.o
1.152 + obj-$(CONFIG_MODULES) += armksyms.o
1.153 +
1.154 +-extra-y := init_task.o vmlinux.lds.s
1.155 ++extra-y := init_task.o vmlinux.lds.asm
1.156 +
1.157 +diff -ur linux-2.6.7/arch/cris/Makefile linux-2.6.7-mod/arch/cris/Makefile
1.158 +--- linux-2.6.7/arch/cris/Makefile Fri Jun 18 22:51:07 2004
1.159 ++++ linux-2.6.7-mod/arch/cris/Makefile Sat Jun 19 12:48:47 2004
1.160 +@@ -107,8 +107,8 @@
1.161 + @ln -sf $(SARCH) include/asm-$(ARCH)/arch
1.162 + @touch $@
1.163 +
1.164 +-arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.165 ++arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.166 + include/config/MARKER
1.167 +
1.168 +-include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
1.169 ++include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm
1.170 + $(call filechk,gen-asm-offsets)
1.171 +diff -ur linux-2.6.7/arch/cris/kernel/Makefile linux-2.6.7-mod/arch/cris/kernel/Makefile
1.172 +--- linux-2.6.7/arch/cris/kernel/Makefile Fri Jun 18 22:51:09 2004
1.173 ++++ linux-2.6.7-mod/arch/cris/kernel/Makefile Sat Jun 19 12:48:53 2004
1.174 +@@ -3,7 +3,7 @@
1.175 + # Makefile for the linux kernel.
1.176 + #
1.177 +
1.178 +-extra-y := vmlinux.lds.s
1.179 ++extra-y := vmlinux.lds.asm
1.180 +
1.181 + obj-y := process.o traps.o irq.o ptrace.o setup.o \
1.182 + time.o sys_cris.o semaphore.o
1.183 +diff -ur linux-2.6.7/arch/h8300/Makefile linux-2.6.7-mod/arch/h8300/Makefile
1.184 +--- linux-2.6.7/arch/h8300/Makefile Fri Jun 18 22:51:09 2004
1.185 ++++ linux-2.6.7-mod/arch/h8300/Makefile Sat Jun 19 12:49:12 2004
1.186 +@@ -64,7 +64,7 @@
1.187 +
1.188 + prepare: include/asm-$(ARCH)/asm-offsets.h
1.189 +
1.190 +-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
1.191 ++include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
1.192 + include/asm include/linux/version.h
1.193 + $(call filechk,gen-asm-offsets)
1.194 +
1.195 +diff -ur linux-2.6.7/arch/h8300/kernel/Makefile linux-2.6.7-mod/arch/h8300/kernel/Makefile
1.196 +--- linux-2.6.7/arch/h8300/kernel/Makefile Fri Jun 18 22:51:09 2004
1.197 ++++ linux-2.6.7-mod/arch/h8300/kernel/Makefile Sat Jun 19 12:49:32 2004
1.198 +@@ -2,7 +2,7 @@
1.199 + # Makefile for the linux kernel.
1.200 + #
1.201 +
1.202 +-extra-y := vmlinux.lds.s
1.203 ++extra-y := vmlinux.lds.asm
1.204 +
1.205 + obj-y := process.o traps.o ptrace.o ints.o \
1.206 + sys_h8300.o time.o semaphore.o signal.o \
1.207 +diff -ur linux-2.6.7/arch/i386/Makefile linux-2.6.7-mod/arch/i386/Makefile
1.208 +--- linux-2.6.7/arch/i386/Makefile Fri Jun 18 22:51:10 2004
1.209 ++++ linux-2.6.7-mod/arch/i386/Makefile Sat Jun 19 12:49:43 2004
1.210 +@@ -141,10 +141,10 @@
1.211 + prepare: include/asm-$(ARCH)/asm_offsets.h
1.212 + CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
1.213 +
1.214 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.215 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.216 + include/config/MARKER
1.217 +
1.218 +-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
1.219 ++include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.220 + $(call filechk,gen-asm-offsets)
1.221 +
1.222 + archclean:
1.223 +diff -ur linux-2.6.7/arch/i386/kernel/Makefile linux-2.6.7-mod/arch/i386/kernel/Makefile
1.224 +--- linux-2.6.7/arch/i386/kernel/Makefile Mon May 10 04:32:02 2004
1.225 ++++ linux-2.6.7-mod/arch/i386/kernel/Makefile Sat Jun 19 12:49:54 2004
1.226 +@@ -2,7 +2,7 @@
1.227 + # Makefile for the linux kernel.
1.228 + #
1.229 +
1.230 +-extra-y := head.o init_task.o vmlinux.lds.s
1.231 ++extra-y := head.o init_task.o vmlinux.lds.asm
1.232 +
1.233 + obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
1.234 + ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
1.235 +diff -ur linux-2.6.7/arch/ia64/Makefile linux-2.6.7-mod/arch/ia64/Makefile
1.236 +--- linux-2.6.7/arch/ia64/Makefile Mon May 10 04:31:59 2004
1.237 ++++ linux-2.6.7-mod/arch/ia64/Makefile Sat Jun 19 12:50:12 2004
1.238 +@@ -88,12 +88,12 @@
1.239 +
1.240 + prepare: include/asm-ia64/offsets.h
1.241 +
1.242 +-arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
1.243 ++arch/ia64/kernel/asm-offsets.asm: include/asm include/linux/version.h include/config/MARKER
1.244 +
1.245 +-include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
1.246 ++include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.asm
1.247 + $(call filechk,gen-asm-offsets)
1.248 +
1.249 +-arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
1.250 ++arch/ia64/kernel/asm-offsets.asm: include/asm-ia64/.offsets.h.stamp
1.251 +
1.252 + include/asm-ia64/.offsets.h.stamp:
1.253 + mkdir -p include/asm-ia64
1.254 +diff -ur linux-2.6.7/arch/ia64/kernel/Makefile linux-2.6.7-mod/arch/ia64/kernel/Makefile
1.255 +--- linux-2.6.7/arch/ia64/kernel/Makefile Fri Jun 18 22:51:13 2004
1.256 ++++ linux-2.6.7-mod/arch/ia64/kernel/Makefile Sat Jun 19 12:52:14 2004
1.257 +@@ -2,7 +2,7 @@
1.258 + # Makefile for the linux kernel.
1.259 + #
1.260 +
1.261 +-extra-y := head.o init_task.o vmlinux.lds.s
1.262 ++extra-y := head.o init_task.o vmlinux.lds.asm
1.263 +
1.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 \
1.265 + irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \
1.266 +@@ -21,7 +21,7 @@
1.267 + # The gate DSO image is built using a special linker script.
1.268 + targets += gate.so gate-syms.o
1.269 +
1.270 +-extra-y += gate.so gate-syms.o gate.lds.s gate.o
1.271 ++extra-y += gate.so gate-syms.o gate.lds.asm gate.o
1.272 +
1.273 + # fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
1.274 + CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31
1.275 +@@ -32,14 +32,14 @@
1.276 + cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
1.277 +
1.278 + GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1
1.279 +-$(obj)/gate.so: $(obj)/gate.lds.s $(obj)/gate.o FORCE
1.280 ++$(obj)/gate.so: $(obj)/gate.lds.asm $(obj)/gate.o FORCE
1.281 + $(call if_changed,gate)
1.282 +
1.283 + $(obj)/built-in.o: $(obj)/gate-syms.o
1.284 + $(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
1.285 +
1.286 + GATECFLAGS_gate-syms.o = -r
1.287 +-$(obj)/gate-syms.o: $(src)/gate.lds.s $(obj)/gate.o FORCE
1.288 ++$(obj)/gate-syms.o: $(src)/gate.lds.asm $(obj)/gate.o FORCE
1.289 + $(call if_changed,gate)
1.290 +
1.291 + # gate-data.o contains the gate DSO image as data in section .data.gate.
1.292 +diff -ur linux-2.6.7/arch/m68k/Makefile linux-2.6.7-mod/arch/m68k/Makefile
1.293 +--- linux-2.6.7/arch/m68k/Makefile Fri Jun 18 22:51:14 2004
1.294 ++++ linux-2.6.7-mod/arch/m68k/Makefile Sat Jun 19 12:52:30 2004
1.295 +@@ -114,10 +114,10 @@
1.296 + prepare: include/asm-$(ARCH)/offsets.h
1.297 + CLEAN_FILES += include/asm-$(ARCH)/offsets.h
1.298 +
1.299 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.300 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.301 + include/config/MARKER
1.302 +
1.303 +-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
1.304 ++include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.305 + $(call filechk,gen-asm-offsets)
1.306 +
1.307 + archclean:
1.308 +diff -ur linux-2.6.7/arch/m68k/kernel/Makefile linux-2.6.7-mod/arch/m68k/kernel/Makefile
1.309 +--- linux-2.6.7/arch/m68k/kernel/Makefile Mon May 10 04:33:10 2004
1.310 ++++ linux-2.6.7-mod/arch/m68k/kernel/Makefile Sat Jun 19 12:52:35 2004
1.311 +@@ -7,7 +7,7 @@
1.312 + else
1.313 + extra-y := sun3-head.o
1.314 + endif
1.315 +-extra-y += vmlinux.lds.s
1.316 ++extra-y += vmlinux.lds.asm
1.317 +
1.318 + obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \
1.319 + sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
1.320 +diff -ur linux-2.6.7/arch/m68knommu/Makefile linux-2.6.7-mod/arch/m68knommu/Makefile
1.321 +--- linux-2.6.7/arch/m68knommu/Makefile Mon May 10 04:32:54 2004
1.322 ++++ linux-2.6.7-mod/arch/m68knommu/Makefile Sat Jun 19 12:52:57 2004
1.323 +@@ -89,7 +89,7 @@
1.324 + head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
1.325 +
1.326 + CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
1.327 +- arch/$(ARCH)/kernel/asm-offsets.s
1.328 ++ arch/$(ARCH)/kernel/asm-offsets.asm
1.329 +
1.330 + core-y += arch/m68knommu/kernel/ \
1.331 + arch/m68knommu/mm/ \
1.332 +@@ -102,7 +102,7 @@
1.333 + archclean:
1.334 + $(call descend arch/$(ARCH)/boot, subdirclean)
1.335 +
1.336 +-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
1.337 ++include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
1.338 + include/asm include/linux/version.h \
1.339 + include/config/MARKER
1.340 + $(call filechk,gen-asm-offsets)
1.341 +diff -ur linux-2.6.7/arch/m68knommu/kernel/Makefile linux-2.6.7-mod/arch/m68knommu/kernel/Makefile
1.342 +--- linux-2.6.7/arch/m68knommu/kernel/Makefile Mon May 10 04:32:26 2004
1.343 ++++ linux-2.6.7-mod/arch/m68knommu/kernel/Makefile Sat Jun 19 12:53:20 2004
1.344 +@@ -2,7 +2,7 @@
1.345 + # Makefile for arch/m68knommu/kernel.
1.346 + #
1.347 +
1.348 +-extra-y := vmlinux.lds.s
1.349 ++extra-y := vmlinux.lds.asm
1.350 +
1.351 + obj-y += dma.o entry.o init_task.o m68k_ksyms.o process.o ptrace.o semaphore.o \
1.352 + setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
1.353 +diff -ur linux-2.6.7/arch/mips/Makefile linux-2.6.7-mod/arch/mips/Makefile
1.354 +--- linux-2.6.7/arch/mips/Makefile Fri Jun 18 22:51:19 2004
1.355 ++++ linux-2.6.7-mod/arch/mips/Makefile Sat Jun 19 12:53:35 2004
1.356 +@@ -752,12 +752,12 @@
1.357 + prepare: include/asm-$(ARCH)/offset.h \
1.358 + include/asm-$(ARCH)/reg.h
1.359 +
1.360 +-arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \
1.361 ++arch/$(ARCH)/kernel/offset.asm: include/asm include/linux/version.h \
1.362 + include/config/MARKER
1.363 +
1.364 +-include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
1.365 ++include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.asm
1.366 + $(call filechk,gen-asm-offset.h)
1.367 +-include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.s
1.368 ++include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.asm
1.369 + $(call filechk,gen-asm-reg.h)
1.370 +
1.371 + CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \
1.372 +diff -ur linux-2.6.7/arch/mips/kernel/Makefile linux-2.6.7-mod/arch/mips/kernel/Makefile
1.373 +--- linux-2.6.7/arch/mips/kernel/Makefile Mon May 10 04:32:28 2004
1.374 ++++ linux-2.6.7-mod/arch/mips/kernel/Makefile Sat Jun 19 12:53:41 2004
1.375 +@@ -2,7 +2,7 @@
1.376 + # Makefile for the Linux/MIPS kernel.
1.377 + #
1.378 +
1.379 +-extra-y := head.o init_task.o vmlinux.lds.s
1.380 ++extra-y := head.o init_task.o vmlinux.lds.asm
1.381 +
1.382 + obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
1.383 + ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
1.384 +diff -ur linux-2.6.7/arch/parisc/Makefile linux-2.6.7-mod/arch/parisc/Makefile
1.385 +--- linux-2.6.7/arch/parisc/Makefile Fri Jun 18 22:51:21 2004
1.386 ++++ linux-2.6.7-mod/arch/parisc/Makefile Sat Jun 19 12:53:47 2004
1.387 +@@ -88,10 +88,10 @@
1.388 +
1.389 + prepare: include/asm-parisc/offsets.h
1.390 +
1.391 +-arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.392 ++arch/parisc/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.393 + include/config/MARKER
1.394 +
1.395 +-include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s
1.396 ++include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.asm
1.397 + $(call filechk,gen-asm-offsets)
1.398 +
1.399 + CLEAN_FILES += lifimage include/asm-parisc/offsets.h
1.400 +diff -ur linux-2.6.7/arch/parisc/kernel/Makefile linux-2.6.7-mod/arch/parisc/kernel/Makefile
1.401 +--- linux-2.6.7/arch/parisc/kernel/Makefile Fri Jun 18 22:51:21 2004
1.402 ++++ linux-2.6.7-mod/arch/parisc/kernel/Makefile Sat Jun 19 12:53:53 2004
1.403 +@@ -4,7 +4,7 @@
1.404 +
1.405 + head-y := head.o
1.406 + head-$(CONFIG_PARISC64) := head64.o
1.407 +-extra-y := init_task.o $(head-y) vmlinux.lds.s
1.408 ++extra-y := init_task.o $(head-y) vmlinux.lds.asm
1.409 +
1.410 + AFLAGS_entry.o := -traditional
1.411 + AFLAGS_pacache.o := -traditional
1.412 +diff -ur linux-2.6.7/arch/ppc/Makefile linux-2.6.7-mod/arch/ppc/Makefile
1.413 +--- linux-2.6.7/arch/ppc/Makefile Fri Jun 18 22:51:22 2004
1.414 ++++ linux-2.6.7-mod/arch/ppc/Makefile Sat Jun 19 12:54:09 2004
1.415 +@@ -78,10 +78,10 @@
1.416 +
1.417 + prepare: include/asm-$(ARCH)/offsets.h checkbin
1.418 +
1.419 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.420 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.421 + include/config/MARKER
1.422 +
1.423 +-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
1.424 ++include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.425 + $(call filechk,gen-asm-offsets)
1.426 +
1.427 + ifdef CONFIG_6xx
1.428 +@@ -104,4 +104,4 @@
1.429 + endif
1.430 +
1.431 + CLEAN_FILES += include/asm-$(ARCH)/offsets.h \
1.432 +- arch/$(ARCH)/kernel/asm-offsets.s
1.433 ++ arch/$(ARCH)/kernel/asm-offsets.asm
1.434 +diff -ur linux-2.6.7/arch/ppc/kernel/Makefile linux-2.6.7-mod/arch/ppc/kernel/Makefile
1.435 +--- linux-2.6.7/arch/ppc/kernel/Makefile Fri Jun 18 22:51:24 2004
1.436 ++++ linux-2.6.7-mod/arch/ppc/kernel/Makefile Sat Jun 19 12:43:10 2004
1.437 +@@ -15,7 +15,7 @@
1.438 + extra-$(CONFIG_8xx) := head_8xx.o
1.439 + extra-$(CONFIG_6xx) += idle_6xx.o
1.440 + extra-$(CONFIG_POWER4) += idle_power4.o
1.441 +-extra-y += vmlinux.lds.s
1.442 ++extra-y += vmlinux.lds.asm
1.443 +
1.444 + obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
1.445 + process.o signal.o ptrace.o align.o \
1.446 +diff -ur linux-2.6.7/arch/ppc64/Makefile linux-2.6.7-mod/arch/ppc64/Makefile
1.447 +--- linux-2.6.7/arch/ppc64/Makefile Fri Jun 18 22:51:26 2004
1.448 ++++ linux-2.6.7-mod/arch/ppc64/Makefile Sat Jun 19 12:54:32 2004
1.449 +@@ -67,10 +67,10 @@
1.450 +
1.451 + prepare: include/asm-ppc64/offsets.h
1.452 +
1.453 +-arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.454 ++arch/ppc64/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.455 + include/config/MARKER
1.456 +
1.457 +-include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
1.458 ++include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.asm
1.459 + $(call filechk,gen-asm-offsets)
1.460 +
1.461 + define archhelp
1.462 +diff -ur linux-2.6.7/arch/ppc64/kernel/Makefile linux-2.6.7-mod/arch/ppc64/kernel/Makefile
1.463 +--- linux-2.6.7/arch/ppc64/kernel/Makefile Mon May 10 04:33:20 2004
1.464 ++++ linux-2.6.7-mod/arch/ppc64/kernel/Makefile Sat Jun 19 12:54:39 2004
1.465 +@@ -3,7 +3,7 @@
1.466 + #
1.467 +
1.468 + EXTRA_CFLAGS += -mno-minimal-toc
1.469 +-extra-y := head.o vmlinux.lds.s
1.470 ++extra-y := head.o vmlinux.lds.asm
1.471 +
1.472 + obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \
1.473 + time.o process.o signal.o syscalls.o misc.o ptrace.o \
1.474 +diff -ur linux-2.6.7/arch/s390/Makefile linux-2.6.7-mod/arch/s390/Makefile
1.475 +--- linux-2.6.7/arch/s390/Makefile Mon May 10 04:32:02 2004
1.476 ++++ linux-2.6.7-mod/arch/s390/Makefile Sat Jun 19 12:54:46 2004
1.477 +@@ -68,10 +68,10 @@
1.478 +
1.479 + prepare: include/asm-$(ARCH)/offsets.h
1.480 +
1.481 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.482 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.483 + include/config/MARKER
1.484 +
1.485 +-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
1.486 ++include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.487 + $(call filechk,gen-asm-offsets)
1.488 +
1.489 + CLEAN_FILES += include/asm-$(ARCH)/offsets.h
1.490 +diff -ur linux-2.6.7/arch/s390/kernel/Makefile linux-2.6.7-mod/arch/s390/kernel/Makefile
1.491 +--- linux-2.6.7/arch/s390/kernel/Makefile Mon May 10 04:33:20 2004
1.492 ++++ linux-2.6.7-mod/arch/s390/kernel/Makefile Sat Jun 19 12:54:52 2004
1.493 +@@ -10,7 +10,7 @@
1.494 +
1.495 + extra-$(CONFIG_ARCH_S390_31) += head.o
1.496 + extra-$(CONFIG_ARCH_S390X) += head64.o
1.497 +-extra-y += init_task.o vmlinux.lds.s
1.498 ++extra-y += init_task.o vmlinux.lds.asm
1.499 +
1.500 + obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
1.501 + obj-$(CONFIG_SMP) += smp.o
1.502 +diff -ur linux-2.6.7/arch/sh/kernel/Makefile linux-2.6.7-mod/arch/sh/kernel/Makefile
1.503 +--- linux-2.6.7/arch/sh/kernel/Makefile Mon May 10 04:32:39 2004
1.504 ++++ linux-2.6.7-mod/arch/sh/kernel/Makefile Sat Jun 19 12:55:33 2004
1.505 +@@ -2,7 +2,7 @@
1.506 + # Makefile for the Linux/SuperH kernel.
1.507 + #
1.508 +
1.509 +-extra-y := head.o init_task.o vmlinux.lds.s
1.510 ++extra-y := head.o init_task.o vmlinux.lds.asm
1.511 +
1.512 + obj-y := process.o signal.o entry.o traps.o irq.o \
1.513 + ptrace.o setup.o time.o sys_sh.o semaphore.o \
1.514 +diff -ur linux-2.6.7/arch/sparc/Makefile linux-2.6.7-mod/arch/sparc/Makefile
1.515 +--- linux-2.6.7/arch/sparc/Makefile Fri Jun 18 22:51:29 2004
1.516 ++++ linux-2.6.7-mod/arch/sparc/Makefile Sat Jun 19 12:55:48 2004
1.517 +@@ -61,14 +61,14 @@
1.518 +
1.519 + prepare: include/asm-$(ARCH)/asm_offsets.h
1.520 +
1.521 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.522 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.523 + include/config/MARKER
1.524 +
1.525 +-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
1.526 ++include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.527 + $(call filechk,gen-asm-offsets)
1.528 +
1.529 + CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h \
1.530 +- arch/$(ARCH)/kernel/asm-offsets.s \
1.531 ++ arch/$(ARCH)/kernel/asm-offsets.asm \
1.532 + arch/$(ARCH)/boot/System.map
1.533 +
1.534 + # Don't use tabs in echo arguments.
1.535 +diff -ur linux-2.6.7/arch/sparc/kernel/Makefile linux-2.6.7-mod/arch/sparc/kernel/Makefile
1.536 +--- linux-2.6.7/arch/sparc/kernel/Makefile Mon May 10 04:33:13 2004
1.537 ++++ linux-2.6.7-mod/arch/sparc/kernel/Makefile Sat Jun 19 12:55:52 2004
1.538 +@@ -2,7 +2,7 @@
1.539 + # Makefile for the linux kernel.
1.540 + #
1.541 +
1.542 +-extra-y := head.o init_task.o vmlinux.lds.s
1.543 ++extra-y := head.o init_task.o vmlinux.lds.asm
1.544 +
1.545 + EXTRA_AFLAGS := -ansi
1.546 +
1.547 +diff -ur linux-2.6.7/arch/sparc64/kernel/Makefile linux-2.6.7-mod/arch/sparc64/kernel/Makefile
1.548 +--- linux-2.6.7/arch/sparc64/kernel/Makefile Mon May 10 04:32:02 2004
1.549 ++++ linux-2.6.7-mod/arch/sparc64/kernel/Makefile Sat Jun 19 12:56:24 2004
1.550 +@@ -5,7 +5,7 @@
1.551 + EXTRA_AFLAGS := -ansi
1.552 + EXTRA_CFLAGS := -Werror
1.553 +
1.554 +-extra-y := head.o init_task.o vmlinux.lds.s
1.555 ++extra-y := head.o init_task.o vmlinux.lds.asm
1.556 +
1.557 + obj-y := process.o setup.o cpu.o idprom.o \
1.558 + traps.o devices.o auxio.o \
1.559 +diff -ur linux-2.6.7/arch/um/Makefile linux-2.6.7-mod/arch/um/Makefile
1.560 +--- linux-2.6.7/arch/um/Makefile Mon May 10 04:32:52 2004
1.561 ++++ linux-2.6.7-mod/arch/um/Makefile Sat Jun 19 12:57:07 2004
1.562 +@@ -77,7 +77,7 @@
1.563 + # CONFIG_MODE_SKAS + CONFIG_STATIC_LINK case.
1.564 +
1.565 + LINK_TT = -static
1.566 +-LD_SCRIPT_TT := uml.lds.s
1.567 ++LD_SCRIPT_TT := uml.lds.asm
1.568 +
1.569 + ifeq ($(CONFIG_STATIC_LINK),y)
1.570 + LINK-y += $(LINK_TT)
1.571 +@@ -103,11 +103,11 @@
1.572 + -DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
1.573 + -DKERNEL_STACK_SIZE=$(STACK_SIZE)
1.574 +
1.575 +-AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
1.576 ++AFLAGS_$(LD_SCRIPT-y:.asm=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
1.577 +
1.578 + LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
1.579 +
1.580 +-$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
1.581 ++$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.asm=.S) scripts FORCE
1.582 + $(call if_changed_dep,as_s_S)
1.583 +
1.584 + linux: vmlinux $(LD_SCRIPT-y)
1.585 +@@ -122,8 +122,8 @@
1.586 + # To get a definition of F_SETSIG
1.587 + USER_CFLAGS += -D_GNU_SOURCE
1.588 +
1.589 +-CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
1.590 +- $(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
1.591 ++CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.asm \
1.592 ++ $(ARCH_DIR)/dyn_link.ld.asm $(GEN_HEADERS)
1.593 +
1.594 + $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
1.595 + $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
1.596 +diff -ur linux-2.6.7/arch/um/kernel/Makefile linux-2.6.7-mod/arch/um/kernel/Makefile
1.597 +--- linux-2.6.7/arch/um/kernel/Makefile Mon May 10 04:32:53 2004
1.598 ++++ linux-2.6.7-mod/arch/um/kernel/Makefile Sat Jun 19 12:57:15 2004
1.599 +@@ -3,7 +3,7 @@
1.600 + # Licensed under the GPL
1.601 + #
1.602 +
1.603 +-extra-y := vmlinux.lds.s
1.604 ++extra-y := vmlinux.lds.asm
1.605 +
1.606 + obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
1.607 + helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
1.608 +diff -ur linux-2.6.7/arch/v850/Makefile linux-2.6.7-mod/arch/v850/Makefile
1.609 +--- linux-2.6.7/arch/v850/Makefile Mon May 10 04:33:21 2004
1.610 ++++ linux-2.6.7-mod/arch/v850/Makefile Sat Jun 19 12:57:59 2004
1.611 +@@ -52,12 +52,12 @@
1.612 + prepare: include/asm-$(ARCH)/asm-consts.h
1.613 +
1.614 + # Generate constants from C code for use by asm files
1.615 +-arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \
1.616 ++arch/$(ARCH)/kernel/asm-consts.asm: include/asm include/linux/version.h \
1.617 + include/config/MARKER
1.618 +
1.619 +-include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s
1.620 ++include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.asm
1.621 + $(call filechk,gen-asm-offsets)
1.622 +
1.623 + CLEAN_FILES += include/asm-$(ARCH)/asm-consts.h \
1.624 +- arch/$(ARCH)/kernel/asm-consts.s \
1.625 ++ arch/$(ARCH)/kernel/asm-consts.asm \
1.626 + root_fs_image.o
1.627 +diff -ur linux-2.6.7/arch/v850/kernel/Makefile linux-2.6.7-mod/arch/v850/kernel/Makefile
1.628 +--- linux-2.6.7/arch/v850/kernel/Makefile Mon May 10 04:33:21 2004
1.629 ++++ linux-2.6.7-mod/arch/v850/kernel/Makefile Sat Jun 19 12:58:04 2004
1.630 +@@ -9,7 +9,7 @@
1.631 + # for more details.
1.632 + #
1.633 +
1.634 +-extra-y := head.o init_task.o vmlinux.lds.s
1.635 ++extra-y := head.o init_task.o vmlinux.lds.asm
1.636 +
1.637 + obj-y += intv.o entry.o process.o syscalls.o time.o semaphore.o setup.o \
1.638 + signal.o irq.o mach.o ptrace.o bug.o
1.639 +diff -ur linux-2.6.7/arch/x86_64/Makefile linux-2.6.7-mod/arch/x86_64/Makefile
1.640 +--- linux-2.6.7/arch/x86_64/Makefile Mon May 10 04:33:19 2004
1.641 ++++ linux-2.6.7-mod/arch/x86_64/Makefile Sat Jun 19 12:58:10 2004
1.642 +@@ -93,10 +93,10 @@
1.643 +
1.644 + prepare: include/asm-$(ARCH)/offset.h
1.645 +
1.646 +-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
1.647 ++arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
1.648 + include/config/MARKER
1.649 +
1.650 +-include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s
1.651 ++include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.asm
1.652 + $(call filechk,gen-asm-offsets)
1.653 +
1.654 + CLEAN_FILES += include/asm-$(ARCH)/offset.h
1.655 +diff -ur linux-2.6.7/arch/x86_64/kernel/Makefile linux-2.6.7-mod/arch/x86_64/kernel/Makefile
1.656 +--- linux-2.6.7/arch/x86_64/kernel/Makefile Fri Jun 18 22:51:32 2004
1.657 ++++ linux-2.6.7-mod/arch/x86_64/kernel/Makefile Sat Jun 19 12:58:17 2004
1.658 +@@ -2,7 +2,7 @@
1.659 + # Makefile for the linux kernel.
1.660 + #
1.661 +
1.662 +-extra-y := head.o head64.o init_task.o vmlinux.lds.s
1.663 ++extra-y := head.o head64.o init_task.o vmlinux.lds.asm
1.664 + EXTRA_AFLAGS := -traditional
1.665 + obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
1.666 + ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \
1.667 +diff -ur linux-2.6.7/scripts/Makefile.build linux-2.6.7-mod/scripts/Makefile.build
1.668 +--- linux-2.6.7/scripts/Makefile.build Mon May 10 04:33:13 2004
1.669 ++++ linux-2.6.7-mod/scripts/Makefile.build Sat Jun 19 12:43:10 2004
1.670 +@@ -110,7 +110,7 @@
1.671 + quiet_cmd_cc_s_c = CC $(quiet_modtag) $@
1.672 + cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
1.673 +
1.674 +-%.s: %.c FORCE
1.675 ++%.asm: %.c FORCE
1.676 + $(call if_changed_dep,cc_s_c)
1.677 +
1.678 + quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
1.679 +@@ -197,7 +197,7 @@
1.680 + quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
1.681 + cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
1.682 +
1.683 +-%.s: %.S FORCE
1.684 ++%.asm: %.S FORCE
1.685 + $(call if_changed_dep,as_s_S)
1.686 +
1.687 + quiet_cmd_as_o_S = AS $(quiet_modtag) $@
1.688 +--- linux-2.6.8/arch/sparc/boot/Makefile.old 2004-09-21 21:46:18.000000000 -0700
1.689 ++++ linux-2.6.8/arch/sparc/boot/Makefile 2004-09-21 21:52:35.000000000 -0700
1.690 +@@ -19,7 +19,7 @@
1.691 +
1.692 + BTOBJS := $(HEAD_Y) $(INIT_Y)
1.693 + BTLIBS := $(CORE_Y) $(LIBS_Y) $(DRIVERS_Y) $(NET_Y)
1.694 +-LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.s $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
1.695 ++LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.asm $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
1.696 +
1.697 + # Actual linking
1.698 + $(obj)/image: $(obj)/btfix.o FORCE
1.699 +--- linux-2.6.8/arch/sh64/Makefile.old 2004-09-21 21:46:18.000000000 -0700
1.700 ++++ linux-2.6.8/arch/sh64/Makefile 2004-09-21 21:54:31.000000000 -0700
1.701 +@@ -71,7 +71,7 @@
1.702 +
1.703 + prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
1.704 +
1.705 +-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
1.706 ++include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
1.707 + include/asm include/linux/version.h
1.708 + $(call filechk,gen-asm-offsets)
1.709 +
1.710 +--- linux-2.6.8/arch/sh64/boot/compressed/Makefile.old 2004-09-21 21:46:18.000000000 -0700
1.711 ++++ linux-2.6.8/arch/sh64/boot/compressed/Makefile 2004-09-21 21:54:41.000000000 -0700
1.712 +@@ -25,7 +25,7 @@
1.713 + ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[$(CONFIG_MEMORY_START)+0x400000+0x10000])
1.714 +
1.715 + LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \
1.716 +- -T $(obj)/../../kernel/vmlinux.lds.s \
1.717 ++ -T $(obj)/../../kernel/vmlinux.lds.asm \
1.718 + --no-warn-mismatch
1.719 +
1.720 + $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
1.721 +@@ -41,6 +41,6 @@
1.722 + LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T
1.723 + OBJCOPYFLAGS += -R .empty_zero_page
1.724 +
1.725 +-$(obj)/piggy.o: $(obj)/vmlinux.lds.s $(obj)/vmlinux.bin.gz FORCE
1.726 ++$(obj)/piggy.o: $(obj)/vmlinux.lds.asm $(obj)/vmlinux.bin.gz FORCE
1.727 + $(call if_changed,ld)
1.728 +