X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Fum%2FMakefile;h=097091059aaaee32883d4a302457fcb4a630854f;hb=7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a;hp=55c0661e2b5dbcba77a097522e43f109922bb577;hpb=586c7ecc78949f03c9f31735f4935abef38f8f2b;p=~andy%2Flinux

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 55c0661e2b5..097091059aa 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -121,15 +121,8 @@ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
 
 LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt))
 
-CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)
-define cmd_vmlinux__
-	$(CC) $(CFLAGS_vmlinux) -o $@ \
-	-Wl,-T,$(vmlinux-lds) $(vmlinux-init) \
-	-Wl,--start-group $(vmlinux-main) -Wl,--end-group \
-	-lutil \
-	$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o \
-	FORCE ,$^) ; rm -f linux
-endef
+# Used by link-vmlinux.sh which has special support for um link
+export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)
 
 # When cleaning we don't include .config, so we don't include
 # TT or skas makefiles and don't clean skas_ptregs.h.