patches/linux/2.6.8/linux-2.6.8-build_on_case_insensitive_fs.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Feb 24 11:00:05 2007 +0000 (2007-02-24)
changeset 1 eeea35fbf182
permissions -rw-r--r--
Add the full crosstool-NG sources to the new repository of its own.
You might just say: 'Yeah! crosstool-NG's got its own repo!".
Unfortunately, that's because the previous repo got damaged beyond repair and I had no backup.
That means I'm putting backups in place in the afternoon.
That also means we've lost history... :-(
yann@1
     1
Submitted By: Martin Schaffner <schaffner@gmx.li>
yann@1
     2
Date: 2004-06-19
yann@1
     3
Initial Package Version: 2.6.7
yann@1
     4
Upstream Status: Not submitted
yann@1
     5
Origin: Martin Schaffner
yann@1
     6
Description: Enables build on case-insensitive file systems
yann@1
     7
URL: xxxhttp://mirror.vtx.ch/lfs/patches/downloads/linux/linux-2.6.7-build_on_case_insensitive_fs-1.patch
yann@1
     8
--- Rediffed against 2.6.8 by dank@kegel.com
yann@1
     9
--- plus a few missing hunks added to fix sparc32 build
yann@1
    10
yann@1
    11
--- linux-2.6.8/Makefile.orig	2004-08-13 22:37:25.000000000 -0700
yann@1
    12
+++ linux-2.6.8/Makefile	2004-09-01 21:39:39.000000000 -0700
yann@1
    13
@@ -540,7 +540,7 @@
yann@1
    14
 
yann@1
    15
 do_system_map = $(NM) $(1) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > $(2)
yann@1
    16
 
yann@1
    17
-LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.s
yann@1
    18
+LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.asm
yann@1
    19
 
yann@1
    20
 #	Generate section listing all symbols and add it into vmlinux
yann@1
    21
 #	It's a three stage process:
yann@1
    22
@@ -584,13 +584,13 @@
yann@1
    23
 .tmp_kallsyms%.S: .tmp_vmlinux%
yann@1
    24
 	$(call cmd,kallsyms)
yann@1
    25
 
yann@1
    26
-.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
yann@1
    27
+.tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
yann@1
    28
 	$(call if_changed_rule,vmlinux__)
yann@1
    29
 
yann@1
    30
-.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
yann@1
    31
+.tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
yann@1
    32
 	$(call if_changed_rule,vmlinux__)
yann@1
    33
 
yann@1
    34
-.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
yann@1
    35
+.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
yann@1
    36
 	$(call if_changed_rule,vmlinux__)
yann@1
    37
 
yann@1
    38
 endif
yann@1
    39
@@ -603,13 +603,13 @@
yann@1
    40
 	$(rule_verify_kallsyms)
yann@1
    41
 endef
yann@1
    42
 
yann@1
    43
-vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
yann@1
    44
+vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.asm FORCE
yann@1
    45
 	$(call if_changed_rule,vmlinux)
yann@1
    46
 
yann@1
    47
 #	The actual objects are generated when descending, 
yann@1
    48
 #	make sure no implicit rule kicks in
yann@1
    49
 
yann@1
    50
-$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.s: $(vmlinux-dirs) ;
yann@1
    51
+$(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.asm: $(vmlinux-dirs) ;
yann@1
    52
 
yann@1
    53
 # Handle descending into subdirectories listed in $(vmlinux-dirs)
yann@1
    54
 # Preset locale variables to speed up the build process. Limit locale
yann@1
    55
@@ -672,7 +672,7 @@
yann@1
    56
 # Single targets
yann@1
    57
 # ---------------------------------------------------------------------------
yann@1
    58
 
yann@1
    59
-%.s: %.c scripts FORCE
yann@1
    60
+%.asm: %.c scripts FORCE
yann@1
    61
 	$(Q)$(MAKE) $(build)=$(@D) $@
yann@1
    62
 %.i: %.c scripts FORCE
yann@1
    63
 	$(Q)$(MAKE) $(build)=$(@D) $@
yann@1
    64
@@ -682,7 +682,7 @@
yann@1
    65
 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D)
yann@1
    66
 %.lst: %.c scripts FORCE
yann@1
    67
 	$(Q)$(MAKE) $(build)=$(@D) $@
yann@1
    68
-%.s: %.S scripts FORCE
yann@1
    69
+%.asm: %.S scripts FORCE
yann@1
    70
 	$(Q)$(MAKE) $(build)=$(@D) $@
yann@1
    71
 %.o: %.S scripts FORCE
yann@1
    72
 	$(Q)$(MAKE) $(build)=$(@D) $@
yann@1
    73
diff -ur linux-2.6.7/arch/alpha/Makefile linux-2.6.7-mod/arch/alpha/Makefile
yann@1
    74
--- linux-2.6.7/arch/alpha/Makefile	Fri Jun 18 22:51:03 2004
yann@1
    75
+++ linux-2.6.7-mod/arch/alpha/Makefile	Sat Jun 19 12:46:32 2004
yann@1
    76
@@ -114,10 +114,10 @@
yann@1
    77
 
yann@1
    78
 prepare: include/asm-$(ARCH)/asm_offsets.h
yann@1
    79
 
yann@1
    80
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
    81
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
    82
 				   include/config/MARKER
yann@1
    83
 
yann@1
    84
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
    85
+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
    86
 	$(call filechk,gen-asm-offsets)
yann@1
    87
 
yann@1
    88
 archclean:
yann@1
    89
diff -ur linux-2.6.7/arch/alpha/kernel/Makefile linux-2.6.7-mod/arch/alpha/kernel/Makefile
yann@1
    90
--- linux-2.6.7/arch/alpha/kernel/Makefile	Mon May 10 04:32:29 2004
yann@1
    91
+++ linux-2.6.7-mod/arch/alpha/kernel/Makefile	Sat Jun 19 12:46:48 2004
yann@1
    92
@@ -2,7 +2,7 @@
yann@1
    93
 # Makefile for the linux kernel.
yann@1
    94
 #
yann@1
    95
 
yann@1
    96
