3 files changed, 39 insertions, 64 deletions
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 349d833deab5..f37cf02ad9be 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -1,5 +1,40 @@
-ifeq ($(CONFIG_SUPERH32),y)
+#
-include ${srctree}/arch/sh/kernel/Makefile_32
+# Makefile for the Linux/SuperH kernel.
-else
+#
-include ${srctree}/arch/sh/kernel/Makefile_64
+extra-y := head_$(BITS).o init_task.o vmlinux.lds
+ifdef CONFIG_FUNCTION_TRACER
+# Do not profile debug and lowlevel utilities
+CFLAGS_REMOVE_ftrace.o = -pg
 endif
+obj-y   := debugtraps.o dumpstack.o idle.o io.o io_generic.o irq.o      \
+           machvec.o process_$(BITS).o ptrace_$(BITS).o setup.o         \
+           signal_$(BITS).o sys_sh.o sys_sh$(BITS).o syscalls_$(BITS).o \
+           time.o topology.o traps.o traps_$(BITS).o unwinder.o
+obj-y                           += cpu/
+obj-$(CONFIG_VSYSCALL)          += vsyscall/
+obj-$(CONFIG_SMP)               += smp.o
+obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
+obj-$(CONFIG_KGDB)              += kgdb.o
+obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
+obj-$(CONFIG_MODULES)           += sh_ksyms_$(BITS).o module.o
+obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
+obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
+obj-$(CONFIG_STACKTRACE)        += stacktrace.o
+obj-$(CONFIG_IO_TRAPPED)        += io_trapped.o
+obj-$(CONFIG_KPROBES)           += kprobes.o
+obj-$(CONFIG_GENERIC_GPIO)      += gpio.o
+obj-$(CONFIG_DYNAMIC_FTRACE)    += ftrace.o
+obj-$(CONFIG_FTRACE_SYSCALLS)   += ftrace.o
+obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
+obj-$(CONFIG_DUMP_CODE)         += disassemble.o
+obj-$(CONFIG_HIBERNATION)       += swsusp.o
+obj-$(CONFIG_DWARF_UNWINDER)    += dwarf.o
+obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)     += localtimer.o
+EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
deleted file mode 100644
index f2245ebf0b31..000000000000
--- a/arch/sh/kernel/Makefile_32
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Makefile for the Linux/SuperH kernel.
-#
-extra-y := head_32.o init_task.o vmlinux.lds
-ifdef CONFIG_FUNCTION_TRACER
-# Do not profile debug and lowlevel utilities
-CFLAGS_REMOVE_ftrace.o = -pg
-endif
-obj-y   := debugtraps.o dumpstack.o idle.o io.o io_generic.o irq.o      \
-           machvec.o process_32.o ptrace_32.o setup.o signal_32.o       \
-           sys_sh.o sys_sh32.o syscalls_32.o time.o topology.o          \
-           traps.o traps_32.o unwinder.o
-obj-y                           += cpu/
-obj-$(CONFIG_VSYSCALL)          += vsyscall/
-obj-$(CONFIG_SMP)               += smp.o
-obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
-obj-$(CONFIG_KGDB)              += kgdb.o
-obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
-obj-$(CONFIG_MODULES)           += sh_ksyms_32.o module.o
-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
-obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
-obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
-obj-$(CONFIG_STACKTRACE)        += stacktrace.o
-obj-$(CONFIG_IO_TRAPPED)        += io_trapped.o
-obj-$(CONFIG_KPROBES)           += kprobes.o
-obj-$(CONFIG_GENERIC_GPIO)      += gpio.o
-obj-$(CONFIG_DYNAMIC_FTRACE)    += ftrace.o
-obj-$(CONFIG_FTRACE_SYSCALLS)   += ftrace.o
-obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
-obj-$(CONFIG_DUMP_CODE)         += disassemble.o
-obj-$(CONFIG_HIBERNATION)       += swsusp.o
-obj-$(CONFIG_DWARF_UNWINDER)    += dwarf.o
-obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)     += localtimer.o
-EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64
deleted file mode 100644
index 639ee514266c..000000000000
--- a/arch/sh/kernel/Makefile_64
+++ /dev/null
@@ -1,20 +0,0 @@
-extra-y := head_64.o init_task.o vmlinux.lds
-obj-y   := debugtraps.o idle.o io.o io_generic.o irq.o machvec.o process_64.o \
-           ptrace_64.o setup.o signal_64.o sys_sh.o sys_sh64.o \
-           syscalls_64.o time.o topology.o traps.o traps_64.o unwinder.o
-obj-y                           += cpu/
-obj-$(CONFIG_SMP)               += smp.o
-obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
-obj-$(CONFIG_MODULES)           += sh_ksyms_64.o module.o
-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
-obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
-obj-$(CONFIG_STACKTRACE)        += stacktrace.o
-obj-$(CONFIG_IO_TRAPPED)        += io_trapped.o
-obj-$(CONFIG_GENERIC_GPIO)      += gpio.o
-obj-$(CONFIG_DWARF_UNWINDER)    += dwarf.o
-obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)     += localtimer.o
-EXTRA_CFLAGS += -Werror

diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index 349d833deab5..f37cf02ad9be 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile
@@ -1,5 +1,40 @@
1	ifeq ($(CONFIG_SUPERH32),y)	1	#
2	include ${srctree}/arch/sh/kernel/Makefile_32	2	# Makefile for the Linux/SuperH kernel.
3	else	3	#
4	include ${srctree}/arch/sh/kernel/Makefile_64	4
		5	extra-y := head_$(BITS).o init_task.o vmlinux.lds
		6
		7	ifdef CONFIG_FUNCTION_TRACER
		8	# Do not profile debug and lowlevel utilities
		9	CFLAGS_REMOVE_ftrace.o = -pg
5	endif	10	endif
		11
		12	obj-y := debugtraps.o dumpstack.o idle.o io.o io_generic.o irq.o \
		13	machvec.o process_$(BITS).o ptrace_$(BITS).o setup.o \
		14	signal_$(BITS).o sys_sh.o sys_sh$(BITS).o syscalls_$(BITS).o \
		15	time.o topology.o traps.o traps_$(BITS).o unwinder.o
		16
		17	obj-y += cpu/
		18	obj-$(CONFIG_VSYSCALL) += vsyscall/
		19	obj-$(CONFIG_SMP) += smp.o
		20	obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o
		21	obj-$(CONFIG_KGDB) += kgdb.o
		22	obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o
		23	obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o
		24	obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
		25	obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
		26	obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
		27	obj-$(CONFIG_STACKTRACE) += stacktrace.o
		28	obj-$(CONFIG_IO_TRAPPED) += io_trapped.o
		29	obj-$(CONFIG_KPROBES) += kprobes.o
		30	obj-$(CONFIG_GENERIC_GPIO) += gpio.o
		31	obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
		32	obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
		33	obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
		34	obj-$(CONFIG_DUMP_CODE) += disassemble.o
		35	obj-$(CONFIG_HIBERNATION) += swsusp.o
		36	obj-$(CONFIG_DWARF_UNWINDER) += dwarf.o
		37
		38	obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += localtimer.o
		39
		40	EXTRA_CFLAGS += -Werror


diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32 deleted file mode 100644 index f2245ebf0b31..000000000000 --- a/arch/sh/kernel/Makefile_32 +++ /dev/null
@@ -1,40 +0,0 @@
1	#
2	# Makefile for the Linux/SuperH kernel.
3	#
4
5	extra-y := head_32.o init_task.o vmlinux.lds
6
7	ifdef CONFIG_FUNCTION_TRACER
8	# Do not profile debug and lowlevel utilities
9	CFLAGS_REMOVE_ftrace.o = -pg
10	endif
11
12	obj-y := debugtraps.o dumpstack.o idle.o io.o io_generic.o irq.o \
13	machvec.o process_32.o ptrace_32.o setup.o signal_32.o \
14	sys_sh.o sys_sh32.o syscalls_32.o time.o topology.o \
15	traps.o traps_32.o unwinder.o
16
17	obj-y += cpu/
18	obj-$(CONFIG_VSYSCALL) += vsyscall/
19	obj-$(CONFIG_SMP) += smp.o
20	obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o
21	obj-$(CONFIG_KGDB) += kgdb.o
22	obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o
23	obj-$(CONFIG_MODULES) += sh_ksyms_32.o module.o
24	obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
25	obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
26	obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
27	obj-$(CONFIG_STACKTRACE) += stacktrace.o
28	obj-$(CONFIG_IO_TRAPPED) += io_trapped.o
29	obj-$(CONFIG_KPROBES) += kprobes.o
30	obj-$(CONFIG_GENERIC_GPIO) += gpio.o
31	obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
32	obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
33	obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
34	obj-$(CONFIG_DUMP_CODE) += disassemble.o
35	obj-$(CONFIG_HIBERNATION) += swsusp.o
36	obj-$(CONFIG_DWARF_UNWINDER) += dwarf.o
37
38	obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += localtimer.o
39
40	EXTRA_CFLAGS += -Werror


diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64 deleted file mode 100644 index 639ee514266c..000000000000 --- a/arch/sh/kernel/Makefile_64 +++ /dev/null
@@ -1,20 +0,0 @@
1	extra-y := head_64.o init_task.o vmlinux.lds
2
3	obj-y := debugtraps.o idle.o io.o io_generic.o irq.o machvec.o process_64.o \
4	ptrace_64.o setup.o signal_64.o sys_sh.o sys_sh64.o \
5	syscalls_64.o time.o topology.o traps.o traps_64.o unwinder.o
6
7	obj-y += cpu/
8	obj-$(CONFIG_SMP) += smp.o
9	obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o
10	obj-$(CONFIG_MODULES) += sh_ksyms_64.o module.o
11	obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
12	obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
13	obj-$(CONFIG_STACKTRACE) += stacktrace.o
14	obj-$(CONFIG_IO_TRAPPED) += io_trapped.o
15	obj-$(CONFIG_GENERIC_GPIO) += gpio.o
16	obj-$(CONFIG_DWARF_UNWINDER) += dwarf.o
17
18	obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += localtimer.o
19
20	EXTRA_CFLAGS += -Werror