Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38f9ddf4 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Merge the _32/_64 variants of arch/sh/kernel/Makefile. 



This uses the BITS export as per x86 in order to allow the same Makefile
to be used.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 60e0a4c7

arch/sh/kernel/Makefile

+39 −4
Original line number Diff line number Diff line 
ifeq ($(CONFIG_SUPERH32),y)

include ${srctree}/arch/sh/kernel/Makefile_32

else

include ${srctree}/arch/sh/kernel/Makefile_64

#

# Makefile for the Linux/SuperH kernel.

#



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

arch/sh/kernel/Makefile_32

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
#

# 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

arch/sh/kernel/Makefile_64

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
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