From f6bbd34ab433e60834c92f13b5edccbff67a21d1 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Mon, 4 Feb 2008 22:30:45 -0800
Subject: [PATCH] --- yaml --- r: 83174 b: refs/heads/master c:
 0ba7fe03b638a084a4e15e21d2e585ba321ad9c8 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/um/Makefile | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f2b1967505fa..51e5ae6f23fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e725a9b0f5db0fa511d7667da6c4bfb1a6d3c7e4
+refs/heads/master: 0ba7fe03b638a084a4e15e21d2e585ba321ad9c8
diff --git a/trunk/arch/um/Makefile b/trunk/arch/um/Makefile
index ba6813a4aa37..e44fd6a58375 100644
--- a/trunk/arch/um/Makefile
+++ b/trunk/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) \