summaryrefslogtreecommitdiffstats
path: root/arch/sparc/Makefile
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-12-03 03:08:37 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-04 09:17:20 -0800
commitd670bd4f803c8b646acd20f3ba21e65458293faf (patch)
treeeabc30aadce1556023c4aa445c649ba9e1d3f352 /arch/sparc/Makefile
parent478b8fecda511942404ac232897a718cecd13e48 (diff)
downloadlinux-d670bd4f803c8b646acd20f3ba21e65458293faf.tar.gz
linux-d670bd4f803c8b646acd20f3ba21e65458293faf.tar.bz2
linux-d670bd4f803c8b646acd20f3ba21e65458293faf.zip
sparc: prepare kernel/ for unification
o sparc32 files with identical names to sparc64 renamed to <name>_32.S o introduced a few Kconfig helpers to simplify Makefile logic o refactored Makefile to prepare for unification - use obj-$(CONFIG_SPARC32) for sparc32 specific files - use <name>_$(BITS) for files where sparc64 has a _64 variant - sparc64 directly include a few files where sparc32 builds them, refer to these files directly (no BITS) - sneaked in -Werror as used by sparc64 o modified sparc/Makefile to use the new names for head/init_task Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/Makefile')
-rw-r--r--arch/sparc/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index b1d691489ed4..f061d0ada158 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -67,8 +67,8 @@ endif
endif
-head-$(CONFIG_SPARC32) := arch/sparc/kernel/head.o
-head-$(CONFIG_SPARC32) += arch/sparc/kernel/init_task.o
+head-$(CONFIG_SPARC32) := arch/sparc/kernel/head_$(BITS).o
+head-$(CONFIG_SPARC32) += arch/sparc/kernel/init_task_$(BITS).o
head-$(CONFIG_SPARC64) := arch/sparc64/kernel/head.o
head-$(CONFIG_SPARC64) += arch/sparc64/kernel/init_task.o