aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorAl Viro <viro@parcelfarce.linux.theplanet.co.uk>2005-05-05 16:15:19 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 16:36:33 -0700
commit03f81dc50caf6360aa5343264fed8868e22d9058 (patch)
tree21bd82c83baa1fa9bfa6fd2df026fe4dec2bce84 /arch/um/kernel/vmlinux.lds.S
parent[PATCH] uml kbuild: avoid useless rebuilds (diff)
downloadlinux-dev-03f81dc50caf6360aa5343264fed8868e22d9058.tar.xz
linux-dev-03f81dc50caf6360aa5343264fed8868e22d9058.zip
[PATCH] uml: include the linker script rather than symlink it
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> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/vmlinux.lds.S')
-rw-r--r--arch/um/kernel/vmlinux.lds.S6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S
new file mode 100644
index 000000000000..1660a769674b
--- /dev/null
+++ b/arch/um/kernel/vmlinux.lds.S
@@ -0,0 +1,6 @@
+#include <linux/config.h>
+#ifdef CONFIG_LD_SCRIPT_STATIC
+#include "uml.lds.S"
+#else
+#include "dyn.lds.S"
+#endif