diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-01-30 07:32:20 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:20 -0500 |
commit | 0a6ef376d4baf298aaa2db71794df821a0d7795c (patch) | |
tree | 197380a5df41d3debaabba6cce1c1d4da14ad735 | |
parent | b97601563704751162b122c652d7f390b8f480d2 (diff) |
x86: unification of arch/x86/Makefiles
Unify the 32 and 64 bit specific Makefiles.
The unification was simplest to do in one step although the
readability of the patch suffers a bit from this.
Noteworthy remarks on the unification:
- The 64 bit cpu stuff should be moved to Makefile_32.cpu
but I did not feel confident doing it due to subtle differences
- The use of cflags-y were abandoned since we have seen one bug where
we did wrong due to missing assignment to KBUILD_CFLAGS.
The cc-option marcro uses KBUILD_CFLAGS.
- The "No need to remake" line are deleted. It caused "make -B" to fail
- For 64 bit the sub architecture stuff is not used.
- The way head64.o is specified could be nicer - but it awaits the
introduction of head32.o (which seems like a win to introduce for readability)
- Patch is checkpatch clean
Patch is tested by doing a defconfig build for i386 and x86_64 and in both
cases monitoring that only relevant files were recompiled when applying
the patch.
[ mingo@elte.hu: build fix ]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/Makefile | 237 | ||||
-rw-r--r-- | arch/x86/Makefile_32 | 177 | ||||
-rw-r--r-- | arch/x86/Makefile_64 | 142 |
3 files changed, 233 insertions, 323 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 7aa1dc6d67c8..d3debde0ce0b 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
@@ -7,13 +7,242 @@ else | |||
7 | KBUILD_DEFCONFIG := $(ARCH)_defconfig | 7 | KBUILD_DEFCONFIG := $(ARCH)_defconfig |
8 | endif | 8 | endif |
9 | 9 | ||
10 | # No need to remake these files | 10 | # BITS is used as extension for files which are available in a 32 bit |
11 | $(srctree)/arch/x86/Makefile%: ; | 11 | # and a 64 bit version to simplify shared Makefiles. |
12 | # e.g.: obj-y += foo_$(BITS).o | ||
13 | export BITS | ||
12 | 14 | ||
13 | ifeq ($(CONFIG_X86_32),y) | 15 | ifeq ($(CONFIG_X86_32),y) |
16 | BITS := 32 | ||
14 | UTS_MACHINE := i386 | 17 | UTS_MACHINE := i386 |
15 | include $(srctree)/arch/x86/Makefile_32 | 18 | |
19 | HAS_BIARCH := $(call cc-option-yn, -m32) | ||
20 | ifeq ($(HAS_BIARCH),y) | ||
21 | AS := $(AS) --32 | ||
22 | LD := $(LD) -m elf_i386 | ||
23 | CC := $(CC) -m32 | ||
24 | endif | ||
25 | |||
26 | ifdef CONFIG_RELOCATABLE | ||
27 | LDFLAGS_vmlinux := --emit-relocs | ||
28 | endif | ||
29 | CHECKFLAGS += -D__i386__ | ||
30 | |||
31 | KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return | ||
32 | |||
33 | # prevent gcc from keeping the stack 16 byte aligned | ||
34 | KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2) | ||
35 | |||
36 | # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use | ||
37 | # a lot more stack due to the lack of sharing of stacklots: | ||
38 | KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \ | ||
39 | echo $(call cc-option,-fno-unit-at-a-time); fi ;) | ||
40 | |||
41 | # CPU-specific tuning. Anything which can be shared with UML should go here. | ||
42 | include $(srctree)/arch/x86/Makefile_32.cpu | ||
43 | KBUILD_CFLAGS += $(cflags-y) | ||
44 | |||
45 | # temporary until string.h is fixed | ||
46 | KBUILD_CFLAGS += -ffreestanding | ||
16 | else | 47 | else |
48 | BITS := 64 | ||
17 | UTS_MACHINE := x86_64 | 49 | UTS_MACHINE := x86_64 |
18 | include $(srctree)/arch/x86/Makefile_64 | 50 | CHECKFLAGS += -D__x86_64__ -m64 |
51 | |||
52 | KBUILD_AFLAGS += -m64 | ||
53 | KBUILD_CFLAGS += -m64 | ||
54 | |||
55 | # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu) | ||
56 | cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8) | ||
57 | cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona) | ||
58 | |||
59 | cflags-$(CONFIG_MCORE2) += \ | ||
60 | $(call cc-option,-march=core2,$(call cc-option,-mtune=generic)) | ||
61 | cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic) | ||
62 | KBUILD_CFLAGS += $(cflags-y) | ||
63 | |||
64 | KBUILD_CFLAGS += -mno-red-zone | ||
65 | KBUILD_CFLAGS += -mcmodel=kernel | ||
66 | |||
67 | KBUILD_CFLAGS += -Wno-sign-compare | ||
68 | KBUILD_CFLAGS += -fno-asynchronous-unwind-tables | ||
69 | # -funit-at-a-time shrinks the kernel .text considerably | ||
70 | # unfortunately it makes reading oopses harder. | ||
71 | KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) | ||
72 | |||
73 | # prevent gcc from generating any FP code by mistake | ||
74 | KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) | ||
75 | # this works around some issues with generating unwind tables in older gccs | ||
76 | # newer gccs do it by default | ||
77 | KBUILD_CFLAGS += -maccumulate-outgoing-args | ||
78 | |||
79 | stackp := $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh | ||
80 | stackp-$(CONFIG_CC_STACKPROTECTOR) := $(shell $(stackp) \ | ||
81 | "$(CC)" -fstack-protector ) | ||
82 | stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(stackp) \ | ||
83 | "$(CC)" -fstack-protector-all ) | ||
84 | |||
85 | KBUILD_CFLAGS += $(stackp-y) | ||
86 | endif | ||
87 | |||
88 | # Stackpointer is addressed different for 32 bit and 64 bit x86 | ||
89 | sp-$(CONFIG_X86_32) := esp | ||
90 | sp-$(CONFIG_X86_64) := rsp | ||
91 | |||
92 | # do binutils support CFI? | ||
93 | cfi := $(call as-instr,.cfi_startproc\n.cfi_rel_offset $(sp-y)$(comma)0\n.cfi_endproc,-DCONFIG_AS_CFI=1) | ||
94 | # is .cfi_signal_frame supported too? | ||
95 | cfi-sigframe := $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1) | ||
96 | KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) | ||
97 | KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) | ||
98 | |||
99 | LDFLAGS := -m elf_$(UTS_MACHINE) | ||
100 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S | ||
101 | KBUILD_CFLAGS += -pipe | ||
102 | |||
103 | ### | ||
104 | # Sub architecture support | ||
105 | # fcore-y is linked before mcore-y files. | ||
106 | |||
107 | # Default subarch .c files | ||
108 | mcore-y := arch/x86/mach-default/ | ||
109 | |||
110 | # Voyager subarch support | ||
111 | mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager | ||
112 | mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager/ | ||
113 | |||
114 | # VISWS subarch support | ||
115 | mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws | ||
116 | mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws/ | ||
117 | |||
118 | # NUMAQ subarch support | ||
119 | mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq | ||
120 | mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default/ | ||
121 | |||
122 | # BIGSMP subarch support | ||
123 | mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp | ||
124 | mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default/ | ||
125 | |||
126 | #Summit subarch support | ||
127 | mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit | ||
128 | mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default/ | ||
129 | |||
130 | # generic subarchitecture | ||
131 | mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic | ||
132 | fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ | ||
133 | mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/ | ||
134 | |||
135 | |||
136 | # ES7000 subarch support | ||
137 | mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000 | ||
138 | fcore-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ | ||
139 | mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default/ | ||
140 | |||
141 | # default subarch .h files | ||
142 | mflags-y += -Iinclude/asm-x86/mach-default | ||
143 | |||
144 | # 64 bit does not support subarch support - clear sub arch variables | ||
145 | fcore-$(CONFIG_X86_64) := | ||
146 | mcore-$(CONFIG_X86_64) := | ||
147 | mflags-$(CONFIG_X86_64) := | ||
148 | |||
149 | KBUILD_CFLAGS += $(mflags-y) | ||
150 | KBUILD_AFLAGS += $(mflags-y) | ||
151 | |||
152 | ### | ||
153 | # Kernel objects | ||
154 | |||
155 | head-y := arch/x86/kernel/head_$(BITS).o | ||
156 | head-$(CONFIG_X86_64) += arch/x86/kernel/head64.o | ||
157 | head-y += arch/x86/kernel/init_task.o | ||
158 | |||
159 | libs-y += arch/x86/lib/ | ||
160 | |||
161 | # Sub architecture files that needs linking first | ||
162 | core-y += $(fcore-y) | ||
163 | |||
164 | # Xen paravirtualization support | ||
165 | core-$(CONFIG_XEN) += arch/x86/xen/ | ||
166 | |||
167 | # lguest paravirtualization support | ||
168 | core-$(CONFIG_LGUEST_GUEST) += arch/x86/lguest/ | ||
169 | |||
170 | core-y += arch/x86/kernel/ | ||
171 | core-y += arch/x86/mm/ | ||
172 | |||
173 | # Remaining sub architecture files | ||
174 | core-y += $(mcore-y) | ||
175 | |||
176 | core-y += arch/x86/crypto/ | ||
177 | core-y += arch/x86/vdso/ | ||
178 | core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/ | ||
179 | |||
180 | # drivers-y are linked after core-y | ||
181 | drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/ | ||
182 | drivers-$(CONFIG_PCI) += arch/x86/pci/ | ||
183 | |||
184 | # must be linked after kernel/ | ||
185 | drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ | ||
186 | |||
187 | ifeq ($(CONFIG_X86_32),y) | ||
188 | drivers-$(CONFIG_PM) += arch/x86/power/ | ||
189 | drivers-$(CONFIG_FB) += arch/x86/video/ | ||
19 | endif | 190 | endif |
191 | |||
192 | #### | ||
193 | # boot loader support. Several targets are kept for legacy purposes | ||
194 | |||
195 | boot := arch/x86/boot | ||
196 | |||
197 | PHONY += zImage bzImage compressed zlilo bzlilo \ | ||
198 | zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install | ||
199 | |||
200 | # Default kernel to build | ||
201 | all: bzImage | ||
202 | |||
203 | # KBUILD_IMAGE specify target image being built | ||
204 | KBUILD_IMAGE := $(boot)/bzImage | ||
205 | zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage | ||
206 | |||
207 | zImage bzImage: vmlinux | ||
208 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) | ||
209 | $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot | ||
210 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/bzImage | ||
211 | |||
212 | compressed: zImage | ||
213 | |||
214 | zlilo bzlilo: vmlinux | ||
215 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) zlilo | ||
216 | |||
217 | zdisk bzdisk: vmlinux | ||
218 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) zdisk | ||
219 | |||
220 | fdimage fdimage144 fdimage288 isoimage: vmlinux | ||
221 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@ | ||
222 | |||
223 | install: vdso_install | ||
224 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install | ||
225 | |||
226 | PHONY += vdso_install | ||
227 | vdso_install: | ||
228 | $(Q)$(MAKE) $(build)=arch/x86/vdso $@ | ||
229 | |||
230 | archclean: | ||
231 | $(Q)rm -rf $(objtree)/arch/i386 | ||
232 | $(Q)rm -rf $(objtree)/arch/x86_64 | ||
233 | $(Q)$(MAKE) $(clean)=$(boot) | ||
234 | |||
235 | define archhelp | ||
236 | echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' | ||
237 | echo ' install - Install kernel using' | ||
238 | echo ' (your) ~/bin/installkernel or' | ||
239 | echo ' (distribution) /sbin/installkernel or' | ||
240 | echo ' install to $$(INSTALL_PATH) and run lilo' | ||
241 | echo ' bzdisk - Create a boot floppy in /dev/fd0' | ||
242 | echo ' fdimage - Create a boot floppy image' | ||
243 | echo ' isoimage - Create a boot CD-ROM image' | ||
244 | endef | ||
245 | |||
246 | CLEAN_FILES += arch/x86/boot/fdimage \ | ||
247 | arch/x86/boot/image.iso \ | ||
248 | arch/x86/boot/mtools.conf | ||
diff --git a/arch/x86/Makefile_32 b/arch/x86/Makefile_32 deleted file mode 100644 index 5c6724de904e..000000000000 --- a/arch/x86/Makefile_32 +++ /dev/null | |||
@@ -1,177 +0,0 @@ | |||
1 | # | ||
2 | # i386 Makefile | ||
3 | # | ||
4 | # This file is included by the global makefile so that you can add your own | ||
5 | # architecture-specific flags and dependencies. Remember to do have actions | ||
6 | # for "archclean" cleaning up for this architecture. | ||
7 | # | ||
8 | # This file is subject to the terms and conditions of the GNU General Public | ||
9 | # License. See the file "COPYING" in the main directory of this archive | ||
10 | # for more details. | ||
11 | # | ||
12 | # Copyright (C) 1994 by Linus Torvalds | ||
13 | # | ||
14 | # 19990713 Artur Skawina <skawina@geocities.com> | ||
15 | # Added '-march' and '-mpreferred-stack-boundary' support | ||
16 | # | ||
17 | # 20050320 Kianusch Sayah Karadji <kianusch@sk-tech.net> | ||
18 | # Added support for GEODE CPU | ||
19 | |||
20 | # BITS is used as extension for files which are available in a 32 bit | ||
21 | # and a 64 bit version to simplify shared Makefiles. | ||
22 | # e.g.: obj-y += foo_$(BITS).o | ||
23 | BITS := 32 | ||
24 | export BITS | ||
25 | |||
26 | HAS_BIARCH := $(call cc-option-yn, -m32) | ||
27 | ifeq ($(HAS_BIARCH),y) | ||
28 | AS := $(AS) --32 | ||
29 | LD := $(LD) -m elf_i386 | ||
30 | CC := $(CC) -m32 | ||
31 | endif | ||
32 | |||
33 | LDFLAGS := -m elf_i386 | ||
34 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S | ||
35 | ifdef CONFIG_RELOCATABLE | ||
36 | LDFLAGS_vmlinux := --emit-relocs | ||
37 | endif | ||
38 | CHECKFLAGS += -D__i386__ | ||
39 | |||
40 | KBUILD_CFLAGS += -pipe -msoft-float -mregparm=3 -freg-struct-return | ||
41 | |||
42 | # prevent gcc from keeping the stack 16 byte aligned | ||
43 | KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2) | ||
44 | |||
45 | # CPU-specific tuning. Anything which can be shared with UML should go here. | ||
46 | include $(srctree)/arch/x86/Makefile_32.cpu | ||
47 | |||
48 | # temporary until string.h is fixed | ||
49 | cflags-y += -ffreestanding | ||
50 | |||
51 | # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use | ||
52 | # a lot more stack due to the lack of sharing of stacklots: | ||
53 | KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;) | ||
54 | |||
55 | # do binutils support CFI? | ||
56 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | ||
57 | KBUILD_AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | ||
58 | |||
59 | # is .cfi_signal_frame supported too? | ||
60 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) | ||
61 | KBUILD_AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) | ||
62 | |||
63 | KBUILD_CFLAGS += $(cflags-y) | ||
64 | |||
65 | # Default subarch .c files | ||
66 | mcore-y := arch/x86/mach-default | ||
67 | |||
68 | # Voyager subarch support | ||
69 | mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager | ||
70 | mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager | ||
71 | |||
72 | # VISWS subarch support | ||
73 | mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws | ||
74 | mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws | ||
75 | |||
76 | # NUMAQ subarch support | ||
77 | mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq | ||
78 | mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default | ||
79 | |||
80 | # BIGSMP subarch support | ||
81 | mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp | ||
82 | mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default | ||
83 | |||
84 | #Summit subarch support | ||
85 | mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit | ||
86 | mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default | ||
87 | |||
88 | # generic subarchitecture | ||
89 | mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-x86/mach-generic | ||
90 | mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default | ||
91 | core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ | ||
92 | |||
93 | # ES7000 subarch support | ||
94 | mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000 | ||
95 | mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default | ||
96 | core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ | ||
97 | |||
98 | # Xen paravirtualization support | ||
99 | core-$(CONFIG_XEN) += arch/x86/xen/ | ||
100 | |||
101 | # lguest paravirtualization support | ||
102 | core-$(CONFIG_LGUEST_GUEST) += arch/x86/lguest/ | ||
103 | |||
104 | # default subarch .h files | ||
105 | mflags-y += -Iinclude/asm-x86/mach-default | ||
106 | |||
107 | head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task.o | ||
108 | |||
109 | libs-y += arch/x86/lib/ | ||
110 | core-y += arch/x86/kernel/ \ | ||
111 | arch/x86/mm/ \ | ||
112 | $(mcore-y)/ \ | ||
113 | arch/x86/crypto/ \ | ||
114 | arch/x86/vdso/ | ||
115 | drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/ | ||
116 | drivers-$(CONFIG_PCI) += arch/x86/pci/ | ||
117 | # must be linked after kernel/ | ||
118 | drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ | ||
119 | drivers-$(CONFIG_PM) += arch/x86/power/ | ||
120 | drivers-$(CONFIG_FB) += arch/x86/video/ | ||
121 | |||
122 | KBUILD_CFLAGS += $(mflags-y) | ||
123 | KBUILD_AFLAGS += $(mflags-y) | ||
124 | |||
125 | boot := arch/x86/boot | ||
126 | |||
127 | PHONY += zImage bzImage compressed zlilo bzlilo \ | ||
128 | zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install | ||
129 | |||
130 | all: bzImage | ||
131 | |||
132 | # KBUILD_IMAGE specify target image being built | ||
133 | KBUILD_IMAGE := $(boot)/bzImage | ||
134 | zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage | ||
135 | |||
136 | zImage bzImage: vmlinux | ||
137 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) | ||
138 | $(Q)mkdir -p $(objtree)/arch/i386/boot | ||
139 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/i386/boot/bzImage | ||
140 | |||
141 | compressed: zImage | ||
142 | |||
143 | zlilo bzlilo: vmlinux | ||
144 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) zlilo | ||
145 | |||
146 | zdisk bzdisk: vmlinux | ||
147 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) zdisk | ||
148 | |||
149 | fdimage fdimage144 fdimage288 isoimage: vmlinux | ||
150 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@ | ||
151 | |||
152 | install: vdso_install | ||
153 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install | ||
154 | |||
155 | PHONY += vdso_install | ||
156 | vdso_install: | ||
157 | $(Q)$(MAKE) $(build)=arch/x86/vdso $@ | ||
158 | |||
159 | archclean: | ||
160 | $(Q)rm -rf $(objtree)/arch/i386 | ||
161 | $(Q)rm -rf $(objtree)/arch/x86_64 | ||
162 | $(Q)$(MAKE) $(clean)=arch/x86/boot | ||
163 | |||
164 | define archhelp | ||
165 | echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' | ||
166 | echo ' install - Install kernel using' | ||
167 | echo ' (your) ~/bin/installkernel or' | ||
168 | echo ' (distribution) /sbin/installkernel or' | ||
169 | echo ' install to $$(INSTALL_PATH) and run lilo' | ||
170 | echo ' bzdisk - Create a boot floppy in /dev/fd0' | ||
171 | echo ' fdimage - Create a boot floppy image' | ||
172 | echo ' isoimage - Create a boot CD-ROM image' | ||
173 | endef | ||
174 | |||
175 | CLEAN_FILES += arch/x86/boot/fdimage \ | ||
176 | arch/x86/boot/image.iso \ | ||
177 | arch/x86/boot/mtools.conf | ||
diff --git a/arch/x86/Makefile_64 b/arch/x86/Makefile_64 deleted file mode 100644 index d35a0c50b67b..000000000000 --- a/arch/x86/Makefile_64 +++ /dev/null | |||
@@ -1,142 +0,0 @@ | |||
1 | # | ||
2 | # x86_64 Makefile | ||
3 | # | ||
4 | # This file is included by the global makefile so that you can add your own | ||
5 | # architecture-specific flags and dependencies. Remember to do have actions | ||
6 | # for "archclean" and "archdep" for cleaning up and making dependencies for | ||
7 | # this architecture | ||
8 | # | ||
9 | # This file is subject to the terms and conditions of the GNU General Public | ||
10 | # License. See the file "COPYING" in the main directory of this archive | ||
11 | # for more details. | ||
12 | # | ||
13 | # Copyright (C) 1994 by Linus Torvalds | ||
14 | # | ||
15 | # 19990713 Artur Skawina <skawina@geocities.com> | ||
16 | # Added '-march' and '-mpreferred-stack-boundary' support | ||
17 | # 20000913 Pavel Machek <pavel@suse.cz> | ||
18 | # Converted for x86_64 architecture | ||
19 | # 20010105 Andi Kleen, add IA32 compiler. | ||
20 | # ....and later removed it again.... | ||
21 | # | ||
22 | # $Id: Makefile,v 1.31 2002/03/22 15:56:07 ak Exp $ | ||
23 | |||
24 | # BITS is used as extension for files which are available in a 32 bit | ||
25 | # and a 64 bit version to simplify shared Makefiles. | ||
26 | # e.g.: obj-y += foo_$(BITS).o | ||
27 | BITS := 64 | ||
28 | export BITS | ||
29 | |||
30 | LDFLAGS := -m elf_x86_64 | ||
31 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S | ||
32 | LDFLAGS_vmlinux := | ||
33 | CHECKFLAGS += -D__x86_64__ -m64 | ||
34 | |||
35 | cflags-y := | ||
36 | cflags-kernel-y := | ||
37 | cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8) | ||
38 | cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona) | ||
39 | # gcc doesn't support -march=core2 yet as of gcc 4.3, but I hope it | ||
40 | # will eventually. Use -mtune=generic as fallback | ||
41 | cflags-$(CONFIG_MCORE2) += \ | ||
42 | $(call cc-option,-march=core2,$(call cc-option,-mtune=generic)) | ||
43 | cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic) | ||
44 | |||
45 | cflags-y += -m64 | ||
46 | cflags-y += -mno-red-zone | ||
47 | cflags-y += -mcmodel=kernel | ||
48 | cflags-y += -pipe | ||
49 | cflags-y += -Wno-sign-compare | ||
50 | cflags-y += -fno-asynchronous-unwind-tables | ||
51 | ifneq ($(CONFIG_DEBUG_INFO),y) | ||
52 | # -fweb shrinks the kernel a bit, but the difference is very small | ||
53 | # it also messes up debugging, so don't use it for now. | ||
54 | #cflags-y += $(call cc-option,-fweb) | ||
55 | endif | ||
56 | # -funit-at-a-time shrinks the kernel .text considerably | ||
57 | # unfortunately it makes reading oopses harder. | ||
58 | cflags-y += $(call cc-option,-funit-at-a-time) | ||
59 | # prevent gcc from generating any FP code by mistake | ||
60 | cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) | ||
61 | # this works around some issues with generating unwind tables in older gccs | ||
62 | # newer gccs do it by default | ||
63 | cflags-y += -maccumulate-outgoing-args | ||
64 | |||
65 | # do binutils support CFI? | ||
66 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | ||
67 | KBUILD_AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | ||
68 | |||
69 | # is .cfi_signal_frame supported too? | ||
70 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) | ||
71 | KBUILD_AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) | ||
72 | |||
73 | cflags-$(CONFIG_CC_STACKPROTECTOR) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh "$(CC)" -fstack-protector ) | ||
74 | cflags-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh "$(CC)" -fstack-protector-all ) | ||
75 | |||
76 | KBUILD_CFLAGS += $(cflags-y) | ||
77 | CFLAGS_KERNEL += $(cflags-kernel-y) | ||
78 | KBUILD_AFLAGS += -m64 | ||
79 | |||
80 | head-y := arch/x86/kernel/head_64.o arch/x86/kernel/head64.o arch/x86/kernel/init_task.o | ||
81 | |||
82 | libs-y += arch/x86/lib/ | ||
83 | core-y += arch/x86/kernel/ \ | ||
84 | arch/x86/mm/ \ | ||
85 | arch/x86/crypto/ \ | ||
86 | arch/x86/vdso/ | ||
87 | core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/ | ||
88 | drivers-$(CONFIG_PCI) += arch/x86/pci/ | ||
89 | drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ | ||
90 | |||
91 | boot := arch/x86/boot | ||
92 | |||
93 | PHONY += bzImage bzlilo install archmrproper \ | ||
94 | fdimage fdimage144 fdimage288 isoimage archclean | ||
95 | |||
96 | #Default target when executing "make" | ||
97 | all: bzImage | ||
98 | |||
99 | BOOTIMAGE := arch/x86/boot/bzImage | ||
100 | KBUILD_IMAGE := $(BOOTIMAGE) | ||
101 | |||
102 | bzImage: vmlinux | ||
103 | $(Q)$(MAKE) $(build)=$(boot) $(BOOTIMAGE) | ||
104 | $(Q)mkdir -p $(objtree)/arch/x86_64/boot | ||
105 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/x86_64/boot/bzImage | ||
106 | |||
107 | bzlilo: vmlinux | ||
108 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zlilo | ||
109 | |||
110 | bzdisk: vmlinux | ||
111 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zdisk | ||
112 | |||
113 | fdimage fdimage144 fdimage288 isoimage: vmlinux | ||
114 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ | ||
115 | |||
116 | install: vdso_install | ||
117 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ | ||
118 | |||
119 | vdso_install: | ||
120 | $(Q)$(MAKE) $(build)=arch/x86/vdso $@ | ||
121 | |||
122 | archclean: | ||
123 | $(Q)rm -rf $(objtree)/arch/i386 | ||
124 | $(Q)rm -rf $(objtree)/arch/x86_64 | ||
125 | $(Q)$(MAKE) $(clean)=$(boot) | ||
126 | |||
127 | define archhelp | ||
128 | echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' | ||
129 | echo ' install - Install kernel using' | ||
130 | echo ' (your) ~/bin/installkernel or' | ||
131 | echo ' (distribution) /sbin/installkernel or' | ||
132 | echo ' install to $$(INSTALL_PATH) and run lilo' | ||
133 | echo ' bzdisk - Create a boot floppy in /dev/fd0' | ||
134 | echo ' fdimage - Create a boot floppy image' | ||
135 | echo ' isoimage - Create a boot CD-ROM image' | ||
136 | endef | ||
137 | |||
138 | CLEAN_FILES += arch/x86/boot/fdimage \ | ||
139 | arch/x86/boot/image.iso \ | ||
140 | arch/x86/boot/mtools.conf | ||
141 | |||
142 | |||