-extra-y		:= head.o vmlinux.lds.s
yann@1
    97
+extra-y		:= head.o vmlinux.lds.asm
yann@1
    98
 EXTRA_AFLAGS	:= $(CFLAGS)
yann@1
    99
 EXTRA_CFLAGS	:= -Werror -Wno-sign-compare
yann@1
   100
 
yann@1
   101
--- linux-2.6.8/arch/arm/Makefile.orig	2004-08-13 22:36:56.000000000 -0700
yann@1
   102
+++ linux-2.6.8/arch/arm/Makefile	2004-09-01 21:40:21.000000000 -0700
yann@1
   103
@@ -176,10 +176,10 @@
yann@1
   104
 bp:;	$(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage
yann@1
   105
 i zi:;	$(Q)$(MAKE) $(build)=$(boot) $@
yann@1
   106
 
yann@1
   107
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   108
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   109
 				   include/asm-arm/.arch
yann@1
   110
 
yann@1
   111
-include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   112
+include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   113
 	$(call filechk,gen-asm-offsets)
yann@1
   114
 
yann@1
   115
 define archhelp
yann@1
   116
diff -ur linux-2.6.7/arch/arm/kernel/Makefile linux-2.6.7-mod/arch/arm/kernel/Makefile
yann@1
   117
--- linux-2.6.7/arch/arm/kernel/Makefile	Mon May 10 04:33:19 2004
yann@1
   118
+++ linux-2.6.7-mod/arch/arm/kernel/Makefile	Sat Jun 19 12:47:25 2004
yann@1
   119
@@ -27,7 +27,7 @@
yann@1
   120
 head-y			:= head.o
yann@1
   121
 obj-$(CONFIG_DEBUG_LL)	+= debug.o
yann@1
   122
 
yann@1
   123
-extra-y := $(head-y) init_task.o vmlinux.lds.s
yann@1
   124
+extra-y := $(head-y) init_task.o vmlinux.lds.asm
yann@1
   125
 
yann@1
   126
 # Spell out some dependencies that aren't automatically figured out
yann@1
   127
 $(obj)/entry-armv.o: 	$(obj)/entry-header.S include/asm-arm/constants.h
yann@1
   128
diff -ur linux-2.6.7/arch/arm26/Makefile linux-2.6.7-mod/arch/arm26/Makefile
yann@1
   129
--- linux-2.6.7/arch/arm26/Makefile	Mon May 10 04:32:28 2004
yann@1
   130
+++ linux-2.6.7-mod/arch/arm26/Makefile	Sat Jun 19 12:48:24 2004
yann@1
   131
@@ -101,10 +101,10 @@
yann@1
   132
 	fi; \
yann@1
   133
 	)
yann@1
   134
 
yann@1
   135
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   136
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   137
 				   include/config/MARKER
yann@1
   138
 
yann@1
   139
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   140
+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   141
 	$(call filechk,gen-asm-offsets)
yann@1
   142
 
yann@1
   143
 define archhelp
yann@1
   144
diff -ur linux-2.6.7/arch/arm26/kernel/Makefile linux-2.6.7-mod/arch/arm26/kernel/Makefile
yann@1
   145
--- linux-2.6.7/arch/arm26/kernel/Makefile	Mon May 10 04:32:29 2004
yann@1
   146
+++ linux-2.6.7-mod/arch/arm26/kernel/Makefile	Sat Jun 19 12:48:30 2004
yann@1
   147
@@ -14,5 +14,5 @@
yann@1
   148
 obj-$(CONFIG_FIQ)		+= fiq.o
yann@1
   149
 obj-$(CONFIG_MODULES)		+= armksyms.o
yann@1
   150
 
yann@1
   151
-extra-y := init_task.o vmlinux.lds.s
yann@1
   152
+extra-y := init_task.o vmlinux.lds.asm
yann@1
   153
 
yann@1
   154
diff -ur linux-2.6.7/arch/cris/Makefile linux-2.6.7-mod/arch/cris/Makefile
yann@1
   155
--- linux-2.6.7/arch/cris/Makefile	Fri Jun 18 22:51:07 2004
yann@1
   156
+++ linux-2.6.7-mod/arch/cris/Makefile	Sat Jun 19 12:48:47 2004
yann@1
   157
@@ -107,8 +107,8 @@
yann@1
   158
 	@ln -sf $(SARCH) include/asm-$(ARCH)/arch
yann@1
   159
 	@touch $@
yann@1
   160
 
yann@1
   161
-arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   162
+arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   163
 					include/config/MARKER
yann@1
   164
 
yann@1
   165
-include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
yann@1
   166
+include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.asm
yann@1
   167
 	$(call filechk,gen-asm-offsets)
yann@1
   168
diff -ur linux-2.6.7/arch/cris/kernel/Makefile linux-2.6.7-mod/arch/cris/kernel/Makefile
yann@1
   169
--- linux-2.6.7/arch/cris/kernel/Makefile	Fri Jun 18 22:51:09 2004
yann@1
   170
+++ linux-2.6.7-mod/arch/cris/kernel/Makefile	Sat Jun 19 12:48:53 2004
yann@1
   171
@@ -3,7 +3,7 @@
yann@1
   172
 # Makefile for the linux kernel.
yann@1
   173
 #
yann@1
   174
 
yann@1
   175
-extra-y	:= vmlinux.lds.s
yann@1
   176
+extra-y	:= vmlinux.lds.asm
yann@1
   177
 
yann@1
   178
 obj-y   := process.o traps.o irq.o ptrace.o setup.o \
yann@1
   179
 	   time.o sys_cris.o semaphore.o
yann@1
   180
diff -ur linux-2.6.7/arch/h8300/Makefile linux-2.6.7-mod/arch/h8300/Makefile
yann@1
   181
--- linux-2.6.7/arch/h8300/Makefile	Fri Jun 18 22:51:09 2004
yann@1
   182
+++ linux-2.6.7-mod/arch/h8300/Makefile	Sat Jun 19 12:49:12 2004
yann@1
   183
@@ -64,7 +64,7 @@
yann@1
   184
 
