aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-12-13 03:34:12 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-13 12:05:48 -0500
commit011e3a9ad4891ba1b27e281e085228189c56b137 (patch)
tree3e9ac42e237bc163e37a89bb3d090608a5e1320b /Makefile
parentdd47ea755693228bf842c779e8afdfa47efb20a3 (diff)
[PATCH] Fix crossbuilding checkstack
The previous checkstack fix for UML, which needs to use the host's tools, was wrong in the crossbuilding case. It would use the build host's, rather than the target's, toolchain. This patch removes the old fix and adds an explicit special case for UML, leaving everyone else alone. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4eabaa8afbff..f732e75be43d 100644
--- a/Makefile
+++ b/Makefile
@@ -1390,12 +1390,18 @@ endif #ifeq ($(mixed-targets),1)
1390 1390
1391PHONY += checkstack kernelrelease kernelversion 1391PHONY += checkstack kernelrelease kernelversion
1392 1392
1393# Use $(SUBARCH) here instead of $(ARCH) so that this works for UML. 1393# UML needs a little special treatment here. It wants to use the host
1394# In the UML case, $(SUBARCH) is the name of the underlying 1394# toolchain, so needs $(SUBARCH) passed to checkstack.pl. Everyone
1395# architecture, while for all other arches, it is the same as $(ARCH). 1395# else wants $(ARCH), including people doing cross-builds, which means
1396# that $(SUBARCH) doesn't work here.
1397ifeq ($(ARCH), um)
1398CHECKSTACK_ARCH := $(SUBARCH)
1399else
1400CHECKSTACK_ARCH := $(ARCH)
1401endif
1396checkstack: 1402checkstack:
1397 $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \ 1403 $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
1398 $(PERL) $(src)/scripts/checkstack.pl $(SUBARCH) 1404 $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
1399 1405
1400kernelrelease: 1406kernelrelease:
1401 $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \ 1407 $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \