Commit 011e3a9a authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[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: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dd47ea75
...@@ -1390,12 +1390,18 @@ endif #ifeq ($(mixed-targets),1) ...@@ -1390,12 +1390,18 @@ endif #ifeq ($(mixed-targets),1)
PHONY += checkstack kernelrelease kernelversion PHONY += checkstack kernelrelease kernelversion
# Use $(SUBARCH) here instead of $(ARCH) so that this works for UML. # UML needs a little special treatment here. It wants to use the host
# In the UML case, $(SUBARCH) is the name of the underlying # toolchain, so needs $(SUBARCH) passed to checkstack.pl. Everyone
# architecture, while for all other arches, it is the same as $(ARCH). # else wants $(ARCH), including people doing cross-builds, which means
# that $(SUBARCH) doesn't work here.
ifeq ($(ARCH), um)
CHECKSTACK_ARCH := $(SUBARCH)
else
CHECKSTACK_ARCH := $(ARCH)
endif
checkstack: checkstack:
$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \ $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
$(PERL) $(src)/scripts/checkstack.pl $(SUBARCH) $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
kernelrelease: kernelrelease:
$(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \ $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment