From: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>

Make vmlinux.lds.S include appopriate script instead of playing games with
symlinks.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/um/Makefile             |   15 +--------------
 arch/um/kernel/Makefile      |    2 +-
 arch/um/kernel/vmlinux.lds.S |    6 ++++++
 3 files changed, 8 insertions(+), 15 deletions(-)

diff -puN arch/um/kernel/Makefile~uml-include-the-linker-script-rather-than-symlink-it arch/um/kernel/Makefile
--- 25/arch/um/kernel/Makefile~uml-include-the-linker-script-rather-than-symlink-it	2005-05-02 19:00:31.000000000 -0700
+++ 25-akpm/arch/um/kernel/Makefile	2005-05-02 19:00:46.000000000 -0700
@@ -4,7 +4,7 @@
 #
 
 extra-y := vmlinux.lds
-clean-files := vmlinux.lds.S
+clean-files :=
 
 obj-y = checksum.o config.o exec_kern.o exitcode.o \
 	helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \
diff -puN /dev/null arch/um/kernel/vmlinux.lds.S
--- /dev/null	2003-09-15 06:40:47.000000000 -0700
+++ 25-akpm/arch/um/kernel/vmlinux.lds.S	2005-05-02 19:00:31.000000000 -0700
@@ -0,0 +1,6 @@
+#include <linux/config.h>
+#ifdef CONFIG_LD_SCRIPT_STATIC
+#include "uml.lds.S"
+#else
+#include "dyn.lds.S"
+#endif
diff -puN arch/um/Makefile~uml-include-the-linker-script-rather-than-symlink-it arch/um/Makefile
--- 25/arch/um/Makefile~uml-include-the-linker-script-rather-than-symlink-it	2005-05-02 19:00:31.000000000 -0700
+++ 25-akpm/arch/um/Makefile	2005-05-02 19:00:31.000000000 -0700
@@ -96,15 +96,11 @@ endef
 
 $(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch)
 
-prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \
-	$(ARCH_DIR)/kernel/vmlinux.lds.S
+prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
 
 LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
 LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
 
-LD_SCRIPT-$(CONFIG_LD_SCRIPT_STATIC) := uml.lds.S
-LD_SCRIPT-$(CONFIG_LD_SCRIPT_DYN) := dyn.lds.S
-
 CPP_MODE-$(CONFIG_MODE_TT) := -DMODE_TT
 CONFIG_KERNEL_STACK_ORDER ?= 2
 STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
@@ -145,15 +141,6 @@ archclean:
 	@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 when needed.
-$(ARCH_DIR)/kernel/vmlinux.lds.S: FORCE
-	$(Q)if [ "$(shell readlink $@)" != "$(LD_SCRIPT-y)" ]; then \
-		echo '  SYMLINK $@'; \
-		ln -sf $(LD_SCRIPT-y) $@; \
-		touch $@; \
-	fi;
-
 $(SYMLINK_HEADERS):
 	@echo '  SYMLINK $@'
 	$(Q)cd $(TOPDIR)/$(dir $@) ; \
_