yann@1
   185
 prepare: include/asm-$(ARCH)/asm-offsets.h
yann@1
   186
 
yann@1
   187
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
yann@1
   188
+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
yann@1
   189
 				   include/asm include/linux/version.h
yann@1
   190
 	$(call filechk,gen-asm-offsets)
yann@1
   191
 
yann@1
   192
diff -ur linux-2.6.7/arch/h8300/kernel/Makefile linux-2.6.7-mod/arch/h8300/kernel/Makefile
yann@1
   193
--- linux-2.6.7/arch/h8300/kernel/Makefile	Fri Jun 18 22:51:09 2004
yann@1
   194
+++ linux-2.6.7-mod/arch/h8300/kernel/Makefile	Sat Jun 19 12:49:32 2004
yann@1
   195
@@ -2,7 +2,7 @@
yann@1
   196
 # Makefile for the linux kernel.
yann@1
   197
 #
yann@1
   198
 
yann@1
   199
-extra-y := vmlinux.lds.s
yann@1
   200
+extra-y := vmlinux.lds.asm
yann@1
   201
 
yann@1
   202
 obj-y := process.o traps.o ptrace.o ints.o \
yann@1
   203
 	 sys_h8300.o time.o semaphore.o signal.o \
yann@1
   204
diff -ur linux-2.6.7/arch/i386/Makefile linux-2.6.7-mod/arch/i386/Makefile
yann@1
   205
--- linux-2.6.7/arch/i386/Makefile	Fri Jun 18 22:51:10 2004
yann@1
   206
+++ linux-2.6.7-mod/arch/i386/Makefile	Sat Jun 19 12:49:43 2004
yann@1
   207
@@ -141,10 +141,10 @@
yann@1
   208
 prepare: include/asm-$(ARCH)/asm_offsets.h
yann@1
   209
 CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
yann@1
   210
 
yann@1
   211
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   212
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   213
 				   include/config/MARKER
yann@1
   214
 
yann@1
   215
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   216
+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   217
 	$(call filechk,gen-asm-offsets)
yann@1
   218
 
yann@1
   219
 archclean:
yann@1
   220
diff -ur linux-2.6.7/arch/i386/kernel/Makefile linux-2.6.7-mod/arch/i386/kernel/Makefile
yann@1
   221
--- linux-2.6.7/arch/i386/kernel/Makefile	Mon May 10 04:32:02 2004
yann@1
   222
+++ linux-2.6.7-mod/arch/i386/kernel/Makefile	Sat Jun 19 12:49:54 2004
yann@1
   223
@@ -2,7 +2,7 @@
yann@1
   224
 # Makefile for the linux kernel.
yann@1
   225
 #
yann@1
   226
 
yann@1
   227
-extra-y := head.o init_task.o vmlinux.lds.s
yann@1
   228
+extra-y := head.o init_task.o vmlinux.lds.asm
yann@1
   229
 
yann@1
   230
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
yann@1
   231
 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
yann@1
   232
diff -ur linux-2.6.7/arch/ia64/Makefile linux-2.6.7-mod/arch/ia64/Makefile
yann@1
   233
--- linux-2.6.7/arch/ia64/Makefile	Mon May 10 04:31:59 2004
yann@1
   234
+++ linux-2.6.7-mod/arch/ia64/Makefile	Sat Jun 19 12:50:12 2004
yann@1
   235
@@ -88,12 +88,12 @@
yann@1
   236
 
yann@1
   237
 prepare: include/asm-ia64/offsets.h
yann@1
   238
 
yann@1
   239
-arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
yann@1
   240
+arch/ia64/kernel/asm-offsets.asm: include/asm include/linux/version.h include/config/MARKER
yann@1
   241
 
yann@1
   242
-include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
yann@1
   243
+include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.asm
yann@1
   244
 	$(call filechk,gen-asm-offsets)
yann@1
   245
 
yann@1
   246
-arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
yann@1
   247
+arch/ia64/kernel/asm-offsets.asm: include/asm-ia64/.offsets.h.stamp
yann@1
   248
 
yann@1
   249
 include/asm-ia64/.offsets.h.stamp:
yann@1
   250
 	mkdir -p include/asm-ia64
yann@1
   251
diff -ur linux-2.6.7/arch/ia64/kernel/Makefile linux-2.6.7-mod/arch/ia64/kernel/Makefile
yann@1
   252
--- linux-2.6.7/arch/ia64/kernel/Makefile	Fri Jun 18 22:51:13 2004
yann@1
   253
+++ linux-2.6.7-mod/arch/ia64/kernel/Makefile	Sat Jun 19 12:52:14 2004
yann@1
   254
@@ -2,7 +2,7 @@
yann@1
   255
 # Makefile for the linux kernel.
yann@1
   256
 #
yann@1
   257
 
yann@1
   258
-extra-y	:= head.o init_task.o vmlinux.lds.s
yann@1
   259
+extra-y	:= head.o init_task.o vmlinux.lds.asm
yann@1
   260
 
yann@1
   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	\
yann@1
   262
 	 irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o		\
yann@1
   263
@@ -21,7 +21,7 @@
yann@1
   264
 # The gate DSO image is built using a special linker script.
yann@1
   265
 targets += gate.so gate-syms.o
yann@1
   266
 
yann@1
   267
-extra-y += gate.so gate-syms.o gate.lds.s gate.o
yann@1
   268
+extra-y += gate.so gate-syms.o gate.lds.asm gate.o
yann@1
   269
 
yann@1
   270
 # fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
yann@1
   271
 CFLAGS_traps.o  += -mfixed-range=f2-f5,f16-f31
yann@1
   272
@@ -32,14 +32,14 @@
yann@1
   273
       cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
yann@1
   274
 
yann@1
   275
 GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1
yann@1
   276
-$(obj)/gate.so: $(obj)/gate.lds.s $(obj)/gate.o FORCE
yann@1
   277
+$(obj)/gate.so: $(obj)/gate.lds.asm $(obj)/gate.o FORCE
yann@1
   278
 	$(call if_changed,gate)
yann@1
   279
 
