---

yaml --- r: 83174 b: refs/heads/master c: 0ba7fe0 h: refs/heads/master v: v3
git-mirror · Feb 5, 2008 · f6bbd34 · f6bbd34
1 parent 0cfa78e
commit f6bbd34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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) \