Attachment #49910 for bug #116961

View | Details | Raw Unified | Return to bug 116961
Collapse All | Expand All

Lines 812-818 export CPPFLAGS_vmlinux.lds += -P -C -U$ Link Here

(-)linux-2.6.13/Makefile (-1 lines)
812	# hard to detect, but I suppose "make mrproper" is a good idea	812	# hard to detect, but I suppose "make mrproper" is a good idea
813	# before switching between archs anyway.	813	# before switching between archs anyway.
814		814
815	include/asm: $(objtree)/include/asm
816	$(objtree)/include/asm:	815	$(objtree)/include/asm:
817	@echo ' SYMLINK $@ -> include/asm-$(ARCH)'	816	@echo ' SYMLINK $@ -> include/asm-$(ARCH)'
818	$(Q)if [ ! -d include ]; then mkdir -p include; fi;	817	$(Q)if [ ! -d include ]; then mkdir -p include; fi;

Lines 111-117 bootimage bootpfile bootpzfile: vmlinux Link Here

(-)linux-2.6.13/arch/alpha/Makefile (-1 / +2 lines)
111		111
112	prepare: include/asm-$(ARCH)/asm_offsets.h	112	prepare: include/asm-$(ARCH)/asm_offsets.h
113		113
114	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	114	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		115	$(objtree)/include/linux/version.h \
115	include/config/MARKER	116	include/config/MARKER
116		117
117	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s	118	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 178-184 endif Link Here

(-)linux-2.6.13/arch/arm/Makefile (-2 / +3 lines)
178	prepare: maketools include/asm-arm/.arch	178	prepare: maketools include/asm-arm/.arch
179		179
180	.PHONY: maketools FORCE	180	.PHONY: maketools FORCE
181	maketools: include/asm-arm/constants.h include/linux/version.h FORCE	181	maketools: include/asm-arm/constants.h $(objtree)/include/linux/version.h FORCE
182	$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h	182	$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
183		183
184	# Convert bzImage to zImage	184	# Convert bzImage to zImage
Lines 201-207 archclean: Link Here
201	bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage	201	bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage
202	i zi:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@	202	i zi:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
203		203
204	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	204	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		205	$(objtree)/include/linux/version.h \
205	include/asm-arm/.arch	206	include/asm-arm/.arch
206		207
207	include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s	208	include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 98-104 zi:; $(Q)$(MAKE) $(build)=$(boot) zinsta Link Here