yann@1
   280
 $(obj)/built-in.o: $(obj)/gate-syms.o
yann@1
   281
 $(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
yann@1
   282
 
yann@1
   283
 GATECFLAGS_gate-syms.o = -r
yann@1
   284
-$(obj)/gate-syms.o: $(src)/gate.lds.s $(obj)/gate.o FORCE
yann@1
   285
+$(obj)/gate-syms.o: $(src)/gate.lds.asm $(obj)/gate.o FORCE
yann@1
   286
 	$(call if_changed,gate)
yann@1
   287
 
yann@1
   288
 # gate-data.o contains the gate DSO image as data in section .data.gate.
yann@1
   289
diff -ur linux-2.6.7/arch/m68k/Makefile linux-2.6.7-mod/arch/m68k/Makefile
yann@1
   290
--- linux-2.6.7/arch/m68k/Makefile	Fri Jun 18 22:51:14 2004
yann@1
   291
+++ linux-2.6.7-mod/arch/m68k/Makefile	Sat Jun 19 12:52:30 2004
yann@1
   292
@@ -114,10 +114,10 @@
yann@1
   293
 prepare: include/asm-$(ARCH)/offsets.h
yann@1
   294
 CLEAN_FILES += include/asm-$(ARCH)/offsets.h
yann@1
   295
 
yann@1
   296
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   297
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   298
 				   include/config/MARKER
yann@1
   299
 
yann@1
   300
-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   301
+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   302
 	$(call filechk,gen-asm-offsets)
yann@1
   303
 
yann@1
   304
 archclean:
yann@1
   305
diff -ur linux-2.6.7/arch/m68k/kernel/Makefile linux-2.6.7-mod/arch/m68k/kernel/Makefile
yann@1
   306
--- linux-2.6.7/arch/m68k/kernel/Makefile	Mon May 10 04:33:10 2004
yann@1
   307
+++ linux-2.6.7-mod/arch/m68k/kernel/Makefile	Sat Jun 19 12:52:35 2004
yann@1
   308
@@ -7,7 +7,7 @@
yann@1
   309
 else
yann@1
   310
   extra-y := sun3-head.o
yann@1
   311
 endif
yann@1
   312
-extra-y	+= vmlinux.lds.s
yann@1
   313
+extra-y	+= vmlinux.lds.asm
yann@1
   314
 
yann@1
   315
 obj-y		:= entry.o process.o traps.o ints.o signal.o ptrace.o \
yann@1
   316
 			sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
yann@1
   317
diff -ur linux-2.6.7/arch/m68knommu/Makefile linux-2.6.7-mod/arch/m68knommu/Makefile
yann@1
   318
--- linux-2.6.7/arch/m68knommu/Makefile	Mon May 10 04:32:54 2004
yann@1
   319
+++ linux-2.6.7-mod/arch/m68knommu/Makefile	Sat Jun 19 12:52:57 2004
yann@1
   320
@@ -89,7 +89,7 @@
yann@1
   321
 head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
yann@1
   322
 
yann@1
   323
 CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
yann@1
   324
-	       arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   325
+	       arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   326
 
yann@1
   327
 core-y	+= arch/m68knommu/kernel/ \
yann@1
   328
 	   arch/m68knommu/mm/ \
yann@1
   329
@@ -102,7 +102,7 @@
yann@1
   330
 archclean:
yann@1
   331
 	$(call descend arch/$(ARCH)/boot, subdirclean)
yann@1
   332
 
yann@1
   333
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
yann@1
   334
+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
yann@1
   335
 				   include/asm include/linux/version.h \
yann@1
   336
 				   include/config/MARKER
yann@1
   337
 	$(call filechk,gen-asm-offsets)
yann@1
   338
diff -ur linux-2.6.7/arch/m68knommu/kernel/Makefile linux-2.6.7-mod/arch/m68knommu/kernel/Makefile
yann@1
   339
--- linux-2.6.7/arch/m68knommu/kernel/Makefile	Mon May 10 04:32:26 2004
yann@1
   340
+++ linux-2.6.7-mod/arch/m68knommu/kernel/Makefile	Sat Jun 19 12:53:20 2004
yann@1
   341
@@ -2,7 +2,7 @@
yann@1
   342
 # Makefile for arch/m68knommu/kernel.
yann@1
   343
 #
yann@1
   344
 
yann@1
   345
-extra-y := vmlinux.lds.s
yann@1
   346
+extra-y := vmlinux.lds.asm
yann@1
   347
 
yann@1
   348
 obj-y += dma.o entry.o init_task.o m68k_ksyms.o process.o ptrace.o semaphore.o \
yann@1
   349
 	 setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
yann@1
   350
diff -ur linux-2.6.7/arch/mips/Makefile linux-2.6.7-mod/arch/mips/Makefile
yann@1
   351
--- linux-2.6.7/arch/mips/Makefile	Fri Jun 18 22:51:19 2004
yann@1
   352
+++ linux-2.6.7-mod/arch/mips/Makefile	Sat Jun 19 12:53:35 2004
yann@1
   353
@@ -752,12 +752,12 @@
yann@1
   354
 prepare: include/asm-$(ARCH)/offset.h \
yann@1
   355
 	 include/asm-$(ARCH)/reg.h
yann@1
   356
 
yann@1
   357
-arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \
yann@1
   358
+arch/$(ARCH)/kernel/offset.asm: include/asm include/linux/version.h \
yann@1
   359
 				   include/config/MARKER
yann@1
   360
 
yann@1
   361
-include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
yann@1
   362
+include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.asm
yann@1
   363
 	$(call filechk,gen-asm-offset.h)
yann@1
   364
-include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.s
yann@1
   365
+include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.asm
yann@1
   366
 	$(call filechk,gen-asm-reg.h)
yann@1
   367
 
yann@1
   368
 CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \
yann@1
   369
diff -ur linux-2.6.7/arch/mips/kernel/Makefile linux-2.6.7-mod/arch/mips/kernel/Makefile
yann@1
   370
--- linux-2.6.7/arch/mips/kernel/Makefile	Mon May 10 04:32:28 2004
yann@1
   371
+++ linux-2.6.7-mod/arch/mips/kernel/Makefile	Sat Jun 19 12:53:41 2004
yann@1
   372
@@ -2,7 +2,7 @@
yann@1
   373
 # Makefile for the Linux/MIPS kernel.
yann@1
   374
 #
yann@1
   375
 
yann@1
   376
-extra-y		:= head.o init_task.o vmlinux.lds.s
yann@1
   377
+extra-y		:= head.o init_task.o vmlinux.lds.asm
yann@1
   378
 
yann@1
   379
 obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \
yann@1
   380
 		   ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
yann@1
   381
diff -ur linux-2.6.7/arch/parisc/Makefile linux-2.6.7-mod/arch/parisc/Makefile
yann@1
   382
--- linux-2.6.7/arch/parisc/Makefile	Fri Jun 18 22:51:21 2004
yann@1
   383
+++ linux-2.6.7-mod/arch/parisc/Makefile	Sat Jun 19 12:53:47 2004
yann@1
   384
@@ -88,10 +88,10 @@
yann@1
   385
 
yann@1
   386
 prepare: include/asm-parisc/offsets.h
yann@1
   387
 
yann@1
   388
-arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   389
+arch/parisc/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   390
 				   include/config/MARKER
yann@1
   391
 
yann@1
   392
-include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s
yann@1
   393
+include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.asm
yann@1
   394
 	$(call filechk,gen-asm-offsets)
yann@1
   395
 
yann@1
   396
 CLEAN_FILES	+= lifimage include/asm-parisc/offsets.h
yann@1
   397
diff -ur linux-2.6.7/arch/parisc/kernel/Makefile linux-2.6.7-mod/arch/parisc/kernel/Makefile
yann@1
   398
--- linux-2.6.7/arch/parisc/kernel/Makefile	Fri Jun 18 22:51:21 2004
yann@1
   399
+++ linux-2.6.7-mod/arch/parisc/kernel/Makefile	Sat Jun 19 12:53:53 2004
yann@1
   400
@@ -4,7 +4,7 @@
yann@1
   401
 
yann@1
   402
 head-y			:= head.o
yann@1
   403
 head-$(CONFIG_PARISC64)	:= head64.o
yann@1
   404
-extra-y			:= init_task.o $(head-y) vmlinux.lds.s
yann@1
   405
+extra-y			:= init_task.o $(head-y) vmlinux.lds.asm
yann@1
   406
 
yann@1
   407
 AFLAGS_entry.o	:= -traditional
yann@1
   408
 AFLAGS_pacache.o := -traditional
yann@1
   409
diff -ur linux-2.6.7/arch/ppc/Makefile linux-2.6.7-mod/arch/ppc/Makefile
yann@1
   410
--- linux-2.6.7/arch/ppc/Makefile	Fri Jun 18 22:51:22 2004
yann@1
   411
+++ linux-2.6.7-mod/arch/ppc/Makefile	Sat Jun 19 12:54:09 2004
yann@1
   412
@@ -78,10 +78,10 @@
yann@1
   413
 
yann@1
   414
 prepare: include/asm-$(ARCH)/offsets.h checkbin
yann@1
   415
 
yann@1
   416
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   417
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   418
 				   include/config/MARKER
yann@1
   419
 
yann@1
   420
-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   421
+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   422
 	$(call filechk,gen-asm-offsets)
yann@1
   423
 
yann@1
   424
 ifdef CONFIG_6xx
yann@1
   425
@@ -104,4 +104,4 @@
yann@1
   426
 endif
yann@1
   427
 
yann@1
   428
 CLEAN_FILES +=	include/asm-$(ARCH)/offsets.h \
yann@1
   429
-		arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   430
+		arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   431
diff -ur linux-2.6.7/arch/ppc/kernel/Makefile linux-2.6.7-mod/arch/ppc/kernel/Makefile
yann@1
   432
--- linux-2.6.7/arch/ppc/kernel/Makefile	Fri Jun 18 22:51:24 2004
yann@1
   433
+++ linux-2.6.7-mod/arch/ppc/kernel/Makefile	Sat Jun 19 12:43:10 2004
yann@1
   434
@@ -15,7 +15,7 @@
yann@1
   435
 extra-$(CONFIG_8xx)		:= head_8xx.o
yann@1
   436
 extra-$(CONFIG_6xx)		+= idle_6xx.o
yann@1
   437
 extra-$(CONFIG_POWER4)		+= idle_power4.o
yann@1
   438
-extra-y				+= vmlinux.lds.s
yann@1
   439
+extra-y				+= vmlinux.lds.asm
yann@1
   440
 
yann@1
   441
 obj-y				:= entry.o traps.o irq.o idle.o time.o misc.o \
yann@1
   442
 					process.o signal.o ptrace.o align.o \
yann@1
   443
diff -ur linux-2.6.7/arch/ppc64/Makefile linux-2.6.7-mod/arch/ppc64/Makefile
yann@1
   444
--- linux-2.6.7/arch/ppc64/Makefile	Fri Jun 18 22:51:26 2004
yann@1
   445
+++ linux-2.6.7-mod/arch/ppc64/Makefile	Sat Jun 19 12:54:32 2004
yann@1
   446
@@ -67,10 +67,10 @@
yann@1
   447
 
yann@1
   448
 prepare: include/asm-ppc64/offsets.h
yann@1
   449
 
yann@1
   450
-arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   451
+arch/ppc64/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   452
 				   include/config/MARKER
yann@1
   453
 
yann@1
   454
-include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
yann@1
   455
+include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.asm
yann@1
   456
 	$(call filechk,gen-asm-offsets)
yann@1
   457
 
yann@1
   458
 define archhelp
yann@1
   459
diff -ur linux-2.6.7/arch/ppc64/kernel/Makefile linux-2.6.7-mod/arch/ppc64/kernel/Makefile
yann@1
   460
--- linux-2.6.7/arch/ppc64/kernel/Makefile	Mon May 10 04:33:20 2004
yann@1
   461
+++ linux-2.6.7-mod/arch/ppc64/kernel/Makefile	Sat Jun 19 12:54:39 2004
yann@1
   462
@@ -3,7 +3,7 @@
yann@1
   463
 #
yann@1
   464
 
yann@1
   465
 EXTRA_CFLAGS	+= -mno-minimal-toc
yann@1
   466
-extra-y		:= head.o vmlinux.lds.s
yann@1
   467
+extra-y		:= head.o vmlinux.lds.asm
yann@1
   468
 
yann@1
   469
 obj-y               :=	setup.o entry.o traps.o irq.o idle.o dma.o \
yann@1
   470
 			time.o process.o signal.o syscalls.o misc.o ptrace.o \
yann@1
   471
diff -ur linux-2.6.7/arch/s390/Makefile linux-2.6.7-mod/arch/s390/Makefile
yann@1
   472
--- linux-2.6.7/arch/s390/Makefile	Mon May 10 04:32:02 2004
yann@1
   473
+++ linux-2.6.7-mod/arch/s390/Makefile	Sat Jun 19 12:54:46 2004
yann@1
   474
@@ -68,10 +68,10 @@
yann@1
   475
 
yann@1
   476
 prepare: include/asm-$(ARCH)/offsets.h
yann@1
   477
 
yann@1
   478
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   479
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   480
 				   include/config/MARKER
yann@1
   481
 
yann@1
   482
-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   483
+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   484
 	$(call filechk,gen-asm-offsets)
yann@1
   485
 
yann@1
   486
 CLEAN_FILES += include/asm-$(ARCH)/offsets.h
yann@1
   487
diff -ur linux-2.6.7/arch/s390/kernel/Makefile linux-2.6.7-mod/arch/s390/kernel/Makefile
yann@1
   488
--- linux-2.6.7/arch/s390/kernel/Makefile	Mon May 10 04:33:20 2004
yann@1
   489
+++ linux-2.6.7-mod/arch/s390/kernel/Makefile	Sat Jun 19 12:54:52 2004
yann@1
   490
@@ -10,7 +10,7 @@
yann@1
   491
 
yann@1
   492
 extra-$(CONFIG_ARCH_S390_31)	+= head.o 
yann@1
   493
 extra-$(CONFIG_ARCH_S390X)	+= head64.o 
yann@1
   494
-extra-y				+= init_task.o vmlinux.lds.s
yann@1
   495
+extra-y				+= init_task.o vmlinux.lds.asm
yann@1
   496
 
yann@1
   497
 obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o
yann@1
   498
 obj-$(CONFIG_SMP)		+= smp.o
yann@1
   499
diff -ur linux-2.6.7/arch/sh/kernel/Makefile linux-2.6.7-mod/arch/sh/kernel/Makefile
yann@1
   500
--- linux-2.6.7/arch/sh/kernel/Makefile	Mon May 10 04:32:39 2004
yann@1
   501
+++ linux-2.6.7-mod/arch/sh/kernel/Makefile	Sat Jun 19 12:55:33 2004
yann@1
   502
@@ -2,7 +2,7 @@
yann@1
   503
 # Makefile for the Linux/SuperH kernel.
yann@1
   504
 #
yann@1
   505
 
yann@1
   506
-extra-y	:= head.o init_task.o vmlinux.lds.s
yann@1
   507
+extra-y	:= head.o init_task.o vmlinux.lds.asm
yann@1
   508
 
yann@1
   509
 obj-y	:= process.o signal.o entry.o traps.o irq.o \
yann@1
   510
 	ptrace.o setup.o time.o sys_sh.o semaphore.o \
yann@1
   511
diff -ur linux-2.6.7/arch/sparc/Makefile linux-2.6.7-mod/arch/sparc/Makefile
yann@1
   512
--- linux-2.6.7/arch/sparc/Makefile	Fri Jun 18 22:51:29 2004
yann@1
   513
+++ linux-2.6.7-mod/arch/sparc/Makefile	Sat Jun 19 12:55:48 2004
yann@1
   514
@@ -61,14 +61,14 @@
yann@1
   515
 
yann@1
   516
 prepare: include/asm-$(ARCH)/asm_offsets.h
yann@1
   517
 
yann@1
   518
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   519
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   520
 				   include/config/MARKER
yann@1
   521
 
yann@1
   522
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   523
+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   524
 	$(call filechk,gen-asm-offsets)
yann@1
   525
 
yann@1
   526
 CLEAN_FILES +=	include/asm-$(ARCH)/asm_offsets.h	\
yann@1
   527
-		arch/$(ARCH)/kernel/asm-offsets.s	\
yann@1
   528
+		arch/$(ARCH)/kernel/asm-offsets.asm	\
yann@1
   529
 		arch/$(ARCH)/boot/System.map
yann@1
   530
 
yann@1
   531
 # Don't use tabs in echo arguments.
yann@1
   532
diff -ur linux-2.6.7/arch/sparc/kernel/Makefile linux-2.6.7-mod/arch/sparc/kernel/Makefile
yann@1
   533
--- linux-2.6.7/arch/sparc/kernel/Makefile	Mon May 10 04:33:13 2004
yann@1
   534
+++ linux-2.6.7-mod/arch/sparc/kernel/Makefile	Sat Jun 19 12:55:52 2004
yann@1
   535
@@ -2,7 +2,7 @@
yann@1
   536
 # Makefile for the linux kernel.
yann@1
   537
 #
yann@1
   538
 
yann@1
   539
-extra-y		:= head.o init_task.o vmlinux.lds.s
yann@1
   540
+extra-y		:= head.o init_task.o vmlinux.lds.asm
yann@1
   541
 
yann@1
   542
 EXTRA_AFLAGS	:= -ansi
yann@1
   543
 
yann@1
   544
diff -ur linux-2.6.7/arch/sparc64/kernel/Makefile linux-2.6.7-mod/arch/sparc64/kernel/Makefile
yann@1
   545
--- linux-2.6.7/arch/sparc64/kernel/Makefile	Mon May 10 04:32:02 2004
yann@1
   546
+++ linux-2.6.7-mod/arch/sparc64/kernel/Makefile	Sat Jun 19 12:56:24 2004
yann@1
   547
@@ -5,7 +5,7 @@
yann@1
   548
 EXTRA_AFLAGS := -ansi
yann@1
   549
 EXTRA_CFLAGS := -Werror
yann@1
   550
 
yann@1
   551
-extra-y		:= head.o init_task.o vmlinux.lds.s
yann@1
   552
+extra-y		:= head.o init_task.o vmlinux.lds.asm
yann@1
   553
 
yann@1
   554
 obj-y		:= process.o setup.o cpu.o idprom.o \
yann@1
   555
 		   traps.o devices.o auxio.o \
yann@1
   556
diff -ur linux-2.6.7/arch/um/Makefile linux-2.6.7-mod/arch/um/Makefile
yann@1
   557
--- linux-2.6.7/arch/um/Makefile	Mon May 10 04:32:52 2004
yann@1
   558
+++ linux-2.6.7-mod/arch/um/Makefile	Sat Jun 19 12:57:07 2004
yann@1
   559
@@ -77,7 +77,7 @@
yann@1
   560
 # CONFIG_MODE_SKAS + CONFIG_STATIC_LINK case.
yann@1
   561
 
yann@1
   562
 LINK_TT = -static
yann@1
   563
-LD_SCRIPT_TT := uml.lds.s
yann@1
   564
+LD_SCRIPT_TT := uml.lds.asm
yann@1
   565
 
yann@1
   566
 ifeq ($(CONFIG_STATIC_LINK),y)
yann@1
   567
   LINK-y += $(LINK_TT)
yann@1
   568
@@ -103,11 +103,11 @@
yann@1
   569
 	-DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
yann@1
   570
 	-DKERNEL_STACK_SIZE=$(STACK_SIZE)
yann@1
   571
 
yann@1
   572
-AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
yann@1
   573
+AFLAGS_$(LD_SCRIPT-y:.asm=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
yann@1
   574
 
yann@1
   575
 LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
yann@1
   576
 
yann@1
   577
-$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
yann@1
   578
+$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.asm=.S) scripts FORCE
yann@1
   579
 	$(call if_changed_dep,as_s_S)
yann@1
   580
 
yann@1
   581
 linux: vmlinux $(LD_SCRIPT-y)
yann@1
   582
@@ -122,8 +122,8 @@
yann@1
   583
 # To get a definition of F_SETSIG
yann@1
   584
 USER_CFLAGS += -D_GNU_SOURCE
yann@1
   585
 
yann@1
   586
-CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
yann@1
   587
-	$(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
yann@1
   588
+CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.asm \
yann@1
   589
+	$(ARCH_DIR)/dyn_link.ld.asm $(GEN_HEADERS)
yann@1
   590
 
yann@1
   591
 $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
yann@1
   592
 	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
yann@1
   593
diff -ur linux-2.6.7/arch/um/kernel/Makefile linux-2.6.7-mod/arch/um/kernel/Makefile
yann@1
   594
--- linux-2.6.7/arch/um/kernel/Makefile	Mon May 10 04:32:53 2004
yann@1
   595
+++ linux-2.6.7-mod/arch/um/kernel/Makefile	Sat Jun 19 12:57:15 2004
yann@1
   596
@@ -3,7 +3,7 @@
yann@1
   597
 # Licensed under the GPL
yann@1
   598
 #
yann@1
   599
 
yann@1
   600
-extra-y := vmlinux.lds.s
yann@1
   601
+extra-y := vmlinux.lds.asm
yann@1
   602
 
yann@1
   603
 obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
yann@1
   604
 	helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
yann@1
   605
diff -ur linux-2.6.7/arch/v850/Makefile linux-2.6.7-mod/arch/v850/Makefile
yann@1
   606
--- linux-2.6.7/arch/v850/Makefile	Mon May 10 04:33:21 2004
yann@1
   607
+++ linux-2.6.7-mod/arch/v850/Makefile	Sat Jun 19 12:57:59 2004
yann@1
   608
@@ -52,12 +52,12 @@
yann@1
   609
 prepare: include/asm-$(ARCH)/asm-consts.h
yann@1
   610
 
yann@1
   611
 # Generate constants from C code for use by asm files
yann@1
   612
-arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \
yann@1
   613
+arch/$(ARCH)/kernel/asm-consts.asm: include/asm include/linux/version.h \
yann@1
   614
 				   include/config/MARKER
yann@1
   615
 
yann@1
   616
-include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s
yann@1
   617
+include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.asm
yann@1
   618
 	$(call filechk,gen-asm-offsets)
yann@1
   619
 
yann@1
   620
 CLEAN_FILES += include/asm-$(ARCH)/asm-consts.h \
yann@1
   621
-	       arch/$(ARCH)/kernel/asm-consts.s \
yann@1
   622
+	       arch/$(ARCH)/kernel/asm-consts.asm \
yann@1
   623
 	       root_fs_image.o
yann@1
   624
diff -ur linux-2.6.7/arch/v850/kernel/Makefile linux-2.6.7-mod/arch/v850/kernel/Makefile
yann@1
   625
--- linux-2.6.7/arch/v850/kernel/Makefile	Mon May 10 04:33:21 2004
yann@1
   626
+++ linux-2.6.7-mod/arch/v850/kernel/Makefile	Sat Jun 19 12:58:04 2004
yann@1
   627
@@ -9,7 +9,7 @@
yann@1
   628
 # for more details.
yann@1
   629
 #
yann@1
   630
 
yann@1
   631
-extra-y := head.o init_task.o vmlinux.lds.s
yann@1
   632
+extra-y := head.o init_task.o vmlinux.lds.asm
yann@1
   633
 
yann@1
   634
 obj-y += intv.o entry.o process.o syscalls.o time.o semaphore.o setup.o \
yann@1
   635
 	 signal.o irq.o mach.o ptrace.o bug.o
yann@1
   636
diff -ur linux-2.6.7/arch/x86_64/Makefile linux-2.6.7-mod/arch/x86_64/Makefile
yann@1
   637
--- linux-2.6.7/arch/x86_64/Makefile	Mon May 10 04:33:19 2004
yann@1
   638
+++ linux-2.6.7-mod/arch/x86_64/Makefile	Sat Jun 19 12:58:10 2004
yann@1
   639
@@ -93,10 +93,10 @@
yann@1
   640
 
yann@1
   641
 prepare: include/asm-$(ARCH)/offset.h
yann@1
   642
 
yann@1
   643
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
yann@1
   644
+arch/$(ARCH)/kernel/asm-offsets.asm: include/asm include/linux/version.h \
yann@1
   645
 				   include/config/MARKER
yann@1
   646
 
yann@1
   647
-include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s
yann@1
   648
+include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.asm
yann@1
   649
 	$(call filechk,gen-asm-offsets)
yann@1
   650
 
yann@1
   651
 CLEAN_FILES += include/asm-$(ARCH)/offset.h
yann@1
   652
diff -ur linux-2.6.7/arch/x86_64/kernel/Makefile linux-2.6.7-mod/arch/x86_64/kernel/Makefile
yann@1
   653
--- linux-2.6.7/arch/x86_64/kernel/Makefile	Fri Jun 18 22:51:32 2004
yann@1
   654
+++ linux-2.6.7-mod/arch/x86_64/kernel/Makefile	Sat Jun 19 12:58:17 2004
yann@1
   655
@@ -2,7 +2,7 @@
yann@1
   656
 # Makefile for the linux kernel.
yann@1
   657
 #
yann@1
   658
 
yann@1
   659
-extra-y 	:= head.o head64.o init_task.o vmlinux.lds.s
yann@1
   660
+extra-y 	:= head.o head64.o init_task.o vmlinux.lds.asm
yann@1
   661
 EXTRA_AFLAGS	:= -traditional
yann@1
   662
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
yann@1
   663
 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \
yann@1
   664
diff -ur linux-2.6.7/scripts/Makefile.build linux-2.6.7-mod/scripts/Makefile.build
yann@1
   665
--- linux-2.6.7/scripts/Makefile.build	Mon May 10 04:33:13 2004
yann@1
   666
+++ linux-2.6.7-mod/scripts/Makefile.build	Sat Jun 19 12:43:10 2004
yann@1
   667
@@ -110,7 +110,7 @@
yann@1
   668
 quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
yann@1
   669
 cmd_cc_s_c       = $(CC) $(c_flags) -S -o $@ $< 
yann@1
   670
 
yann@1
   671
-%.s: %.c FORCE
yann@1
   672
+%.asm: %.c FORCE
yann@1
   673
 	$(call if_changed_dep,cc_s_c)
yann@1
   674
 
yann@1
   675
 quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
yann@1
   676
@@ -197,7 +197,7 @@
yann@1
   677
 quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
yann@1
   678
 cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
yann@1
   679
 
yann@1
   680
-%.s: %.S FORCE
yann@1
   681
+%.asm: %.S FORCE
yann@1
   682
 	$(call if_changed_dep,as_s_S)
yann@1
   683
 
yann@1
   684
 quiet_cmd_as_o_S = AS $(quiet_modtag)  $@
yann@1
   685
--- linux-2.6.8/arch/sparc/boot/Makefile.old	2004-09-21 21:46:18.000000000 -0700
yann@1
   686
+++ linux-2.6.8/arch/sparc/boot/Makefile	2004-09-21 21:52:35.000000000 -0700
yann@1
   687
@@ -19,7 +19,7 @@
yann@1
   688
 
yann@1
   689
 BTOBJS := $(HEAD_Y) $(INIT_Y)
yann@1
   690
 BTLIBS := $(CORE_Y) $(LIBS_Y) $(DRIVERS_Y) $(NET_Y)
yann@1
   691
-LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.s $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
yann@1
   692
+LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds.asm $(BTOBJS) --start-group $(BTLIBS) --end-group $(kallsyms.o)
yann@1
   693
 
yann@1
   694
 # Actual linking
yann@1
   695
 $(obj)/image: $(obj)/btfix.o FORCE
yann@1
   696
--- linux-2.6.8/arch/sh64/Makefile.old	2004-09-21 21:46:18.000000000 -0700
yann@1
   697
+++ linux-2.6.8/arch/sh64/Makefile	2004-09-21 21:54:31.000000000 -0700
yann@1
   698
@@ -71,7 +71,7 @@
yann@1
   699
 
yann@1
   700
 prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
yann@1
   701
 
yann@1
   702
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
yann@1
   703
+include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.asm \
yann@1
   704
 				   include/asm include/linux/version.h
yann@1
   705
 	$(call filechk,gen-asm-offsets)
yann@1
   706
 
yann@1
   707
--- linux-2.6.8/arch/sh64/boot/compressed/Makefile.old	2004-09-21 21:46:18.000000000 -0700
yann@1
   708
+++ linux-2.6.8/arch/sh64/boot/compressed/Makefile	2004-09-21 21:54:41.000000000 -0700
yann@1
   709
@@ -25,7 +25,7 @@
yann@1
   710
 ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[$(CONFIG_MEMORY_START)+0x400000+0x10000])
yann@1
   711
 
yann@1
   712
 LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \
yann@1
   713
-		    -T $(obj)/../../kernel/vmlinux.lds.s \
yann@1
   714
+		    -T $(obj)/../../kernel/vmlinux.lds.asm \
yann@1
   715
 		    --no-warn-mismatch
yann@1
   716
 
yann@1
   717
 $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
yann@1
   718
@@ -41,6 +41,6 @@
yann@1
   719
 LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T
yann@1
   720
 OBJCOPYFLAGS += -R .empty_zero_page
yann@1
   721
 
yann@1
   722
-$(obj)/piggy.o: $(obj)/vmlinux.lds.s $(obj)/vmlinux.bin.gz FORCE
yann@1
   723
+$(obj)/piggy.o: $(obj)/vmlinux.lds.asm $(obj)/vmlinux.bin.gz FORCE
yann@1
   724
 	$(call if_changed,ld)
yann@1
   725