summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-02-04 22:30:45 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 09:44:26 -0800
commit0ba7fe03b638a084a4e15e21d2e585ba321ad9c8 (patch)
treee0938a17a4a8b6d00edf436f8d69a416ffcc7a2f
parente725a9b0f5db0fa511d7667da6c4bfb1a6d3c7e4 (diff)
downloadop-kernel-dev-0ba7fe03b638a084a4e15e21d2e585ba321ad9c8.zip
op-kernel-dev-0ba7fe03b638a084a4e15e21d2e585ba321ad9c8.tar.gz
uml: allow LFLAGS on command line
Allow LFLAGS to be given to make and have the expected effect. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/um/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index ba6813a..e44fd6a 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -130,7 +130,9 @@ CPPFLAGS_vmlinux.lds = -U$(SUBARCH) -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \
# The wrappers will select whether using "malloc" or the kernel allocator.
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
-CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS)
+LD_FLAGS_CMDLINE = $(foreach opt,$(LFLAGS),-Wl,$(opt))
+
+CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)
define cmd_vmlinux__
$(CC) $(CFLAGS_vmlinux) -o $@ \
-Wl,-T,$(vmlinux-lds) $(vmlinux-init) \
OpenPOWER on IntegriCloud