Commit 43878d0e authored by Paolo \'Blaisorblade\' Giarrusso's avatar Paolo \'Blaisorblade\' Giarrusso Committed by Linus Torvalds

[PATCH] uml: re-add linux Makefile target - fixes to the old version.

We have re-added the "linux" target which just creates a hardlink to vmlinux. 
It was noted (sorry for forgetting who said this) that "make ARCH=um" will
leave an old "linux" file, since the target is not listed in .PHONY.

Using a symlink, instead of an hard link, was suggested because the hard link
does not get updated with make vmlinux.  But mv linux $destpath (the most
meaningful installation command) is broken, so I instead added linux to
.PHONY.  Obviously, linux will not be rebuilt on "make vmlinux ARCH=um", but
this makes sense (if people use the new way, don't use old tricks).  Anyway,
we remove "linux" in any case.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Acked-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 54a402db
...@@ -63,16 +63,18 @@ ifeq ($(CONFIG_MODE_SKAS), y) ...@@ -63,16 +63,18 @@ ifeq ($(CONFIG_MODE_SKAS), y)
$(SYS_HEADERS) : $(ARCH_DIR)/include/skas_ptregs.h $(SYS_HEADERS) : $(ARCH_DIR)/include/skas_ptregs.h
endif endif
.PHONY: linux
all: linux all: linux
linux: vmlinux linux: vmlinux
$(RM) $@ ln -f $< $@
ln $< $@
define archhelp define archhelp
echo '* linux - Binary kernel image (./linux) - for backward' echo '* linux - Binary kernel image (./linux) - for backward'
echo ' compatibility only: now you can simply run' echo ' compatibility only, this creates a hard link to the'
echo ' the vmlinux binary you find in the kernel root.' echo ' real kernel binary, the the "vmlinux" binary you'
echo ' find in the kernel root.'
endef endef
prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \ prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \
...@@ -118,7 +120,8 @@ define cmd_vmlinux__ ...@@ -118,7 +120,8 @@ define cmd_vmlinux__
-Wl,-T,$(vmlinux-lds) $(vmlinux-init) \ -Wl,-T,$(vmlinux-lds) $(vmlinux-init) \
-Wl,--start-group $(vmlinux-main) -Wl,--end-group \ -Wl,--start-group $(vmlinux-main) -Wl,--end-group \
-L/usr/lib -lutil \ -L/usr/lib -lutil \
$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE ,$^) $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) \
FORCE ,$^) ; rm -f linux
endef endef
USER_CFLAGS := $(patsubst -I%,,$(CFLAGS)) USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
......
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