aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-01-30 07:32:27 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:32:27 -0500
commit6b0c3d44d33e9429dbc568dc7fd3aee3774c5707 (patch)
treeed925410acd3d3fce0934fda398f5e5f1a0f2dcd
parentd531b4fd2fa3c619d973ea639476f172d5a3732d (diff)
x86: unify arch/x86/kernel/Makefile(s)
Combine the 32 and 64 bit specific Makefiles in one file. While doing so link order was (almost) preserved on 32 bit but on 64 bit link order changed a lot. Patch was checked with defconfig + allyesconfig builds. The same .o files were linked in these configurations. To keep readability of the Makefiles a few Kconfig symbols was added/modified and it was checked that they were not used anywhere else. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat
-rw-r--r--arch/x86/Kconfig10
-rw-r--r--arch/x86/Kconfig.debug3
-rw-r--r--arch/x86/kernel/Makefile93
-rw-r--r--arch/x86/kernel/Makefile_3254
-rw-r--r--arch/x86/kernel/Makefile_6452
5 files changed, 95 insertions, 117 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fa6fa52248d..3d2c8dfba91 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -129,9 +129,17 @@ config GENERIC_PENDING_IRQ
129 129
130config X86_SMP 130config X86_SMP
131 bool 131 bool
132 depends on X86_32 && SMP && !X86_VOYAGER 132 depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
133 default y 133 default y
134 134
135config X86_32_SMP
136 def_bool y
137 depends on X86_32 && SMP
138
139config X86_64_SMP
140 def_bool y
141 depends on X86_64 && SMP
142
135config X86_HT 143config X86_HT
136 bool 144 bool
137 depends on SMP 145 depends on SMP
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index b747ab38814..660200915ba 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -75,8 +75,7 @@ config X86_FIND_SMP_CONFIG
75 75
76config X86_MPPARSE 76config X86_MPPARSE
77 def_bool y 77 def_bool y
78 depends on X86_LOCAL_APIC && !X86_VISWS 78 depends on (X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64
79 depends on X86_32
80 79
81config DOUBLEFAULT 80config DOUBLEFAULT
82 default y 81 default y
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 38573340b14..0903bbf0ca4 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -1,9 +1,86 @@
1ifeq ($(CONFIG_X86_32),y) 1#
2include ${srctree}/arch/x86/kernel/Makefile_32 2# Makefile for the linux kernel.
3else 3#
4include ${srctree}/arch/x86/kernel/Makefile_64 4
5endif 5extra-y := head_$(BITS).o init_task.o vmlinux.lds
6extra-$(CONFIG_X86_64) += head64.o
7
8CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
9CFLAGS_vsyscall_64.o := $(PROFILING) -g0
10
11obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
12obj-y += traps_$(BITS).o irq_$(BITS).o
13obj-y += time_$(BITS).o ioport_$(BITS).o ldt.o
14obj-y += setup_$(BITS).o i8259_$(BITS).o
15obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
16obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
17obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o
18obj-y += pci-dma_$(BITS).o bootflag.o e820_$(BITS).o
19obj-y += quirks.o i8237.o topology.o
20obj-y += alternative.o i8253.o
21obj-$(CONFIG_X86_64) += pci-nommu_64.o bugs_64.o
22obj-y += tsc_$(BITS).o io_delay.o rtc.o
23
24obj-y += i387.o
25obj-y += ptrace.o
26obj-y += ds.o
27obj-$(CONFIG_X86_32) += tls.o
28obj-$(CONFIG_IA32_EMULATION) += tls.o
29obj-y += step.o
30obj-$(CONFIG_STACKTRACE) += stacktrace.o
31obj-y += cpu/
32obj-y += acpi/
33obj-$(CONFIG_X86_BIOS_REBOOT) += reboot_32.o
34obj-$(CONFIG_X86_64) += reboot_64.o
35obj-$(CONFIG_MCA) += mca_32.o
36obj-$(CONFIG_X86_MSR) += msr.o
37obj-$(CONFIG_X86_CPUID) += cpuid.o
38obj-$(CONFIG_MICROCODE) += microcode.o
39obj-$(CONFIG_PCI) += early-quirks.o
40obj-$(CONFIG_APM) += apm_32.o
41obj-$(CONFIG_X86_SMP) += smp_$(BITS).o smpboot_$(BITS).o tsc_sync.o
42obj-$(CONFIG_X86_32_SMP) += smpcommon_32.o
43obj-$(CONFIG_X86_64_SMP) += smp_64.o smpboot_64.o tsc_sync.o
44obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o
45obj-$(CONFIG_X86_MPPARSE) += mpparse_$(BITS).o
46obj-$(CONFIG_X86_LOCAL_APIC) += apic_$(BITS).o nmi_$(BITS).o
47obj-$(CONFIG_X86_IO_APIC) += io_apic_$(BITS).o
48obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
49obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o
50obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o
51obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
52obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
53obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o
54obj-$(CONFIG_X86_VSMP) += vsmp_64.o
55obj-$(CONFIG_KPROBES) += kprobes.o
56obj-$(CONFIG_MODULES) += module_$(BITS).o
57obj-$(CONFIG_ACPI_SRAT) += srat_32.o
58obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o
59obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o
60obj-$(CONFIG_VM86) += vm86_32.o
61obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
62
63obj-$(CONFIG_HPET_TIMER) += hpet.o
6 64
7# Workaround to delete .lds files with make clean 65obj-$(CONFIG_K8_NB) += k8.o
8# The problem is that we do not enter Makefile_32 with make clean. 66obj-$(CONFIG_MGEODE_LX) += geode_32.o mfgpt_32.o
9clean-files := vsyscall*.lds vsyscall*.so 67
68obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
69obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
70obj-y += pcspeaker.o
71
72obj-$(CONFIG_SCx200) += scx200_32.o
73
74###
75# 64 bit specific files
76ifeq ($(CONFIG_X86_64),y)
77 obj-y += genapic_64.o genapic_flat_64.o
78 obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o
79 obj-$(CONFIG_AUDIT) += audit_64.o
80 obj-$(CONFIG_PM) += suspend_64.o
81 obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o
82
83 obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o
84 obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
85 obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o
86endif
diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32
deleted file mode 100644
index 86c6327798b..00000000000
--- a/arch/x86/kernel/Makefile_32
+++ /dev/null
@@ -1,54 +0,0 @@
1#
2# Makefile for the linux kernel.
3#
4
5extra-y := head_32.o init_task.o vmlinux.lds
6CPPFLAGS_vmlinux.lds += -Ui386
7
8obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
9 time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \
10 pci-dma_32.o i386_ksyms_32.o bootflag.o e820_32.o\
11 quirks.o i8237.o topology.o alternative.o i8253.o tsc_32.o io_delay.o rtc.o
12
13obj-y += i387.o
14obj-y += ptrace.o
15obj-y += ds.o
16obj-y += tls.o
17obj-y += step.o
18obj-$(CONFIG_STACKTRACE) += stacktrace.o
19obj-y += cpu/
20obj-y += acpi/
21obj-$(CONFIG_X86_BIOS_REBOOT) += reboot_32.o
22obj-$(CONFIG_MCA) += mca_32.o
23obj-$(CONFIG_X86_MSR) += msr.o
24obj-$(CONFIG_X86_CPUID) += cpuid.o
25obj-$(CONFIG_MICROCODE) += microcode.o
26obj-$(CONFIG_PCI) += early-quirks.o
27obj-$(CONFIG_APM) += apm_32.o
28obj-$(CONFIG_X86_SMP) += smp_32.o smpboot_32.o tsc_sync.o
29obj-$(CONFIG_SMP) += smpcommon_32.o
30obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_32.o
31obj-$(CONFIG_X86_MPPARSE) += mpparse_32.o
32obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi_32.o
33obj-$(CONFIG_X86_IO_APIC) += io_apic_32.o
34obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
35obj-$(CONFIG_KEXEC) += machine_kexec_32.o relocate_kernel_32.o crash.o
36obj-$(CONFIG_CRASH_DUMP) += crash_dump_32.o
37obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
38obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o
39obj-$(CONFIG_KPROBES) += kprobes.o
40obj-$(CONFIG_MODULES) += module_32.o
41obj-$(CONFIG_ACPI_SRAT) += srat_32.o
42obj-$(CONFIG_EFI) += efi.o efi_32.o efi_stub_32.o
43obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o
44obj-$(CONFIG_VM86) += vm86_32.o
45obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
46obj-$(CONFIG_HPET_TIMER) += hpet.o
47obj-$(CONFIG_K8_NB) += k8.o
48obj-$(CONFIG_MGEODE_LX) += geode_32.o mfgpt_32.o
49
50obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
51obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_32.o
52obj-y += pcspeaker.o
53
54obj-$(CONFIG_SCx200) += scx200_32.o
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
deleted file mode 100644
index b8f9d13eb5e..00000000000
--- a/arch/x86/kernel/Makefile_64
+++ /dev/null
@@ -1,52 +0,0 @@
1#
2# Makefile for the linux kernel.
3#
4
5extra-y := head_64.o head64.o init_task.o vmlinux.lds
6CPPFLAGS_vmlinux.lds += -Ux86_64
7
8obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
9 time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
10 x8664_ksyms_64.o syscall_64.o vsyscall_64.o \
11 setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
12 pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \
13 i8253.o io_delay.o rtc.o
14
15obj-y += ptrace.o
16obj-y += ds.o
17obj-y += step.o
18
19obj-y += i387.o
20obj-$(CONFIG_IA32_EMULATION) += tls.o
21obj-$(CONFIG_STACKTRACE) += stacktrace.o
22obj-y += cpu/
23obj-y += acpi/
24obj-$(CONFIG_X86_MSR) += msr.o
25obj-$(CONFIG_MICROCODE) += microcode.o
26obj-$(CONFIG_X86_CPUID) += cpuid.o
27obj-$(CONFIG_SMP) += smp_64.o smpboot_64.o trampoline_64.o tsc_sync.o
28obj-y += apic_64.o nmi_64.o
29obj-y += io_apic_64.o mpparse_64.o genapic_64.o genapic_flat_64.o
30obj-$(CONFIG_KEXEC) += machine_kexec_64.o relocate_kernel_64.o crash.o
31obj-$(CONFIG_CRASH_DUMP) += crash_dump_64.o
32obj-$(CONFIG_PM) += suspend_64.o
33obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o
34obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
35obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o
36obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
37obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o
38obj-$(CONFIG_KPROBES) += kprobes.o
39obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o
40obj-$(CONFIG_X86_VSMP) += vsmp_64.o
41obj-$(CONFIG_K8_NB) += k8.o
42obj-$(CONFIG_AUDIT) += audit_64.o
43obj-$(CONFIG_EFI) += efi.o efi_64.o efi_stub_64.o
44obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_64.o
45
46obj-$(CONFIG_MODULES) += module_64.o
47obj-$(CONFIG_PCI) += early-quirks.o
48
49obj-y += topology.o
50obj-y += pcspeaker.o
51
52CFLAGS_vsyscall_64.o := $(PROFILING) -g0
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-18 22:29:44 -0400