Configure tsocks with a simple heuristic.
Consider the proxy has to be in a 'local' network. It means it is directly
reachable by the local machine, even if the local machine has to hop through
one or more gates to reach the proxy (often the case in enterprise networks
where class A 10.0.0.0/8 is in fact sub-divided into smaller networks, each
one of them in a different location, eg. 10.1.0.0/16 in a place, while
10.2.0.0/16 would be on the other side of the world). Not being in the same
subnet does not mean the proxy is not available.
So we will build a mask with at most high bits set, which defines a network
that has both the local machine and the proxy. Because a machine may have
more than one interface, build a mask for each of them, removing 127.0.0.1
which is added automagically by tsocks, and removing duplicate masks.
If all of this does not work, then it means the local machine can NOT in fact
reach the proxy, which in turn means the user mis-configured something (most
probably a typo...).
/trunk/scripts/crosstool.sh | 61 52 9 0 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 52 insertions(+), 9 deletions(-)
1 Submitted By: Martin Schaffner <schaffner@gmx.li>
3 Initial Package Version: 2.6.7
4 Upstream Status: Not submitted
5 Origin: Martin Schaffner
6 Description: Enables build on case-insensitive file systems
7 URL: xxxhttp://mirror.vtx.ch/lfs/patches/downloads/linux/linux-2.6.7-build_on_case_insensitive_fs-1.patch
8 --- Rediffed against 2.6.8 by dank@kegel.com
9 --- plus a few missing hunks added to fix sparc32 build
11 --- linux-2.6.8/Makefile.orig 2004-08-13 22:37:25.000000000 -0700
12 +++ linux-2.6.8/Makefile 2004-09-01 21:39:39.000000000 -0700
15 do_system_map = $(NM) $(1) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > $(2)
17 -LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.s
18 +LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.asm
20 # Generate section listing all symbols and add it into vmlinux
21 # It's a three stage process:
23 .tmp_kallsyms%.S: .tmp_vmlinux%
26 -.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
27 +.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
28 $(call if_changed_rule,vmlinux__)
30 -.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
31 +.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
32 $(call if_changed_rule,vmlinux__)
34 -.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
35 +.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
36 $(call if_changed_rule,vmlinux__)
40 $(rule_verify_kallsyms)
43 -vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
44 +vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
45 $(call if_changed_rule,vmlinux)
47 # The actual objects are generated when descending,
48 # make sure no implicit rule kicks in
50 -$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.s: $(vmlinux-dirs) ;
51 +$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.asm: $(vmlinux-dirs) ;
53 # Handle descending into subdirectories listed in $(vmlinux-dirs)
54 # Preset locale variables to speed up the build process. Limit locale
57 # ---------------------------------------------------------------------------
59 -%.s: %.c scripts FORCE
60 +%.asm: %.c scripts FORCE
61 $(Q)$(MAKE) $(build)=$(@D) $@
62 %.i: %.c scripts FORCE
63 $(Q)$(MAKE) $(build)=$(@D) $@
65 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D)
66 %.lst: %.c scripts FORCE
67 $(Q)$(MAKE) $(build)=$(@D) $@
68 -%.s: %.S scripts FORCE
69 +%.asm: %.S scripts FORCE
70 $(Q)$(MAKE) $(build)=$(@D) $@
71 %.o: %.S scripts FORCE
72 $(Q)$(MAKE) $(build)=$(@D) $@
73 diff -ur linux-2.6.7/arch/alpha/Makefile linux-2.6.7-mod/arch/alpha/Makefile
74 --- linux-2.6.7/arch/alpha/Makefile Fri Jun 18 22:51:03 2004
75 +++ linux-2.6.7-mod/arch/alpha/Makefile Sat Jun 19 12:46:32 2004
78 prepare: include/asm-$(ARCH)/asm_offsets.h
80 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
81 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
84 -include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
85 +include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
86 $(call filechk,gen-asm-offsets)
89 diff -ur linux-2.6.7/arch/alpha/kernel/Makefile linux-2.6.7-mod/arch/alpha/kernel/Makefile
90 --- linux-2.6.7/arch/alpha/kernel/Makefile Mon May 10 04:32:29 2004
91 +++ linux-2.6.7-mod/arch/alpha/kernel/Makefile Sat Jun 19 12:46:48 2004
93 # Makefile for the linux kernel.
96 -extra-y := head.o vmlinux.lds.s
97 +extra-y := head.o vmlinux.lds.asm
98 EXTRA_AFLAGS := $(CFLAGS)
99 EXTRA_CFLAGS := -Werror -Wno-sign-compare
101 --- linux-2.6.8/arch/arm/Makefile.orig 2004-08-13 22:36:56.000000000 -0700
102 +++ linux-2.6.8/arch/arm/Makefile 2004-09-01 21:40:21.000000000 -0700
103 @@ -176,10 +176,10 @@
104 bp:; $(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage
105 i zi:; $(Q)$(MAKE) $(build)=$(boot) $@
107 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
108 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
109 include/asm-arm/.arch
111 -include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s
112 +include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.asm
113 $(call filechk,gen-asm-offsets)
116 diff -ur linux-2.6.7/arch/arm/kernel/Makefile linux-2.6.7-mod/arch/arm/kernel/Makefile
117 --- linux-2.6.7/arch/arm/kernel/Makefile Mon May 10 04:33:19 2004
118 +++ linux-2.6.7-mod/arch/arm/kernel/Makefile Sat Jun 19 12:47:25 2004
121 obj-$(CONFIG_DEBUG_LL) += debug.o
123 -extra-y := $(head-y) init_task.o vmlinux.lds.s
124 +extra-y := $(head-y) init_task.o vmlinux.lds.asm
126 # Spell out some dependencies that aren't automatically figured out
127 $(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h
128 diff -ur linux-2.6.7/arch/arm26/Makefile linux-2.6.7-mod/arch/arm26/Makefile
129 --- linux-2.6.7/arch/arm26/Makefile Mon May 10 04:32:28 2004
130 +++ linux-2.6.7-mod/arch/arm26/Makefile Sat Jun 19 12:48:24 2004
131 @@ -101,10 +101,10 @@
135 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
136 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
137 include/config/MARKER
139 -include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
140 +include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
141 $(call filechk,gen-asm-offsets)
144 diff -ur linux-2.6.7/arch/arm26/kernel/Makefile linux-2.6.7-mod/arch/arm26/kernel/Makefile
145 --- linux-2.6.7/arch/arm26/kernel/Makefile Mon May 10 04:32:29 2004
146 +++ linux-2.6.7-mod/arch/arm26/kernel/Makefile Sat Jun 19 12:48:30 2004
148 obj-$(CONFIG_FIQ) += fiq.o
149 obj-$(CONFIG_MODULES) += armksyms.o
151 -extra-y := init_task.o vmlinux.lds.s
152 +extra-y := init_task.o vmlinux.lds.asm
154 diff -ur linux-2.6.7/arch/cris/Makefile linux-2.6.7-mod/arch/cris/Makefile
155 --- linux-2.6.7/arch/cris/Makefile Fri Jun 18 22:51:07 2004
156 +++ linux-2.6.7-mod/arch/cris/Makefile Sat Jun 19 12:48:47 2004
158 @ln -sf $(SARCH) include/asm-$(ARCH)/arch
161 -arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
162 +arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
163 include/config/MARKER
165 -include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
166 +include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm
167 $(call filechk,gen-asm-offsets)
168 diff -ur linux-2.6.7/arch/cris/kernel/Makefile linux-2.6.7-mod/arch/cris/kernel/Makefile
169 --- linux-2.6.7/arch/cris/kernel/Makefile Fri Jun 18 22:51:09 2004
170 +++ linux-2.6.7-mod/arch/cris/kernel/Makefile Sat Jun 19 12:48:53 2004
172 # Makefile for the linux kernel.
175 -extra-y := vmlinux.lds.s
176 +extra-y := vmlinux.lds.asm
178 obj-y := process.o traps.o irq.o ptrace.o setup.o \
179 time.o sys_cris.o semaphore.o
180 diff -ur linux-2.6.7/arch/h8300/Makefile linux-2.6.7-mod/arch/h8300/Makefile
181 --- linux-2.6.7/arch/h8300/Makefile Fri Jun 18 22:51:09 2004
182 +++ linux-2.6.7-mod/arch/h8300/Makefile Sat Jun 19 12:49:12 2004
185 prepare: include/asm-$(ARCH)/asm-offsets.h
187 -include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
188 +include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
189 include/asm include/linux/version.h
190 $(call filechk,gen-asm-offsets)
192 diff -ur linux-2.6.7/arch/h8300/kernel/Makefile linux-2.6.7-mod/arch/h8300/kernel/Makefile
193 --- linux-2.6.7/arch/h8300/kernel/Makefile Fri Jun 18 22:51:09 2004
194 +++ linux-2.6.7-mod/arch/h8300/kernel/Makefile Sat Jun 19 12:49:32 2004
196 # Makefile for the linux kernel.
199 -extra-y := vmlinux.lds.s
200 +extra-y := vmlinux.lds.asm
202 obj-y := process.o traps.o ptrace.o ints.o \
203 sys_h8300.o time.o semaphore.o signal.o \
204 diff -ur linux-2.6.7/arch/i386/Makefile linux-2.6.7-mod/arch/i386/Makefile
205 --- linux-2.6.7/arch/i386/Makefile Fri Jun 18 22:51:10 2004
206 +++ linux-2.6.7-mod/arch/i386/Makefile Sat Jun 19 12:49:43 2004
207 @@ -141,10 +141,10 @@
208 prepare: include/asm-$(ARCH)/asm_offsets.h
209 CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
211 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
212 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
213 include/config/MARKER
215 -include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
216 +include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
217 $(call filechk,gen-asm-offsets)
220 diff -ur linux-2.6.7/arch/i386/kernel/Makefile linux-2.6.7-mod/arch/i386/kernel/Makefile
221 --- linux-2.6.7/arch/i386/kernel/Makefile Mon May 10 04:32:02 2004
222 +++ linux-2.6.7-mod/arch/i386/kernel/Makefile Sat Jun 19 12:49:54 2004
224 # Makefile for the linux kernel.
227 -extra-y := head.o init_task.o vmlinux.lds.s
228 +extra-y := head.o init_task.o vmlinux.lds.asm
230 obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
231 ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
232 diff -ur linux-2.6.7/arch/ia64/Makefile linux-2.6.7-mod/arch/ia64/Makefile
233 --- linux-2.6.7/arch/ia64/Makefile Mon May 10 04:31:59 2004
234 +++ linux-2.6.7-mod/arch/ia64/Makefile Sat Jun 19 12:50:12 2004
237 prepare: include/asm-ia64/offsets.h
239 -arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
240 +arch/ia64/kernel/asm-offsets.asm: include/asm include/linux/version.h include/config/MARKER
242 -include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
243 +include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.asm
244 $(call filechk,gen-asm-offsets)
246 -arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
247 +arch/ia64/kernel/asm-offsets.asm: include/asm-ia64/.offsets.h.stamp
249 include/asm-ia64/.offsets.h.stamp:
250 mkdir -p include/asm-ia64
251 diff -ur linux-2.6.7/arch/ia64/kernel/Makefile linux-2.6.7-mod/arch/ia64/kernel/Makefile
252 --- linux-2.6.7/arch/ia64/kernel/Makefile Fri Jun 18 22:51:13 2004
253 +++ linux-2.6.7-mod/arch/ia64/kernel/Makefile Sat Jun 19 12:52:14 2004
255 # Makefile for the linux kernel.
258 -extra-y := head.o init_task.o vmlinux.lds.s
259 +extra-y := head.o init_task.o vmlinux.lds.asm
261 obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \
262 irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \
264 # The gate DSO image is built using a special linker script.
265 targets += gate.so gate-syms.o
267 -extra-y += gate.so gate-syms.o gate.lds.s gate.o
268 +extra-y += gate.so gate-syms.o gate.lds.asm gate.o
270 # fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
271 CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31
273 cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
275 GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1
276 -$(obj)/gate.so: $(obj)/gate.lds.s $(obj)/gate.o FORCE
277 +$(obj)/gate.so: $(obj)/gate.lds.asm $(obj)/gate.o FORCE
278 $(call if_changed,gate)
280 $(obj)/built-in.o: $(obj)/gate-syms.o
281 $(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
283 GATECFLAGS_gate-syms.o = -r
284 -$(obj)/gate-syms.o: $(src)/gate.lds.s $(obj)/gate.o FORCE
285 +$(obj)/gate-syms.o: $(src)/gate.lds.asm $(obj)/gate.o FORCE
286 $(call if_changed,gate)
288 # gate-data.o contains the gate DSO image as data in section .data.gate.
289 diff -ur linux-2.6.7/arch/m68k/Makefile linux-2.6.7-mod/arch/m68k/Makefile
290 --- linux-2.6.7/arch/m68k/Makefile Fri Jun 18 22:51:14 2004
291 +++ linux-2.6.7-mod/arch/m68k/Makefile Sat Jun 19 12:52:30 2004
292 @@ -114,10 +114,10 @@
293 prepare: include/asm-$(ARCH)/offsets.h
294 CLEAN_FILES += include/asm-$(ARCH)/offsets.h
296 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
297 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
298 include/config/MARKER
300 -include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
301 +include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
302 $(call filechk,gen-asm-offsets)
305 diff -ur linux-2.6.7/arch/m68k/kernel/Makefile linux-2.6.7-mod/arch/m68k/kernel/Makefile
306 --- linux-2.6.7/arch/m68k/kernel/Makefile Mon May 10 04:33:10 2004
307 +++ linux-2.6.7-mod/arch/m68k/kernel/Makefile Sat Jun 19 12:52:35 2004
310 extra-y := sun3-head.o
312 -extra-y += vmlinux.lds.s
313 +extra-y += vmlinux.lds.asm
315 obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \
316 sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
317 diff -ur linux-2.6.7/arch/m68knommu/Makefile linux-2.6.7-mod/arch/m68knommu/Makefile
318 --- linux-2.6.7/arch/m68knommu/Makefile Mon May 10 04:32:54 2004
319 +++ linux-2.6.7-mod/arch/m68knommu/Makefile Sat Jun 19 12:52:57 2004
321 head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
323 CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
324 - arch/$(ARCH)/kernel/asm-offsets.s
325 + arch/$(ARCH)/kernel/asm-offsets.asm
327 core-y += arch/m68knommu/kernel/ \
331 $(call descend arch/$(ARCH)/boot, subdirclean)
333 -include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
334 +include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
335 include/asm include/linux/version.h \
336 include/config/MARKER
337 $(call filechk,gen-asm-offsets)
338 diff -ur linux-2.6.7/arch/m68knommu/kernel/Makefile linux-2.6.7-mod/arch/m68knommu/kernel/Makefile
339 --- linux-2.6.7/arch/m68knommu/kernel/Makefile Mon May 10 04:32:26 2004
340 +++ linux-2.6.7-mod/arch/m68knommu/kernel/Makefile Sat Jun 19 12:53:20 2004
342 # Makefile for arch/m68knommu/kernel.
345 -extra-y := vmlinux.lds.s
346 +extra-y := vmlinux.lds.asm
348 obj-y += dma.o entry.o init_task.o m68k_ksyms.o process.o ptrace.o semaphore.o \
349 setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
350 diff -ur linux-2.6.7/arch/mips/Makefile linux-2.6.7-mod/arch/mips/Makefile
351 --- linux-2.6.7/arch/mips/Makefile Fri Jun 18 22:51:19 2004
352 +++ linux-2.6.7-mod/arch/mips/Makefile Sat Jun 19 12:53:35 2004
353 @@ -752,12 +752,12 @@
354 prepare: include/asm-$(ARCH)/offset.h \
355 include/asm-$(ARCH)/reg.h
357 -arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \
358 +arch/$(ARCH)/kernel/offset.asm: include/asm include/linux/version.h \
359 include/config/MARKER
361 -include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
362 +include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.asm
363 $(call filechk,gen-asm-offset.h)
364 -include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.s
365 +include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.asm
366 $(call filechk,gen-asm-reg.h)
368 CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \
369 diff -ur linux-2.6.7/arch/mips/kernel/Makefile linux-2.6.7-mod/arch/mips/kernel/Makefile
370 --- linux-2.6.7/arch/mips/kernel/Makefile Mon May 10 04:32:28 2004
371 +++ linux-2.6.7-mod/arch/mips/kernel/Makefile Sat Jun 19 12:53:41 2004
373 # Makefile for the Linux/MIPS kernel.
376 -extra-y := head.o init_task.o vmlinux.lds.s
377 +extra-y := head.o init_task.o vmlinux.lds.asm
379 obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
380 ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
381 diff -ur linux-2.6.7/arch/parisc/Makefile linux-2.6.7-mod/arch/parisc/Makefile
382 --- linux-2.6.7/arch/parisc/Makefile Fri Jun 18 22:51:21 2004
383 +++ linux-2.6.7-mod/arch/parisc/Makefile Sat Jun 19 12:53:47 2004
386 prepare: include/asm-parisc/offsets.h
388 -arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \
389 +arch/parisc/kernel/asm-offsets.asm: include/asm include/linux/version.h \
390 include/config/MARKER
392 -include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s
393 +include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.asm
394 $(call filechk,gen-asm-offsets)
396 CLEAN_FILES += lifimage include/asm-parisc/offsets.h
397 diff -ur linux-2.6.7/arch/parisc/kernel/Makefile linux-2.6.7-mod/arch/parisc/kernel/Makefile
398 --- linux-2.6.7/arch/parisc/kernel/Makefile Fri Jun 18 22:51:21 2004
399 +++ linux-2.6.7-mod/arch/parisc/kernel/Makefile Sat Jun 19 12:53:53 2004
403 head-$(CONFIG_PARISC64) := head64.o
404 -extra-y := init_task.o $(head-y) vmlinux.lds.s
405 +extra-y := init_task.o $(head-y) vmlinux.lds.asm
407 AFLAGS_entry.o := -traditional
408 AFLAGS_pacache.o := -traditional
409 diff -ur linux-2.6.7/arch/ppc/Makefile linux-2.6.7-mod/arch/ppc/Makefile
410 --- linux-2.6.7/arch/ppc/Makefile Fri Jun 18 22:51:22 2004
411 +++ linux-2.6.7-mod/arch/ppc/Makefile Sat Jun 19 12:54:09 2004
414 prepare: include/asm-$(ARCH)/offsets.h checkbin
416 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
417 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
418 include/config/MARKER
420 -include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
421 +include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
422 $(call filechk,gen-asm-offsets)
428 CLEAN_FILES += include/asm-$(ARCH)/offsets.h \
429 - arch/$(ARCH)/kernel/asm-offsets.s
430 + arch/$(ARCH)/kernel/asm-offsets.asm
431 diff -ur linux-2.6.7/arch/ppc/kernel/Makefile linux-2.6.7-mod/arch/ppc/kernel/Makefile
432 --- linux-2.6.7/arch/ppc/kernel/Makefile Fri Jun 18 22:51:24 2004
433 +++ linux-2.6.7-mod/arch/ppc/kernel/Makefile Sat Jun 19 12:43:10 2004
435 extra-$(CONFIG_8xx) := head_8xx.o
436 extra-$(CONFIG_6xx) += idle_6xx.o
437 extra-$(CONFIG_POWER4) += idle_power4.o
438 -extra-y += vmlinux.lds.s
439 +extra-y += vmlinux.lds.asm
441 obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
442 process.o signal.o ptrace.o align.o \
443 diff -ur linux-2.6.7/arch/ppc64/Makefile linux-2.6.7-mod/arch/ppc64/Makefile
444 --- linux-2.6.7/arch/ppc64/Makefile Fri Jun 18 22:51:26 2004
445 +++ linux-2.6.7-mod/arch/ppc64/Makefile Sat Jun 19 12:54:32 2004
448 prepare: include/asm-ppc64/offsets.h
450 -arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
451 +arch/ppc64/kernel/asm-offsets.asm: include/asm include/linux/version.h \
452 include/config/MARKER
454 -include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
455 +include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.asm
456 $(call filechk,gen-asm-offsets)
459 diff -ur linux-2.6.7/arch/ppc64/kernel/Makefile linux-2.6.7-mod/arch/ppc64/kernel/Makefile
460 --- linux-2.6.7/arch/ppc64/kernel/Makefile Mon May 10 04:33:20 2004
461 +++ linux-2.6.7-mod/arch/ppc64/kernel/Makefile Sat Jun 19 12:54:39 2004
465 EXTRA_CFLAGS += -mno-minimal-toc
466 -extra-y := head.o vmlinux.lds.s
467 +extra-y := head.o vmlinux.lds.asm
469 obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \
470 time.o process.o signal.o syscalls.o misc.o ptrace.o \
471 diff -ur linux-2.6.7/arch/s390/Makefile linux-2.6.7-mod/arch/s390/Makefile
472 --- linux-2.6.7/arch/s390/Makefile Mon May 10 04:32:02 2004
473 +++ linux-2.6.7-mod/arch/s390/Makefile Sat Jun 19 12:54:46 2004
476 prepare: include/asm-$(ARCH)/offsets.h
478 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
479 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
480 include/config/MARKER
482 -include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
483 +include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
484 $(call filechk,gen-asm-offsets)
486 CLEAN_FILES += include/asm-$(ARCH)/offsets.h
487 diff -ur linux-2.6.7/arch/s390/kernel/Makefile linux-2.6.7-mod/arch/s390/kernel/Makefile
488 --- linux-2.6.7/arch/s390/kernel/Makefile Mon May 10 04:33:20 2004
489 +++ linux-2.6.7-mod/arch/s390/kernel/Makefile Sat Jun 19 12:54:52 2004
492 extra-$(CONFIG_ARCH_S390_31) += head.o
493 extra-$(CONFIG_ARCH_S390X) += head64.o
494 -extra-y += init_task.o vmlinux.lds.s
495 +extra-y += init_task.o vmlinux.lds.asm
497 obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
498 obj-$(CONFIG_SMP) += smp.o
499 diff -ur linux-2.6.7/arch/sh/kernel/Makefile linux-2.6.7-mod/arch/sh/kernel/Makefile
500 --- linux-2.6.7/arch/sh/kernel/Makefile Mon May 10 04:32:39 2004
501 +++ linux-2.6.7-mod/arch/sh/kernel/Makefile Sat Jun 19 12:55:33 2004
503 # Makefile for the Linux/SuperH kernel.
506 -extra-y := head.o init_task.o vmlinux.lds.s
507 +extra-y := head.o init_task.o vmlinux.lds.asm
509 obj-y := process.o signal.o entry.o traps.o irq.o \
510 ptrace.o setup.o time.o sys_sh.o semaphore.o \
511 diff -ur linux-2.6.7/arch/sparc/Makefile linux-2.6.7-mod/arch/sparc/Makefile
512 --- linux-2.6.7/arch/sparc/Makefile Fri Jun 18 22:51:29 2004
513 +++ linux-2.6.7-mod/arch/sparc/Makefile Sat Jun 19 12:55:48 2004
516 prepare: include/asm-$(ARCH)/asm_offsets.h
518 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
519 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
520 include/config/MARKER
522 -include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
523 +include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
524 $(call filechk,gen-asm-offsets)
526 CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h \
527 - arch/$(ARCH)/kernel/asm-offsets.s \
528 + arch/$(ARCH)/kernel/asm-offsets.asm \
529 arch/$(ARCH)/boot/System.map
531 # Don't use tabs in echo arguments.
532 diff -ur linux-2.6.7/arch/sparc/kernel/Makefile linux-2.6.7-mod/arch/sparc/kernel/Makefile
533 --- linux-2.6.7/arch/sparc/kernel/Makefile Mon May 10 04:33:13 2004
534 +++ linux-2.6.7-mod/arch/sparc/kernel/Makefile Sat Jun 19 12:55:52 2004
536 # Makefile for the linux kernel.
539 -extra-y := head.o init_task.o vmlinux.lds.s
540 +extra-y := head.o init_task.o vmlinux.lds.asm
542 EXTRA_AFLAGS := -ansi
544 diff -ur linux-2.6.7/arch/sparc64/kernel/Makefile linux-2.6.7-mod/arch/sparc64/kernel/Makefile
545 --- linux-2.6.7/arch/sparc64/kernel/Makefile Mon May 10 04:32:02 2004
546 +++ linux-2.6.7-mod/arch/sparc64/kernel/Makefile Sat Jun 19 12:56:24 2004
548 EXTRA_AFLAGS := -ansi
549 EXTRA_CFLAGS := -Werror
551 -extra-y := head.o init_task.o vmlinux.lds.s
552 +extra-y := head.o init_task.o vmlinux.lds.asm
554 obj-y := process.o setup.o cpu.o idprom.o \
555 traps.o devices.o auxio.o \
556 diff -ur linux-2.6.7/arch/um/Makefile linux-2.6.7-mod/arch/um/Makefile
557 --- linux-2.6.7/arch/um/Makefile Mon May 10 04:32:52 2004
558 +++ linux-2.6.7-mod/arch/um/Makefile Sat Jun 19 12:57:07 2004
560 # CONFIG_MODE_SKAS + CONFIG_STATIC_LINK case.
563 -LD_SCRIPT_TT := uml.lds.s
564 +LD_SCRIPT_TT := uml.lds.asm
566 ifeq ($(CONFIG_STATIC_LINK),y)
568 @@ -103,11 +103,11 @@
569 -DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
570 -DKERNEL_STACK_SIZE=$(STACK_SIZE)
572 -AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
573 +AFLAGS_$(LD_SCRIPT-y:.asm=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
575 LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
577 -$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
578 +$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.asm=.S) scripts FORCE
579 $(call if_changed_dep,as_s_S)
581 linux: vmlinux $(LD_SCRIPT-y)
583 # To get a definition of F_SETSIG
584 USER_CFLAGS += -D_GNU_SOURCE
586 -CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
587 - $(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
588 +CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.asm \
589 + $(ARCH_DIR)/dyn_link.ld.asm $(GEN_HEADERS)
591 $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
592 $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
593 diff -ur linux-2.6.7/arch/um/kernel/Makefile linux-2.6.7-mod/arch/um/kernel/Makefile
594 --- linux-2.6.7/arch/um/kernel/Makefile Mon May 10 04:32:53 2004
595 +++ linux-2.6.7-mod/arch/um/kernel/Makefile Sat Jun 19 12:57:15 2004
597 # Licensed under the GPL
600 -extra-y := vmlinux.lds.s
601 +extra-y := vmlinux.lds.asm
603 obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
604 helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
605 diff -ur linux-2.6.7/arch/v850/Makefile linux-2.6.7-mod/arch/v850/Makefile
606 --- linux-2.6.7/arch/v850/Makefile Mon May 10 04:33:21 2004
607 +++ linux-2.6.7-mod/arch/v850/Makefile Sat Jun 19 12:57:59 2004
609 prepare: include/asm-$(ARCH)/asm-consts.h
611 # Generate constants from C code for use by asm files
612 -arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \
613 +arch/$(ARCH)/kernel/asm-consts.asm: include/asm include/linux/version.h \
614 include/config/MARKER
616 -include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s
617 +include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.asm
618 $(call filechk,gen-asm-offsets)
620 CLEAN_FILES += include/asm-$(ARCH)/asm-consts.h \
621 - arch/$(ARCH)/kernel/asm-consts.s \
622 + arch/$(ARCH)/kernel/asm-consts.asm \
624 diff -ur linux-2.6.7/arch/v850/kernel/Makefile linux-2.6.7-mod/arch/v850/kernel/Makefile
625 --- linux-2.6.7/arch/v850/kernel/Makefile Mon May 10 04:33:21 2004
626 +++ linux-2.6.7-mod/arch/v850/kernel/Makefile Sat Jun 19 12:58:04 2004
631 -extra-y := head.o init_task.o vmlinux.lds.s
632 +extra-y := head.o init_task.o vmlinux.lds.asm
634 obj-y += intv.o entry.o process.o syscalls.o time.o semaphore.o setup.o \
635 signal.o irq.o mach.o ptrace.o bug.o
636 diff -ur linux-2.6.7/arch/x86_64/Makefile linux-2.6.7-mod/arch/x86_64/Makefile
637 --- linux-2.6.7/arch/x86_64/Makefile Mon May 10 04:33:19 2004
638 +++ linux-2.6.7-mod/arch/x86_64/Makefile Sat Jun 19 12:58:10 2004
641 prepare: include/asm-$(ARCH)/offset.h
643 -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
644 +arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
645 include/config/MARKER
647 -include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s
648 +include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.asm
649 $(call filechk,gen-asm-offsets)
651 CLEAN_FILES += include/asm-$(ARCH)/offset.h
652 diff -ur linux-2.6.7/arch/x86_64/kernel/Makefile linux-2.6.7-mod/arch/x86_64/kernel/Makefile
653 --- linux-2.6.7/arch/x86_64/kernel/Makefile Fri Jun 18 22:51:32 2004
654 +++ linux-2.6.7-mod/arch/x86_64/kernel/Makefile Sat Jun 19 12:58:17 2004
656 # Makefile for the linux kernel.
659 -extra-y := head.o head64.o init_task.o vmlinux.lds.s
660 +extra-y := head.o head64.o init_task.o vmlinux.lds.asm
661 EXTRA_AFLAGS := -traditional
662 obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
663 ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \
664 diff -ur linux-2.6.7/scripts/Makefile.build linux-2.6.7-mod/scripts/Makefile.build
665 --- linux-2.6.7/scripts/Makefile.build Mon May 10 04:33:13 2004
666 +++ linux-2.6.7-mod/scripts/Makefile.build Sat Jun 19 12:43:10 2004
668 quiet_cmd_cc_s_c = CC $(quiet_modtag) $@
669 cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
673 $(call if_changed_dep,cc_s_c)
675 quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
677 quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
678 cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
682 $(call if_changed_dep,as_s_S)
684 quiet_cmd_as_o_S = AS $(quiet_modtag) $@
685 --- linux-2.6.8/arch/sparc/boot/Makefile.old 2004-09-21 21:46:18.000000000 -0700
686 +++ linux-2.6.8/arch/sparc/boot/Makefile 2004-09-21 21:52:35.000000000 -0700
689 BTOBJS := $(HEAD_Y) $(INIT_Y)
690 BTLIBS := $(CORE_Y) $(LIBS_Y) $(DRIVERS_Y) $(NET_Y)
691 -LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.s $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
692 +LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.asm $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
695 $(obj)/image: $(obj)/btfix.o FORCE
696 --- linux-2.6.8/arch/sh64/Makefile.old 2004-09-21 21:46:18.000000000 -0700
697 +++ linux-2.6.8/arch/sh64/Makefile 2004-09-21 21:54:31.000000000 -0700
700 prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
702 -include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
703 +include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
704 include/asm include/linux/version.h
705 $(call filechk,gen-asm-offsets)
707 --- linux-2.6.8/arch/sh64/boot/compressed/Makefile.old 2004-09-21 21:46:18.000000000 -0700
708 +++ linux-2.6.8/arch/sh64/boot/compressed/Makefile 2004-09-21 21:54:41.000000000 -0700
710 ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[$(CONFIG_MEMORY_START)+0x400000+0x10000])
712 LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \
713 - -T $(obj)/../../kernel/vmlinux.lds.s \
714 + -T $(obj)/../../kernel/vmlinux.lds.asm \
717 $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
719 LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T
720 OBJCOPYFLAGS += -R .empty_zero_page
722 -$(obj)/piggy.o: $(obj)/vmlinux.lds.s $(obj)/vmlinux.bin.gz FORCE
723 +$(obj)/piggy.o: $(obj)/vmlinux.lds.asm $(obj)/vmlinux.bin.gz FORCE
724 $(call if_changed,ld)