[PATCH] UML - Build cleanups

[Jeff Dike]

Uml-specific patch (which requires a mainline hook, mailed separately).

This patch avoid the linking kludge which leaves kbuild link vmlinux and
then link it with libc inside linux. This kludge has the big problem of
making kallsyms break, since the kallsyms pass is done on a completely
different binary than the running one.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@xxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Index: 2.6.9/arch/um/Makefile
===================================================================
--- 2.6.9.orig/arch/um/Makefile	2004-11-24 15:27:12.000000000 -0500
+++ 2.6.9/arch/um/Makefile	2004-11-24 15:30:26.000000000 -0500
@@ -65,11 +65,6 @@
 
 .PHONY: linux
 
-all: linux
-
-linux: vmlinux
-	ln -f $< $@
-
 define archhelp
   echo '* linux		- Binary kernel image (./linux) - for backward'
   echo '		   compatibility only, this creates a hard link to the'
@@ -77,6 +72,14 @@
   echo '		   find in the kernel root.'
 endef
 
+all : linux
+
+linux : vmlinux
+	$(RM) $@
+	ln $< $@
+
+include/linux/version.h: arch/$(ARCH)/Makefile
+
 prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \
 	$(ARCH_DIR)/kernel/vmlinux.lds.S
 
@@ -150,8 +153,8 @@
 	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
 		-o -name '*.gcov' \) -type f -print | xargs rm -f
 
-#We need to re-preprocess this when the symlink dest changes.
-#So we touch it.
+# We need to re-preprocess this when the symlink dest changes.
+# So we touch it.
 $(ARCH_DIR)/kernel/vmlinux.lds.S: FORCE
 	@echo '  SYMLINK $@'
 	$(Q)ln -sf $(LD_SCRIPT-y) $@

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/