(-)linux-2.6.13/arch/arm26/Makefile (-1 / +2 lines)
98	fi; \	98	fi; \
99	)	99	)
100		100
101	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	101	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		102	$(objtree)/include/linux/version.h \
102	include/config/MARKER	103	include/config/MARKER
103		104
104	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s	105	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 129-136 $(srctree)/include/asm-$(ARCH)/.arch: $( Link Here

(-)linux-2.6.13/arch/cris/Makefile (-2 / +4 lines)
129	@ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch	129	@ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch
130	@touch $@	130	@touch $@
131		131
132	arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	132	arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: \
133	include/config/MARKER	133	$(objtree)/include/asm \
		134	$(objtree)/include/linux/version.h \
		135	include/config/MARKER
134		136
135	include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s	137	include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
136	$(call filechk,gen-asm-offsets)	138	$(call filechk,gen-asm-offsets)

Lines 64-70 archclean: Link Here

(-)linux-2.6.13/arch/h8300/Makefile (-1 / +2 lines)
64	prepare: include/asm-$(ARCH)/asm-offsets.h	64	prepare: include/asm-$(ARCH)/asm-offsets.h
65		65
66	include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \	66	include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
67	include/asm include/linux/version.h	67	$(objtree)/include/asm \
		68	$(objtree)/include/linux/version.h
68	$(call filechk,gen-asm-offsets)	69	$(call filechk,gen-asm-offsets)
69		70
70	vmlinux.srec vmlinux.bin: vmlinux	71	vmlinux.srec vmlinux.bin: vmlinux

Lines 159-165 install kernel_install: Link Here

(-)linux-2.6.13/arch/i386/Makefile (-1 / +2 lines)
159	prepare: include/asm-$(ARCH)/asm_offsets.h	159	prepare: include/asm-$(ARCH)/asm_offsets.h
160	CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h	160	CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
161		161
162	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	162	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		163	$(objtree)/include/linux/version.h \
163	include/config/MARKER	164	include/config/MARKER
164		165
165	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s	166	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 88-94 MRPROPER_FILES += include/asm-ia64/offse Link Here

(-)linux-2.6.13/arch/ia64/Makefile (-1 / +3 lines)
88		88
89	prepare: include/asm-ia64/offsets.h	89	prepare: include/asm-ia64/offsets.h
90		90
91	arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER	91	arch/ia64/kernel/asm-offsets.s: $(objtree)/include/asm \
		92	$(objtree)/include/linux/version.h \
		93	include/config/MARKER
92		94
93	include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s	95	include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
94	$(call filechk,gen-asm-offsets)	96	$(call filechk,gen-asm-offsets)

Lines 116-122 endif Link Here

(-)linux-2.6.13/arch/m68k/Makefile (-1 / +2 lines)
116	prepare: include/asm-$(ARCH)/offsets.h	116	prepare: include/asm-$(ARCH)/offsets.h
117	MRPROPER_FILES += include/asm-$(ARCH)/offsets.h	117	MRPROPER_FILES += include/asm-$(ARCH)/offsets.h
118		118
119	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	119	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		120	$(objtree)/include/linux/version.h \
120	include/config/MARKER	121	include/config/MARKER
121		122
122	include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s	123	include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 112-117 archclean: Link Here

(-)linux-2.6.13/arch/m68knommu/Makefile (-1 / +2 lines)
112	$(call descend arch/$(ARCH)/boot, subdirclean)	112	$(call descend arch/$(ARCH)/boot, subdirclean)
113		113
114	include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \	114	include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
115	include/asm include/linux/version.h \	115	$(objtree)/include/asm \
		116	$(objtree)/include/linux/version.h \
116	include/config/MARKER	117	include/config/MARKER
117	$(call filechk,gen-asm-offsets)	118	$(call filechk,gen-asm-offsets)

Lines 754-761 endef Link Here

(-)linux-2.6.13/arch/mips/Makefile (-2 / +3 lines)
754		754
755	prepare: include/asm-$(ARCH)/offset.h	755	prepare: include/asm-$(ARCH)/offset.h
756		756
757	arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \	757	arch/$(ARCH)/kernel/offset.s: $(objtree)/include/asm \
758	include/config/MARKER	758	$(objtree)/include/linux/version.h \
		759	include/config/MARKER
759		760
760	include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s	761	include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
761	$(call filechk,gen-asm-offset.h)	762	$(call filechk,gen-asm-offset.h)

Lines 102-109 install: kernel_install modules_install Link Here

(-)linux-2.6.13/arch/parisc/Makefile (-2 / +3 lines)
102		102
103	prepare: include/asm-parisc/offsets.h	103	prepare: include/asm-parisc/offsets.h
104		104
105	arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \	105	arch/parisc/kernel/asm-offsets.s: $(objtree)/include/asm \
106	include/config/MARKER	106	$(objtree)/include/linux/version.h \
		107	include/config/MARKER
107		108
108	include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s	109	include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s
109	$(call filechk,gen-asm-offsets)	110	$(call filechk,gen-asm-offsets)

Lines 104-110 archclean: Link Here

(-)linux-2.6.13/arch/ppc/Makefile (-1 / +2 lines)
104		104
105	prepare: include/asm-$(ARCH)/offsets.h checkbin	105	prepare: include/asm-$(ARCH)/offsets.h checkbin
106		106
107	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	107	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		108	$(objtree)/include/linux/version.h \
108	include/config/MARKER	109	include/config/MARKER
109		110
110	include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s	111	include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 115-122 archclean: Link Here

(-)linux-2.6.13/arch/ppc64/Makefile (-2 / +3 lines)
115		115
116	prepare: include/asm-ppc64/offsets.h	116	prepare: include/asm-ppc64/offsets.h
117		117
118	arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \	118	arch/ppc64/kernel/asm-offsets.s: $(objtree)/include/asm \
119	include/config/MARKER	119	$(objtree)/include/linux/version.h \
		120	include/config/MARKER
120		121
121	include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s	122	include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
122	$(call filechk,gen-asm-offsets)	123	$(call filechk,gen-asm-offsets)

Lines 102-108 archclean: Link Here

(-)linux-2.6.13/arch/s390/Makefile (-1 / +2 lines)
102		102
103	prepare: include/asm-$(ARCH)/offsets.h	103	prepare: include/asm-$(ARCH)/offsets.h
104		104
105	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	105	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		106	$(objtree)/include/linux/version.h \
106	include/config/MARKER	107	include/config/MARKER
107		108
108	include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s	109	include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 155-161 endif Link Here

(-)linux-2.6.13/arch/sh/Makefile (-2 / +3 lines)
155	prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach	155	prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach
156		156
157	.PHONY: maketools FORCE	157	.PHONY: maketools FORCE
158	maketools: include/asm-sh/asm-offsets.h include/linux/version.h FORCE	158	maketools: include/asm-sh/asm-offsets.h $(objtree)/include/linux/version.h FORCE
159	$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h	159	$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
160		160
161	all: zImage	161	all: zImage
Lines 170-176 archclean: Link Here
170		170
171	CLEAN_FILES += include/asm-sh/machtypes.h include/asm-sh/asm-offsets.h	171	CLEAN_FILES += include/asm-sh/machtypes.h include/asm-sh/asm-offsets.h
172		172
173	arch/sh/kernel/asm-offsets.s: include/asm include/linux/version.h \	173	arch/sh/kernel/asm-offsets.s: $(objtree)/include/asm \
		174	$(objtree)/include/linux/version.h \
174	include/asm-sh/.cpu include/asm-sh/.mach	175	include/asm-sh/.cpu include/asm-sh/.mach
175		176
176	include/asm-sh/asm-offsets.h: arch/sh/kernel/asm-offsets.s	177	include/asm-sh/asm-offsets.h: arch/sh/kernel/asm-offsets.s

Lines 76-82 archclean: Link Here

(-)linux-2.6.13/arch/sh64/Makefile (-1 / +2 lines)
76	prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h	76	prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
77		77
78	include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \	78	include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
79	include/asm include/linux/version.h	79	$(objtree)/include/asm \
		80	$(objtree)/include/linux/version.h
80	$(call filechk,gen-asm-offsets)	81	$(call filechk,gen-asm-offsets)
81		82
82	define filechk_gen-syscalltab	83	define filechk_gen-syscalltab

Lines 61-67 archclean: Link Here

(-)linux-2.6.13/arch/sparc/Makefile (-1 / +2 lines)
61		61
62	prepare: include/asm-$(ARCH)/asm_offsets.h	62	prepare: include/asm-$(ARCH)/asm_offsets.h
63		63
64	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	64	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		65	$(objtree)/include/linux/version.h \
65	include/config/MARKER	66	include/config/MARKER
66		67
67	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s	68	include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

Lines 196-202 define filechk_umlconfig Link Here

(-)linux-2.6.13/arch/um/Makefile (-2 / +3 lines)
196	sed 's/ CONFIG/ UML_CONFIG/'	196	sed 's/ CONFIG/ UML_CONFIG/'
197	endef	197	endef
198		198
199	$(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h	199	$(ARCH_DIR)/include/uml-config.h : $(objtree)/include/linux/autoconf.h
200	$(call filechk,umlconfig)	200	$(call filechk,umlconfig)
201		201
202	$(ARCH_DIR)/user-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.c	202	$(ARCH_DIR)/user-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.c
Lines 210-216 CLEAN_FILES += $(ARCH_DIR)/user-offsets. Link Here
210	$(ARCH_DIR)/kernel-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/kernel-offsets.c \	210	$(ARCH_DIR)/kernel-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/kernel-offsets.c \
211	$(ARCH_SYMLINKS) \	211	$(ARCH_SYMLINKS) \
212	$(SYS_DIR)/sc.h \	212	$(SYS_DIR)/sc.h \
213	include/asm include/linux/version.h \	213	$(objtree)/include/asm \
		214	$(objtree)/include/linux/version.h \
214	include/config/MARKER \	215	include/config/MARKER \
215	$(ARCH_DIR)/include/user_constants.h	216	$(ARCH_DIR)/include/user_constants.h
216	$(CC) $(CFLAGS) $(NOSTDINC_FLAGS) $(CPPFLAGS) -S -o $@ $<	217	$(CC) $(CFLAGS) $(NOSTDINC_FLAGS) $(CPPFLAGS) -S -o $@ $<

Lines 50-56 $(SYS_UTIL_DIR)/mk_sc: scripts_basic $(A Link Here

(-)linux-2.6.13/arch/um/Makefile-i386 (-1 / +1 lines)
50	$(SYS_UTIL_DIR)/mk_thread: scripts_basic $(ARCH_DIR)/kernel-offsets.h FORCE	50	$(SYS_UTIL_DIR)/mk_thread: scripts_basic $(ARCH_DIR)/kernel-offsets.h FORCE
51	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@	51	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
52		52
53	$(SYS_UTIL_DIR): scripts_basic include/asm FORCE	53	$(SYS_UTIL_DIR): scripts_basic $(objtree)/include/asm FORCE
54	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR)	54	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR)
55		55
56	CLEAN_FILES += $(SYS_HEADERS)	56	CLEAN_FILES += $(SYS_HEADERS)

Lines 55-62 endif Link Here

(-)linux-2.6.13/arch/v850/Makefile (-2 / +3 lines)
55	prepare: include/asm-$(ARCH)/asm-consts.h	55	prepare: include/asm-$(ARCH)/asm-consts.h
56		56
57	# Generate constants from C code for use by asm files	57	# Generate constants from C code for use by asm files
58	arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \	58	arch/$(ARCH)/kernel/asm-consts.s: $(objtree)/include/asm \
59	include/config/MARKER	59	$(objtree)/include/linux/version.h \
		60	include/config/MARKER
60		61
61	include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s	62	include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s
62	$(call filechk,gen-asm-offsets)	63	$(call filechk,gen-asm-offsets)

Lines 88-94 archclean: Link Here

(-)linux-2.6.13/arch/x86_64/Makefile (-1 / +2 lines)
88		88
89	prepare: include/asm-$(ARCH)/offset.h	89	prepare: include/asm-$(ARCH)/offset.h
90		90
91	arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \	91	arch/$(ARCH)/kernel/asm-offsets.s: $(objtree)/include/asm \
		92	$(objtree)/include/linux/version.h \
92	include/config/MARKER	93	include/config/MARKER
93		94
94	include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s	95	include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s

Return to bug 116961